Java: Add tests for private methods

koesie10 · koesie10 · commit 6adbc406a7ca · 2023-09-20T14:05:28.000+02:00
diff --git a/java/ql/test/utils/modeleditor/ApplicationModeEndpoints.expected b/java/ql/test/utils/modeleditor/ApplicationModeEndpoints.expected
@@ -1,10 +1,14 @@
 | com/github/codeql/test/NonPublicClass.java:5:5:5:28 | println(...) | java.io.PrintStream#println(String) | true | supported | rt.jar |  | sink | type | source | classification |
-| com/github/codeql/test/PublicClass.java:7:5:7:27 | println(...) | java.io.PrintStream#println(String) | true | supported | rt.jar |  | sink | type | source | classification |
-| com/github/codeql/test/PublicClass.java:11:5:11:27 | println(...) | java.io.PrintStream#println(String) | true | supported | rt.jar |  | sink | type | source | classification |
-| com/github/codeql/test/PublicClass.java:15:5:15:45 | println(...) | java.io.PrintStream#println(Object) | true | supported | rt.jar |  | sink | type | source | classification |
-| com/github/codeql/test/PublicClass.java:15:24:15:44 | get(...) | java.nio.file.Paths#get(String,String[]) | true | supported | rt.jar |  | sink | type | source | classification |
-| com/github/codeql/test/PublicClass.java:15:24:15:44 | get(...) | java.nio.file.Paths#get(String,String[]) | true | supported | rt.jar |  | summary | type | source | classification |
-| com/github/codeql/test/PublicClass.java:19:5:19:27 | println(...) | java.io.PrintStream#println(String) | true | supported | rt.jar |  | sink | type | source | classification |
+| com/github/codeql/test/PublicClass.java:8:5:8:27 | println(...) | java.io.PrintStream#println(String) | true | supported | rt.jar |  | sink | type | source | classification |
+| com/github/codeql/test/PublicClass.java:12:5:12:27 | println(...) | java.io.PrintStream#println(String) | true | supported | rt.jar |  | sink | type | source | classification |
+| com/github/codeql/test/PublicClass.java:16:5:16:45 | println(...) | java.io.PrintStream#println(Object) | true | supported | rt.jar |  | sink | type | source | classification |
+| com/github/codeql/test/PublicClass.java:16:24:16:44 | get(...) | java.nio.file.Paths#get(String,String[]) | true | supported | rt.jar |  | sink | type | source | classification |
+| com/github/codeql/test/PublicClass.java:16:24:16:44 | get(...) | java.nio.file.Paths#get(String,String[]) | true | supported | rt.jar |  | summary | type | source | classification |
+| com/github/codeql/test/PublicClass.java:20:5:20:68 | println(...) | java.io.PrintStream#println(Object) | true | supported | rt.jar |  | sink | type | source | classification |
+| com/github/codeql/test/PublicClass.java:20:24:20:47 | getDefault(...) | java.nio.file.FileSystems#getDefault() | false | supported | rt.jar |  |  | type | source | classification |
+| com/github/codeql/test/PublicClass.java:20:24:20:67 | getPath(...) | java.nio.file.FileSystem#getPath(String,String[]) | true | supported | rt.jar |  | sink | type | source | classification |
+| com/github/codeql/test/PublicClass.java:20:24:20:67 | getPath(...) | java.nio.file.FileSystem#getPath(String,String[]) | true | supported | rt.jar |  | summary | type | source | classification |
+| com/github/codeql/test/PublicClass.java:24:5:24:27 | println(...) | java.io.PrintStream#println(String) | true | supported | rt.jar |  | sink | type | source | classification |
 | com/github/codeql/test/PublicGenericClass.java:7:5:7:27 | println(...) | java.io.PrintStream#println(Object) | true | supported | rt.jar |  | sink | type | source | classification |
 | com/github/codeql/test/PublicGenericClass.java:11:5:11:27 | println(...) | java.io.PrintStream#println(Object) | true | supported | rt.jar |  | sink | type | source | classification |
 | com/github/codeql/test/PublicGenericInterface.java:8:7:8:29 | println(...) | java.io.PrintStream#println(String) | true | supported | rt.jar |  | sink | type | source | classification |
