From e67ba8916241dc362367783b05e590f29e3bbb74 Mon Sep 17 00:00:00 2001 From: LakshanWeerasinghe Date: Wed, 5 Mar 2025 01:32:19 +0530 Subject: [PATCH] Update tests --- .../extension/ServiceModelGeneratorService.java | 2 +- .../extension/GetListenerModelFromSourceTest.java | 2 +- .../listener_from_source/config/listener_from_source_1.json | 4 ++-- .../listener_from_source/config/listener_from_source_2.json | 4 ++-- .../listener_from_source/config/listener_from_source_3.json | 4 ++-- .../listener_from_source/config/listener_from_source_4.json | 4 ++-- .../io/ballerina/indexgenerator/ServiceIndexGenerator.java | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/service-model-generator/modules/service-model-generator-ls-extension/src/main/java/io/ballerina/servicemodelgenerator/extension/ServiceModelGeneratorService.java b/service-model-generator/modules/service-model-generator-ls-extension/src/main/java/io/ballerina/servicemodelgenerator/extension/ServiceModelGeneratorService.java index 1827d1c25..0adea2938 100644 --- a/service-model-generator/modules/service-model-generator-ls-extension/src/main/java/io/ballerina/servicemodelgenerator/extension/ServiceModelGeneratorService.java +++ b/service-model-generator/modules/service-model-generator-ls-extension/src/main/java/io/ballerina/servicemodelgenerator/extension/ServiceModelGeneratorService.java @@ -628,7 +628,7 @@ public CompletableFuture getListenerFromSource(Commo nameProperty.setValue(listenerNode.variableName().text().trim()); nameProperty.setCodedata(new Codedata(listenerNode.variableName().lineRange())); nameProperty.setEditable(false); - listenerModel.setCodedata(new Codedata(lineRange)); + listenerModel.setCodedata(new Codedata(listenerNode.lineRange())); return new ListenerFromSourceResponse(listenerModel); } catch (Exception e) { return new ListenerFromSourceResponse(e); diff --git a/service-model-generator/modules/service-model-generator-ls-extension/src/test/java/io/ballerina/servicemodelgenerator/extension/GetListenerModelFromSourceTest.java b/service-model-generator/modules/service-model-generator-ls-extension/src/test/java/io/ballerina/servicemodelgenerator/extension/GetListenerModelFromSourceTest.java index 434619aef..8b4f6552c 100644 --- a/service-model-generator/modules/service-model-generator-ls-extension/src/test/java/io/ballerina/servicemodelgenerator/extension/GetListenerModelFromSourceTest.java +++ b/service-model-generator/modules/service-model-generator-ls-extension/src/test/java/io/ballerina/servicemodelgenerator/extension/GetListenerModelFromSourceTest.java @@ -55,7 +55,7 @@ public void test(Path config) throws IOException { new GetListenerModelFromSourceTest.TestConfig(testConfig.filePath(), testConfig.description(), testConfig.start(), testConfig.end(), jsonMap); // updateConfig(configJsonPath, updatedConfig); - Assert.fail(String.format("Failed test: '%s' (%s)", testConfig.description(), configJsonPath)); + Assert.fail(String.format("Failed test: '%s' (%s) %s", testConfig.description(), configJsonPath)); } } diff --git a/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/config/listener_from_source_1.json b/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/config/listener_from_source_1.json index df9d5a777..1c5d6ff5a 100644 --- a/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/config/listener_from_source_1.json +++ b/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/config/listener_from_source_1.json @@ -360,14 +360,14 @@ }, "codedata": { "lineRange": { - "fileName": "/Users/lakshanweerasinghe/Documents/repos/ballerina-platform/ballerina-dev-tools/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/source/sample1/main.bal", + "fileName": "main.bal", "startLine": { "line": 2, "offset": 0 }, "endLine": { "line": 2, - "offset": 52 + "offset": 53 } }, "inListenerInit": false, diff --git a/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/config/listener_from_source_2.json b/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/config/listener_from_source_2.json index 65ac5e3b2..803bdbce9 100644 --- a/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/config/listener_from_source_2.json +++ b/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/config/listener_from_source_2.json @@ -360,14 +360,14 @@ }, "codedata": { "lineRange": { - "fileName": "/Users/lakshanweerasinghe/Documents/repos/ballerina-platform/ballerina-dev-tools/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/source/sample1/main.bal", + "fileName": "main.bal", "startLine": { "line": 3, "offset": 0 }, "endLine": { "line": 3, - "offset": 45 + "offset": 46 } }, "inListenerInit": false, diff --git a/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/config/listener_from_source_3.json b/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/config/listener_from_source_3.json index 020bd1537..1f8752672 100644 --- a/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/config/listener_from_source_3.json +++ b/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/config/listener_from_source_3.json @@ -107,14 +107,14 @@ }, "codedata": { "lineRange": { - "fileName": "/Users/lakshanweerasinghe/Documents/repos/ballerina-platform/ballerina-dev-tools/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/source/sample1/main.bal", + "fileName": "main.bal", "startLine": { "line": 4, "offset": 0 }, "endLine": { "line": 4, - "offset": 49 + "offset": 50 } }, "inListenerInit": false, diff --git a/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/config/listener_from_source_4.json b/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/config/listener_from_source_4.json index ce5372419..fb5917b08 100644 --- a/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/config/listener_from_source_4.json +++ b/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/config/listener_from_source_4.json @@ -360,14 +360,14 @@ }, "codedata": { "lineRange": { - "fileName": "/Users/lakshanweerasinghe/Documents/repos/ballerina-platform/ballerina-dev-tools/service-model-generator/modules/service-model-generator-ls-extension/src/test/resources/listener_from_source/source/sample1/main.bal", + "fileName": "main.bal", "startLine": { "line": 5, "offset": 0 }, "endLine": { "line": 5, - "offset": 91 + "offset": 92 } }, "inListenerInit": false, diff --git a/service-model-generator/modules/service-model-index-generator/src/main/java/io/ballerina/indexgenerator/ServiceIndexGenerator.java b/service-model-generator/modules/service-model-index-generator/src/main/java/io/ballerina/indexgenerator/ServiceIndexGenerator.java index 941f002e3..5ea3c94a4 100644 --- a/service-model-generator/modules/service-model-index-generator/src/main/java/io/ballerina/indexgenerator/ServiceIndexGenerator.java +++ b/service-model-generator/modules/service-model-index-generator/src/main/java/io/ballerina/indexgenerator/ServiceIndexGenerator.java @@ -89,7 +89,7 @@ class ServiceIndexGenerator { private static final java.lang.reflect.Type typeToken = new TypeToken>>() {}.getType(); + List>>() { }.getType(); private static final Logger LOGGER = Logger.getLogger(ServiceIndexGenerator.class.getName()); private static final String PACKAGE_JSON_FILE = "packages.json";