Skip to content

Commit

Permalink
👻 move inclusion tests to a separate init config and location
Browse files Browse the repository at this point in the history
Signed-off-by: Pranav Gaikwad <pgaikwad@redhat.com>
  • Loading branch information
pranavgaikwad committed May 29, 2024
1 parent 75d2613 commit 7434243
Show file tree
Hide file tree
Showing 10 changed files with 78 additions and 65 deletions.
3 changes: 3 additions & 0 deletions demo-dep-output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
60 changes: 21 additions & 39 deletions demo-output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> element = new GenericClass<String>(\"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: ""
Expand Down Expand Up @@ -463,17 +445,17 @@
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
name: io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition
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<String> element = new GenericClass<String>(\"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<String> element = new GenericClass<String>(\"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
Expand All @@ -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<String> element = new GenericClass<String>(\"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<String> element = new GenericClass<String>(\"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
Expand All @@ -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<String> element = new GenericClass<String>(\"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<String> element = new GenericClass<String>(\"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
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>io.konveyor</groupId>
<artifactId>inclusion-tests</artifactId>
<version>1.0-SNAPSHOT</version>

<name>inclusion-tests</name>
<url>http://www.konveyor.io</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
</dependencies>

<build>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -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");
}
}
Original file line number Diff line number Diff line change
@@ -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;
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.example.apps;

import java.io.File;
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;

public class App
Expand All @@ -17,11 +16,5 @@ public static void main( String[] args )

GenericClass<String> element = new GenericClass<String>("Hello world!");
element.get();

// test file usage
File file = new File("test");
if (file.exists()) {
System.out.println("file exists");
}
}
}

This file was deleted.

4 changes: 2 additions & 2 deletions provider_container_settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions provider_local_external_images.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions provider_pod_local_settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 7434243

Please sign in to comment.