Merge pull request #15678 from tamasvajk/fix/integration-test-paths

tamasvajk · web-flow · commit e13d6cdd578f · 2024-02-21T15:26:36.000+01:00
C#: Modify reported assembly paths in integration tests
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/Assemblies.expected b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/Assemblies.expected
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/Assemblies.ql b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/Assemblies.ql
@@ -4,8 +4,9 @@ private string getPath(Assembly a) {
   not a.getCompilation().getOutputAssembly() = a and
   exists(string s | s = a.getFile().getAbsolutePath() |
     result =
-      s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
-          "/packages".length(), s.length())
+      "[...]" +
+        s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
+            "/packages".length(), s.length())
     or
     result = s and
     not exists(s.indexOf("test-db/working/"))
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies/Assemblies.expected b/csharp/ql/integration-tests/posix-only/standalone_dependencies/Assemblies.expected
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies/Assemblies.ql b/csharp/ql/integration-tests/posix-only/standalone_dependencies/Assemblies.ql
@@ -4,8 +4,9 @@ private string getPath(Assembly a) {
   not a.getCompilation().getOutputAssembly() = a and
   exists(string s | s = a.getFile().getAbsolutePath() |
     result =
-      s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
-          "/packages".length(), s.length())
+      "[...]" +
+        s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
+            "/packages".length(), s.length())
     or
     result = s and
     not exists(s.indexOf("test-db/working/"))
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_multi_target/Assemblies.expected b/csharp/ql/integration-tests/posix-only/standalone_dependencies_multi_target/Assemblies.expected
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_multi_target/Assemblies.ql b/csharp/ql/integration-tests/posix-only/standalone_dependencies_multi_target/Assemblies.ql
@@ -4,8 +4,9 @@ private string getPath(Assembly a) {
   not a.getCompilation().getOutputAssembly() = a and
   exists(string s | s = a.getFile().getAbsolutePath() |
     result =
-      s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
-          "/packages".length(), s.length())
+      "[...]" +
+        s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
+            "/packages".length(), s.length())
     or
     result = s and
     not exists(s.indexOf("test-db/working/"))
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_no_framework/Assemblies.expected b/csharp/ql/integration-tests/posix-only/standalone_dependencies_no_framework/Assemblies.expected
@@ -1 +1 @@
-| /packages/newtonsoft.json/6.0.4/lib/net45/Newtonsoft.Json.dll |
+| [...]/packages/newtonsoft.json/6.0.4/lib/net45/Newtonsoft.Json.dll |
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_no_framework/Assemblies.ql b/csharp/ql/integration-tests/posix-only/standalone_dependencies_no_framework/Assemblies.ql
@@ -4,7 +4,8 @@ private string getPath(Assembly a) {
   not a.getCompilation().getOutputAssembly() = a and
   exists(string s | s = a.getFile().getAbsolutePath() |
     result =
-      s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16, s.length())
+      "[...]" +
+        s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16, s.length())
     or
     result = s and
     not exists(s.indexOf("test-db/working/"))
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget/Assemblies.expected b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget/Assemblies.expected
@@ -1 +1 @@
-| /Newtonsoft.Json.6.0.4/lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll |
+| [...]/Newtonsoft.Json.6.0.4/lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll |
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget/Assemblies.ql b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget/Assemblies.ql
@@ -4,8 +4,9 @@ private string getPath(Assembly a) {
   not a.getCompilation().getOutputAssembly() = a and
   exists(string s | s = a.getFile().getAbsolutePath() |
     result =
-      s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
-          "/legacypackages".length(), s.length())
+      "[...]" +
+        s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
+            "/legacypackages".length(), s.length())
     // TODO: include all other assemblies from the test results. Initially disable because mono installations were problematic on ARM runners.
   )
 }
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error/Assemblies.expected b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error/Assemblies.expected
@@ -1 +1 @@
-| newtonsoft.json/13.0.3/lib/net6.0/Newtonsoft.Json.dll |
+| [...]/newtonsoft.json/13.0.3/lib/net6.0/Newtonsoft.Json.dll |
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error/Assemblies.ql b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_config_error/Assemblies.ql
@@ -3,7 +3,7 @@ import csharp
 private string getPath(Assembly a) {
   not a.getCompilation().getOutputAssembly() = a and
   exists(string s | s = a.getFile().getAbsolutePath() |
-    result = s.substring(s.indexOf("newtonsoft.json"), s.length())
+    result = "[...]/" + s.substring(s.indexOf("newtonsoft.json"), s.length())
   )
 }
 
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_no_sources/Assemblies.expected b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_no_sources/Assemblies.expected
@@ -1 +1 @@
-| /Newtonsoft.Json.6.0.4/lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll |
+| [...]/Newtonsoft.Json.6.0.4/lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll |
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_no_sources/Assemblies.ql b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget_no_sources/Assemblies.ql
@@ -4,8 +4,9 @@ private string getPath(Assembly a) {
   not a.getCompilation().getOutputAssembly() = a and
   exists(string s | s = a.getFile().getAbsolutePath() |
     result =
-      s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
-          "/legacypackages".length(), s.length())
+      "[...]" +
+        s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
+            "/legacypackages".length(), s.length())
     // TODO: include all other assemblies from the test results. Initially disable because mono installations were problematic on ARM runners.
   )
 }