diff --git a/java/ql/test/utils/modeleditor/FrameworkModeEndpoints.expected b/java/ql/test/utils/modeleditor/FrameworkModeEndpoints.expected
@@ -1,6 +1,6 @@
-| com/github/codeql/test/PublicClass.java:6:15:6:19 | stuff | com.github.codeql.test.PublicClass#stuff(String) | false | supported | test | library |  | type | unknown | classification |
-| com/github/codeql/test/PublicClass.java:10:22:10:32 | staticStuff | com.github.codeql.test.PublicClass#staticStuff(String) | false | supported | test | library |  | type | unknown | classification |
-| com/github/codeql/test/PublicClass.java:14:18:14:31 | nonPublicStuff | com.github.codeql.test.PublicClass#nonPublicStuff(String) | false | supported | test | library |  | type | unknown | classification |
+| com/github/codeql/test/PublicClass.java:7:15:7:19 | stuff | com.github.codeql.test.PublicClass#stuff(String) | false | supported | test | library |  | type | unknown | classification |
+| com/github/codeql/test/PublicClass.java:11:22:11:32 | staticStuff | com.github.codeql.test.PublicClass#staticStuff(String) | false | supported | test | library |  | type | unknown | classification |
+| com/github/codeql/test/PublicClass.java:15:18:15:31 | protectedStuff | com.github.codeql.test.PublicClass#protectedStuff(String) | false | supported | test | library |  | type | unknown | classification |
 | com/github/codeql/test/PublicGenericClass.java:6:15:6:19 | stuff | com.github.codeql.test.PublicGenericClass#stuff(Object) | false | supported | test | library |  | type | unknown | classification |
 | com/github/codeql/test/PublicGenericClass.java:10:20:10:25 | stuff2 | com.github.codeql.test.PublicGenericClass#stuff2(Object) | false | supported | test | library |  | type | unknown | classification |
 | com/github/codeql/test/PublicGenericInterface.java:4:17:4:21 | stuff | com.github.codeql.test.PublicGenericInterface#stuff(Object) | false | supported | test | library |  | type | unknown | classification |
diff --git a/java/ql/test/utils/modeleditor/com/github/codeql/test/PublicClass.java b/java/ql/test/utils/modeleditor/com/github/codeql/test/PublicClass.java
@@ -1,5 +1,6 @@
 package com.github.codeql.test;
 
+import java.nio.file.FileSystems;
 import java.nio.file.Paths;
 
 public class PublicClass {
@@ -11,10 +12,14 @@ public static void staticStuff(String arg) {
     System.out.println(arg);
   }
 
-  protected void nonPublicStuff(String arg) {
+  protected void protectedStuff(String arg) {
     System.out.println(Paths.get("foo", arg));
   }
 
+  private void privateStuff(String arg) {
+    System.out.println(FileSystems.getDefault().getPath("foo", arg));
+  }
+
   void packagePrivateStuff(String arg) {
     System.out.println(arg);
   }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package com.github.codeql.test;`
`2`	`2`
	`3`	`+import java.nio.file.FileSystems;`
`3`	`4`	`import java.nio.file.Paths;`
`4`	`5`
`5`	`6`	`public class PublicClass {`
`@@ -11,10 +12,14 @@ public static void staticStuff(String arg) {`
`11`	`12`	`System.out.println(arg);`
`12`	`13`	`}`
`13`	`14`
`14`		`- protected void nonPublicStuff(String arg) {`
	`15`	`+ protected void protectedStuff(String arg) {`
`15`	`16`	`System.out.println(Paths.get("foo", arg));`
`16`	`17`	`}`
`17`	`18`
	`19`	`+ private void privateStuff(String arg) {`
	`20`	`+ System.out.println(FileSystems.getDefault().getPath("foo", arg));`
	`21`	`+ }`
	`22`	`+`
`18`	`23`	`void packagePrivateStuff(String arg) {`
`19`	`24`	`System.out.println(arg);`
`20`	`25`	`}`