@@ -15,6 +15,7 @@ import {
1515import { mockedObject } from "../../../utils/mocking.helpers" ;
1616import { ModeledMethod } from "../../../../../src/model-editor/modeled-method" ;
1717import { Mode } from "../../../../../src/model-editor/shared/mode" ;
18+ import { createModeledMethod } from "../../../../factories/model-editor/modeled-method-factories" ;
1819
1920describe ( "MethodsUsageDataProvider" , ( ) => {
2021 const mockCliServer = mockedObject < CodeQLCliServer > ( { } ) ;
@@ -226,17 +227,35 @@ describe("MethodsUsageDataProvider", () => {
226227 } ) ;
227228
228229 describe ( "getChildren" , ( ) => {
229- const supportedMethod = createMethod ( {
230+ const supportedUnmodeledMethod = createMethod ( {
231+ signature : "some.supported.unmodeled.method()" ,
230232 supported : true ,
231233 } ) ;
232-
233- const unsupportedMethod = createMethod ( {
234+ const supportedModeledMethod = createMethod ( {
235+ signature : "some.supported.modeled.method()" ,
236+ supported : true ,
237+ } ) ;
238+ const unsupportedUnmodeledMethod = createMethod ( {
239+ signature : "some.unsupported.unmodeled.method()" ,
240+ supported : false ,
241+ } ) ;
242+ const unsupportedModeledMethod = createMethod ( {
243+ signature : "some.unsupported.modeled.method()" ,
234244 supported : false ,
235245 } ) ;
236246
237247 const mode = Mode . Application ;
238- const methods : Method [ ] = [ supportedMethod , unsupportedMethod ] ;
248+ const methods : Method [ ] = [
249+ supportedUnmodeledMethod ,
250+ supportedModeledMethod ,
251+ unsupportedUnmodeledMethod ,
252+ unsupportedModeledMethod ,
253+ ] ;
239254 const modeledMethods : Record < string , ModeledMethod [ ] > = { } ;
255+ modeledMethods [ supportedModeledMethod . signature ] = [ createModeledMethod ( ) ] ;
256+ modeledMethods [ unsupportedModeledMethod . signature ] = [
257+ createModeledMethod ( ) ,
258+ ] ;
240259 const modifiedMethodSignatures : Set < string > = new Set ( ) ;
241260
242261 const dbItem = mockedObject < DatabaseItem > ( {
@@ -246,12 +265,12 @@ describe("MethodsUsageDataProvider", () => {
246265 const usage = createUsage ( { } ) ;
247266
248267 const methodTreeItem : MethodsUsageTreeViewItem = {
249- method : supportedMethod ,
268+ method : unsupportedUnmodeledMethod ,
250269 children : [ ] ,
251270 } ;
252271
253272 const usageTreeItem : MethodsUsageTreeViewItem = {
254- method : supportedMethod ,
273+ method : unsupportedUnmodeledMethod ,
255274 usage,
256275 parent : methodTreeItem ,
257276 } ;
@@ -275,7 +294,7 @@ describe("MethodsUsageDataProvider", () => {
275294 modeledMethods ,
276295 modifiedMethodSignatures ,
277296 ) ;
278- expect ( dataProvider . getChildren ( ) . length ) . toEqual ( 2 ) ;
297+ expect ( dataProvider . getChildren ( ) . length ) . toEqual ( 4 ) ;
279298 } ) ;
280299
281300 it ( "should filter methods if hideModeledMethods is true and looking at the root" , async ( ) => {
@@ -288,7 +307,7 @@ describe("MethodsUsageDataProvider", () => {
288307 modeledMethods ,
289308 modifiedMethodSignatures ,
290309 ) ;
291- expect ( dataProvider . getChildren ( ) . length ) . toEqual ( 1 ) ;
310+ expect ( dataProvider . getChildren ( ) . length ) . toEqual ( 3 ) ;
292311 } ) ;
293312
294313 describe ( "with multiple libraries" , ( ) => {
0 commit comments