diff --git a/csharp/ql/integration-tests/windows-only/standalone_dependencies/Assemblies.expected b/csharp/ql/integration-tests/windows-only/standalone_dependencies/Assemblies.expected
diff --git a/csharp/ql/integration-tests/windows-only/standalone_dependencies/Assemblies.ql b/csharp/ql/integration-tests/windows-only/standalone_dependencies/Assemblies.ql
@@ -4,8 +4,9 @@ private string getPath(Assembly a) {
   not a.getCompilation().getOutputAssembly() = a and
   exists(string s | s = a.getFile().getAbsolutePath() |
     result =
-      s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
-          "/packages".length(), s.length())
+      "[...]" +
+        s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
+            "/packages".length(), s.length())
     or
     result = s and
     not exists(s.indexOf("test-db/working/"))

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| /packages/newtonsoft.json/6.0.4/lib/net45/Newtonsoft.Json.dll \|`
	`1`	`+\| [...]/packages/newtonsoft.json/6.0.4/lib/net45/Newtonsoft.Json.dll \|`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| /Newtonsoft.Json.6.0.4/lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll \|`
	`1`	`+\| [...]/Newtonsoft.Json.6.0.4/lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll \|`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,9 @@ private string getPath(Assembly a) {`
`4`	`4`	`not a.getCompilation().getOutputAssembly() = a and`
`5`	`5`	`exists(string s \| s = a.getFile().getAbsolutePath() \|`
`6`	`6`	`result =`
`7`		`- s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +`
`8`		`- "/legacypackages".length(), s.length())`
	`7`	`+ "[...]" +`
	`8`	`+ s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +`
	`9`	`+ "/legacypackages".length(), s.length())`
`9`	`10`	`// TODO: include all other assemblies from the test results. Initially disable because mono installations were problematic on ARM runners.`
`10`	`11`	`)`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| newtonsoft.json/13.0.3/lib/net6.0/Newtonsoft.Json.dll \|`
	`1`	`+\| [...]/newtonsoft.json/13.0.3/lib/net6.0/Newtonsoft.Json.dll \|`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import csharp`
`3`	`3`	`private string getPath(Assembly a) {`
`4`	`4`	`not a.getCompilation().getOutputAssembly() = a and`
`5`	`5`	`exists(string s \| s = a.getFile().getAbsolutePath() \|`
`6`		`- result = s.substring(s.indexOf("newtonsoft.json"), s.length())`
	`6`	`+ result = "[...]/" + s.substring(s.indexOf("newtonsoft.json"), s.length())`
`7`	`7`	`)`
`8`	`8`	`}`
`9`	`9`