Change allowBackup tests to use qlref test format

egregius313 · egregius313 · commit 59909751ae03 · 2022-09-08T10:34:17.000-04:00
Due to some limitations of comments in XML, it is simpler to implement
the `android:allowBackup` tests using the qlref/expectations test format.
diff --git a/java/ql/test/query-tests/security/CWE-312/android/backup/AllowBackupEnabledTest.expected b/java/ql/test/query-tests/security/CWE-312/android/backup/AllowBackupEnabledTest.expected
@@ -0,0 +1,2 @@
+| TestExplicitlyEnabled/AndroidManifest.xml:6:5:27:19 | application | The 'android:allowBackup' attribute is enabled. |
+| TestMissing/AndroidManifest.xml:6:5:27:19 | application | The 'android:allowBackup' attribute is enabled. |
diff --git a/java/ql/test/query-tests/security/CWE-312/android/backup/AllowBackupEnabledTest.ql b/java/ql/test/query-tests/security/CWE-312/android/backup/AllowBackupEnabledTest.ql
diff --git a/java/ql/test/query-tests/security/CWE-312/android/backup/AllowBackupEnabledTest.qlref b/java/ql/test/query-tests/security/CWE-312/android/backup/AllowBackupEnabledTest.qlref
@@ -0,0 +1 @@
+Security/CWE/CWE-312/AllowBackupAttributeEnabled.ql
diff --git a/java/ql/test/query-tests/security/CWE-312/android/backup/TestExplicitlyEnabled/AndroidManifest.xml b/java/ql/test/query-tests/security/CWE-312/android/backup/TestExplicitlyEnabled/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.example.myapplication">
 
-    <!-- $ hasAllowBackupEnabled --> <application
+    <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
diff --git a/java/ql/test/query-tests/security/CWE-312/android/backup/TestMissing/AndroidManifest.xml b/java/ql/test/query-tests/security/CWE-312/android/backup/TestMissing/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.example.myapplication">
 
-    <!-- $ hasAllowBackupEnabled --> <application
+    <application
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
diff --git a/java/ql/test/query-tests/security/CWE-312/android/backup/options b/java/ql/test/query-tests/security/CWE-312/android/backup/options
@@ -0,0 +1,2 @@
+// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../stubs/google-android-9.0.0
+// codeql-extractor-kotlin-options: ${testdir}/../../../../../stubs/google-android-9.0.0

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+\| TestExplicitlyEnabled/AndroidManifest.xml:6:5:27:19 \| application \| The 'android:allowBackup' attribute is enabled. \|`
	`2`	`+\| TestMissing/AndroidManifest.xml:6:5:27:19 \| application \| The 'android:allowBackup' attribute is enabled. \|`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Security/CWE/CWE-312/AllowBackupAttributeEnabled.ql`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../stubs/google-android-9.0.0`
	`2`	`+// codeql-extractor-kotlin-options: ${testdir}/../../../../../stubs/google-android-9.0.0`