From 74342433305e5d77ecc981cdec09890fc18ce934 Mon Sep 17 00:00:00 2001 From: Pranav Gaikwad Date: Wed, 29 May 2024 09:06:44 -0400 Subject: [PATCH] :ghost: move inclusion tests to a separate init config and location Signed-off-by: Pranav Gaikwad --- demo-dep-output.yaml | 3 + demo-output.yaml | 60 +++++++------------ .../examples/inclusion-tests/pom.xml | 22 +++++++ .../src/main/java/io/konveyor/App.java | 16 +++++ .../java/io/konveyor/util/FileReader.java | 10 ++++ .../src/main/java/com/example/apps/App.java | 7 --- .../com/example/apps/util/FileReader.java | 13 ---- provider_container_settings.json | 4 +- provider_local_external_images.json | 4 +- provider_pod_local_settings.json | 4 +- 10 files changed, 78 insertions(+), 65 deletions(-) create mode 100644 external-providers/java-external-provider/examples/inclusion-tests/pom.xml create mode 100644 external-providers/java-external-provider/examples/inclusion-tests/src/main/java/io/konveyor/App.java create mode 100644 external-providers/java-external-provider/examples/inclusion-tests/src/main/java/io/konveyor/util/FileReader.java delete mode 100644 external-providers/java-external-provider/examples/java/example/src/main/java/com/example/apps/util/FileReader.java diff --git a/demo-dep-output.yaml b/demo-dep-output.yaml index 5242586f..7cbd4b12 100644 --- a/demo-dep-output.yaml +++ b/demo-dep-output.yaml @@ -1494,6 +1494,9 @@ - konveyor.io/dep-source=open-source - konveyor.io/language=java prefix: file:///root/.m2/repository/org/yaml/snakeyaml/1.28 +- fileURI: file:///analyzer-lsp/examples/inclusion-tests/pom.xml + provider: java + dependencies: [] - fileURI: file:///analyzer-lsp/examples/java/pom.xml provider: java dependencies: diff --git a/demo-output.yaml b/demo-output.yaml index c4c0f803..c04b5877 100644 --- a/demo-output.yaml +++ b/demo-output.yaml @@ -358,42 +358,24 @@ description: "This rule tests includedPaths config of the java provider. There should be two instances of this issue in the example app. \nWe are filtering one of them using includedPaths in provider config.\n" category: mandatory incidents: - - uri: file:///examples/java/example/src/main/java/com/example/apps/App.java - message: Only incidents in util/FileReader.java should be found - codeSnip: " 1 package com.example.apps;\n 2 \n 3 import java.io.File;\n 4 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;\n 5 \n 6 public class App \n 7 {\n 8 \n 9 /**\n10 * {@link CustomResourceDefinition}\n11 * @param args\n12 */\n13 public static void main( String[] args )" - lineNumber: 3 - variables: - file: file:///examples/java/example/src/main/java/com/example/apps/App.java - kind: Module - name: java.io.File - package: com.example.apps - - uri: file:///examples/java/example/src/main/java/com/example/apps/App.java - message: Only incidents in util/FileReader.java should be found - codeSnip: "12 */\n13 public static void main( String[] args )\n14 {\n15 CustomResourceDefinition crd = new CustomResourceDefinition();\n16 System.out.println( crd );\n17 \n18 GenericClass element = new GenericClass(\"Hello world!\");\n19 element.get();\n20 \n21 // test file usage\n22 File file = new File(\"test\");\n23 if (file.exists()) {\n24 System.out.println(\"file exists\");\n25 }\n26 }\n27 }\n" - lineNumber: 22 - variables: - file: file:///examples/java/example/src/main/java/com/example/apps/App.java - kind: Method - name: main - package: com.example.apps - - uri: file:///examples/java/example/src/main/java/com/example/apps/util/FileReader.java + - uri: file:///examples/inclusion-tests/src/main/java/io/konveyor/util/FileReader.java message: Only incidents in util/FileReader.java should be found - codeSnip: " 1 package com.example.apps.util;\n 2 \n 3 import java.io.File;\n 4 \n 5 public class FileReader {\n 6 public static void main(String[] args) {\n 7 File file = new File(\"test\");\n 8 if (file.exists()) {\n 9 System.out.println(\"file exists\");\n10 }\n11 }\n12 \n13 }" + codeSnip: " 1 package io.konveyor.util;\n 2 \n 3 import java.io.File;\n 4 \n 5 public class FileReader {\n 6 public static boolean fileExists() {\n 7 File file = new File(\"/test\");\n 8 return true;\n 9 }\n10 }\n" lineNumber: 3 variables: - file: file:///examples/java/example/src/main/java/com/example/apps/util/FileReader.java + file: file:///examples/inclusion-tests/src/main/java/io/konveyor/util/FileReader.java kind: Module name: java.io.File - package: com.example.apps.util - - uri: file:///examples/java/example/src/main/java/com/example/apps/util/FileReader.java + package: io.konveyor.util + - uri: file:///examples/inclusion-tests/src/main/java/io/konveyor/util/FileReader.java message: Only incidents in util/FileReader.java should be found - codeSnip: " 1 package com.example.apps.util;\n 2 \n 3 import java.io.File;\n 4 \n 5 public class FileReader {\n 6 public static void main(String[] args) {\n 7 File file = new File(\"test\");\n 8 if (file.exists()) {\n 9 System.out.println(\"file exists\");\n10 }\n11 }\n12 \n13 }\n" + codeSnip: " 1 package io.konveyor.util;\n 2 \n 3 import java.io.File;\n 4 \n 5 public class FileReader {\n 6 public static boolean fileExists() {\n 7 File file = new File(\"/test\");\n 8 return true;\n 9 }\n10 }\n" lineNumber: 7 variables: - file: file:///examples/java/example/src/main/java/com/example/apps/util/FileReader.java + file: file:///examples/inclusion-tests/src/main/java/io/konveyor/util/FileReader.java kind: Method - name: main - package: com.example.apps.util + name: fileExists + package: io.konveyor.util effort: 3 java-pomxml-dependencies: description: "" @@ -463,8 +445,8 @@ file: file:///examples/golang/main.go - uri: file:///examples/java/example/src/main/java/com/example/apps/App.java message: apiextensions/v1beta1/customresourcedefinitions is deprecated, apiextensions/v1/customresourcedefinitions should be used instead - codeSnip: " 1 package com.example.apps;\n 2 \n 3 import java.io.File;\n 4 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;\n 5 \n 6 public class App \n 7 {\n 8 \n 9 /**\n10 * {@link CustomResourceDefinition}\n11 * @param args\n12 */\n13 public static void main( String[] args )\n14 {" - lineNumber: 4 + codeSnip: " 1 package com.example.apps;\n 2 \n 3 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;\n 4 \n 5 public class App \n 6 {\n 7 \n 8 /**\n 9 * {@link CustomResourceDefinition}\n10 * @param args\n11 */\n12 public static void main( String[] args )\n13 {" + lineNumber: 3 variables: file: file:///examples/java/example/src/main/java/com/example/apps/App.java kind: Module @@ -472,8 +454,8 @@ package: com.example.apps - uri: file:///examples/java/example/src/main/java/com/example/apps/App.java message: apiextensions/v1beta1/customresourcedefinitions is deprecated, apiextensions/v1/customresourcedefinitions should be used instead - codeSnip: " 5 \n 6 public class App \n 7 {\n 8 \n 9 /**\n10 * {@link CustomResourceDefinition}\n11 * @param args\n12 */\n13 public static void main( String[] args )\n14 {\n15 CustomResourceDefinition crd = new CustomResourceDefinition();\n16 System.out.println( crd );\n17 \n18 GenericClass element = new GenericClass(\"Hello world!\");\n19 element.get();\n20 \n21 // test file usage\n22 File file = new File(\"test\");\n23 if (file.exists()) {\n24 System.out.println(\"file exists\");\n25 }" - lineNumber: 15 + codeSnip: " 4 \n 5 public class App \n 6 {\n 7 \n 8 /**\n 9 * {@link CustomResourceDefinition}\n10 * @param args\n11 */\n12 public static void main( String[] args )\n13 {\n14 CustomResourceDefinition crd = new CustomResourceDefinition();\n15 System.out.println( crd );\n16 \n17 GenericClass element = new GenericClass(\"Hello world!\");\n18 element.get();\n19 }\n20 }\n" + lineNumber: 14 variables: file: file:///examples/java/example/src/main/java/com/example/apps/App.java kind: Method @@ -484,18 +466,18 @@ category: potential incidents: - uri: file:///examples/java/example/src/main/java/com/example/apps/App.java - message: java found apiextensions/v1/customresourcedefinitions found file:///examples/java/example/src/main/java/com/example/apps/App.java:15 - codeSnip: " 5 \n 6 public class App \n 7 {\n 8 \n 9 /**\n10 * {@link CustomResourceDefinition}\n11 * @param args\n12 */\n13 public static void main( String[] args )\n14 {\n15 CustomResourceDefinition crd = new CustomResourceDefinition();\n16 System.out.println( crd );\n17 \n18 GenericClass element = new GenericClass(\"Hello world!\");\n19 element.get();\n20 \n21 // test file usage\n22 File file = new File(\"test\");\n23 if (file.exists()) {\n24 System.out.println(\"file exists\");\n25 }" - lineNumber: 15 + message: java found apiextensions/v1/customresourcedefinitions found file:///examples/java/example/src/main/java/com/example/apps/App.java:14 + codeSnip: " 4 \n 5 public class App \n 6 {\n 7 \n 8 /**\n 9 * {@link CustomResourceDefinition}\n10 * @param args\n11 */\n12 public static void main( String[] args )\n13 {\n14 CustomResourceDefinition crd = new CustomResourceDefinition();\n15 System.out.println( crd );\n16 \n17 GenericClass element = new GenericClass(\"Hello world!\");\n18 element.get();\n19 }\n20 }\n" + lineNumber: 14 variables: file: file:///examples/java/example/src/main/java/com/example/apps/App.java kind: Method name: main package: com.example.apps - uri: file:///examples/java/example/src/main/java/com/example/apps/App.java - message: java found apiextensions/v1/customresourcedefinitions found file:///examples/java/example/src/main/java/com/example/apps/App.java:4 - codeSnip: " 1 package com.example.apps;\n 2 \n 3 import java.io.File;\n 4 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;\n 5 \n 6 public class App \n 7 {\n 8 \n 9 /**\n10 * {@link CustomResourceDefinition}\n11 * @param args\n12 */\n13 public static void main( String[] args )\n14 {" - lineNumber: 4 + message: java found apiextensions/v1/customresourcedefinitions found file:///examples/java/example/src/main/java/com/example/apps/App.java:3 + codeSnip: " 1 package com.example.apps;\n 2 \n 3 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;\n 4 \n 5 public class App \n 6 {\n 7 \n 8 /**\n 9 * {@link CustomResourceDefinition}\n10 * @param args\n11 */\n12 public static void main( String[] args )\n13 {" + lineNumber: 3 variables: file: file:///examples/java/example/src/main/java/com/example/apps/App.java kind: Module @@ -507,8 +489,8 @@ incidents: - uri: file:///examples/java/example/src/main/java/com/example/apps/App.java message: found generic call - codeSnip: " 9 /**\n10 * {@link CustomResourceDefinition}\n11 * @param args\n12 */\n13 public static void main( String[] args )\n14 {\n15 CustomResourceDefinition crd = new CustomResourceDefinition();\n16 System.out.println( crd );\n17 \n18 GenericClass element = new GenericClass(\"Hello world!\");\n19 element.get();\n20 \n21 // test file usage\n22 File file = new File(\"test\");\n23 if (file.exists()) {\n24 System.out.println(\"file exists\");\n25 }\n26 }\n27 }\n" - lineNumber: 19 + codeSnip: " 8 /**\n 9 * {@link CustomResourceDefinition}\n10 * @param args\n11 */\n12 public static void main( String[] args )\n13 {\n14 CustomResourceDefinition crd = new CustomResourceDefinition();\n15 System.out.println( crd );\n16 \n17 GenericClass element = new GenericClass(\"Hello world!\");\n18 element.get();\n19 }\n20 }\n" + lineNumber: 18 variables: VariableName: element file: file:///examples/java/example/src/main/java/com/example/apps/App.java diff --git a/external-providers/java-external-provider/examples/inclusion-tests/pom.xml b/external-providers/java-external-provider/examples/inclusion-tests/pom.xml new file mode 100644 index 00000000..791f1d25 --- /dev/null +++ b/external-providers/java-external-provider/examples/inclusion-tests/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + + io.konveyor + inclusion-tests + 1.0-SNAPSHOT + + inclusion-tests + http://www.konveyor.io + + + UTF-8 + + + + + + + + \ No newline at end of file diff --git a/external-providers/java-external-provider/examples/inclusion-tests/src/main/java/io/konveyor/App.java b/external-providers/java-external-provider/examples/inclusion-tests/src/main/java/io/konveyor/App.java new file mode 100644 index 00000000..4a6cfb70 --- /dev/null +++ b/external-providers/java-external-provider/examples/inclusion-tests/src/main/java/io/konveyor/App.java @@ -0,0 +1,16 @@ +package io.konveyor; + +import java.io.File; + +public class App +{ + + /** + * {@link CustomResourceDefinition} + * @param args + */ + public static void main( String[] args ) + { + File file = new File("/test"); + } +} diff --git a/external-providers/java-external-provider/examples/inclusion-tests/src/main/java/io/konveyor/util/FileReader.java b/external-providers/java-external-provider/examples/inclusion-tests/src/main/java/io/konveyor/util/FileReader.java new file mode 100644 index 00000000..480427f7 --- /dev/null +++ b/external-providers/java-external-provider/examples/inclusion-tests/src/main/java/io/konveyor/util/FileReader.java @@ -0,0 +1,10 @@ +package io.konveyor.util; + +import java.io.File; + +public class FileReader { + public static boolean fileExists() { + File file = new File("/test"); + return true; + } +} diff --git a/external-providers/java-external-provider/examples/java/example/src/main/java/com/example/apps/App.java b/external-providers/java-external-provider/examples/java/example/src/main/java/com/example/apps/App.java index 549e1a3c..1bf6ecd6 100644 --- a/external-providers/java-external-provider/examples/java/example/src/main/java/com/example/apps/App.java +++ b/external-providers/java-external-provider/examples/java/example/src/main/java/com/example/apps/App.java @@ -1,6 +1,5 @@ package com.example.apps; -import java.io.File; import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition; public class App @@ -17,11 +16,5 @@ public static void main( String[] args ) GenericClass element = new GenericClass("Hello world!"); element.get(); - - // test file usage - File file = new File("test"); - if (file.exists()) { - System.out.println("file exists"); - } } } diff --git a/external-providers/java-external-provider/examples/java/example/src/main/java/com/example/apps/util/FileReader.java b/external-providers/java-external-provider/examples/java/example/src/main/java/com/example/apps/util/FileReader.java deleted file mode 100644 index 245676ea..00000000 --- a/external-providers/java-external-provider/examples/java/example/src/main/java/com/example/apps/util/FileReader.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.apps.util; - -import java.io.File; - -public class FileReader { - public static void main(String[] args) { - File file = new File("test"); - if (file.exists()) { - System.out.println("file exists"); - } - } - -} diff --git a/provider_container_settings.json b/provider_container_settings.json index 3f140f8e..169a3b09 100644 --- a/provider_container_settings.json +++ b/provider_container_settings.json @@ -80,14 +80,14 @@ "analysisMode": "source-only" }, { - "location": "/analyzer-lsp/examples/java", + "location": "/analyzer-lsp/examples/inclusion-tests", "providerSpecificConfig": { "lspServerName": "java", "bundles": "/jdtls/java-analyzer-bundle/java-analyzer-bundle.core/target/java-analyzer-bundle.core-1.0.0-SNAPSHOT.jar", "depOpenSourceLabelsFile": "/usr/local/etc/maven.default.index", "lspServerPath": "/jdtls/bin/jdtls", "includedPaths": [ - "example/src/main/java/com/example/apps/util/FileReader.java" + "src/main/java/io/konveyor/util/FileReader.java" ] }, "analysisMode": "source-only" diff --git a/provider_local_external_images.json b/provider_local_external_images.json index 6da3d6d4..e21c2f92 100644 --- a/provider_local_external_images.json +++ b/provider_local_external_images.json @@ -80,14 +80,14 @@ "analysisMode": "source-only" }, { - "location": "/analyzer-lsp/examples/java", + "location": "/analyzer-lsp/examples/inclusion-tests", "providerSpecificConfig": { "lspServerName": "java", "bundles": "/jdtls/java-analyzer-bundle/java-analyzer-bundle.core/target/java-analyzer-bundle.core-1.0.0-SNAPSHOT.jar", "depOpenSourceLabelsFile": "/usr/local/etc/maven.default.index", "lspServerPath": "/jdtls/bin/jdtls", "includedPaths": [ - "example/src/main/java/com/example/apps/util/FileReader.java" + "src/main/java/io/konveyor/util/FileReader.java" ] }, "analysisMode": "source-only" diff --git a/provider_pod_local_settings.json b/provider_pod_local_settings.json index 1fe9f01e..d62198a4 100644 --- a/provider_pod_local_settings.json +++ b/provider_pod_local_settings.json @@ -80,14 +80,14 @@ "analysisMode": "source-only" }, { - "location": "/analyzer-lsp/examples/java", + "location": "/analyzer-lsp/examples/inclusion-tests", "providerSpecificConfig": { "lspServerName": "java", "bundles": "/jdtls/java-analyzer-bundle/java-analyzer-bundle.core/target/java-analyzer-bundle.core-1.0.0-SNAPSHOT.jar", "depOpenSourceLabelsFile": "/usr/local/etc/maven.default.index", "lspServerPath": "/jdtls/bin/jdtls", "includedPaths": [ - "example/src/main/java/com/example/apps/util/FileReader.java" + "src/main/java/io/konveyor/util/FileReader.java" ] }, "analysisMode": "source-only"