Merge "Mark ApacheXML tests as @FlakyTest" into main am: 68d4acad32 am: 092dcaace9 am: db26a9f927 am: 6803fd12d0 am: 966c2a2f6e
Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2673675
Change-Id: Ida6f3e707e1137765eeeeabb9a348125e9982761
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index 9f2c596..09bfe28 100644
--- a/Android.bp
+++ b/Android.bp
@@ -136,6 +136,7 @@
libs: [
"apache-xml",
"junit",
+ "platform-test-annotations",
],
sdk_version: "none",
system_modules: "core-all-system-modules",
diff --git a/test/java/src/org/apache/qetest/trax/ErrorListenerAPITest.java b/test/java/src/org/apache/qetest/trax/ErrorListenerAPITest.java
index 1c80f05..03f0db6 100644
--- a/test/java/src/org/apache/qetest/trax/ErrorListenerAPITest.java
+++ b/test/java/src/org/apache/qetest/trax/ErrorListenerAPITest.java
@@ -26,6 +26,7 @@
*/
package org.apache.qetest.trax;
+import android.platform.test.annotations.FlakyTest;
import java.util.Properties;
import javax.xml.transform.ErrorListener;
@@ -180,6 +181,7 @@
}
// Android-added: Run main method as a JUnit test case.
+ @FlakyTest(bugId = 292520220)
@Test
public void main() {
main(new String[0]);
diff --git a/test/java/src/org/apache/qetest/trax/ErrorListenerTest.java b/test/java/src/org/apache/qetest/trax/ErrorListenerTest.java
index e5a6789..d373d0f 100644
--- a/test/java/src/org/apache/qetest/trax/ErrorListenerTest.java
+++ b/test/java/src/org/apache/qetest/trax/ErrorListenerTest.java
@@ -26,6 +26,7 @@
*/
package org.apache.qetest.trax;
+import android.platform.test.annotations.FlakyTest;
import java.io.File;
import java.util.Properties;
@@ -436,6 +437,7 @@
}
// Android-added: Run main method as a JUnit test case.
+ @FlakyTest(bugId = 292520220)
@Test
public void main() {
main(new String[0]);
diff --git a/test/java/src/org/apache/qetest/trax/ParameterTest.java b/test/java/src/org/apache/qetest/trax/ParameterTest.java
index 14d8a2f..6882910 100644
--- a/test/java/src/org/apache/qetest/trax/ParameterTest.java
+++ b/test/java/src/org/apache/qetest/trax/ParameterTest.java
@@ -26,6 +26,7 @@
*/
package org.apache.qetest.trax;
+import android.platform.test.annotations.FlakyTest;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -580,6 +581,7 @@
}
// Android-added: Run main method as a JUnit test case.
+ @FlakyTest(bugId = 292520220)
@Test
public void main() {
main(new String[0]);
diff --git a/test/java/src/org/apache/qetest/trax/TemplatesAPITest.java b/test/java/src/org/apache/qetest/trax/TemplatesAPITest.java
index 1e8d21c..3603145 100644
--- a/test/java/src/org/apache/qetest/trax/TemplatesAPITest.java
+++ b/test/java/src/org/apache/qetest/trax/TemplatesAPITest.java
@@ -26,6 +26,7 @@
*/
package org.apache.qetest.trax;
+import android.platform.test.annotations.FlakyTest;
import java.io.File;
import java.util.Properties;
@@ -268,6 +269,7 @@
}
// Android-added: Run main method as a JUnit test case.
+ @FlakyTest(bugId = 292520220)
@Test
public void main() {
main(new String[0]);
diff --git a/test/java/src/org/apache/qetest/trax/TransformerAPITest.java b/test/java/src/org/apache/qetest/trax/TransformerAPITest.java
index 48acc0c..9781299 100644
--- a/test/java/src/org/apache/qetest/trax/TransformerAPITest.java
+++ b/test/java/src/org/apache/qetest/trax/TransformerAPITest.java
@@ -21,6 +21,7 @@
package org.apache.qetest.trax;
+import android.platform.test.annotations.FlakyTest;
import java.io.File;
import java.io.FileOutputStream;
import java.util.Enumeration;
@@ -1315,6 +1316,7 @@
}
// Android-added: Run main method as a JUnit test case.
+ @FlakyTest(bugId = 292520220)
@Test
public void main() {
main(new String[0]);
diff --git a/test/java/src/org/apache/qetest/trax/URIResolverTest.java b/test/java/src/org/apache/qetest/trax/URIResolverTest.java
index be4d346..821d22f 100644
--- a/test/java/src/org/apache/qetest/trax/URIResolverTest.java
+++ b/test/java/src/org/apache/qetest/trax/URIResolverTest.java
@@ -26,6 +26,7 @@
*/
package org.apache.qetest.trax;
+import android.platform.test.annotations.FlakyTest;
import java.io.File;
import java.util.Properties;
@@ -218,6 +219,7 @@
}
// Android-added: Run main method as a JUnit test case.
+ @FlakyTest(bugId = 292520220)
@Test
public void main() {
main(new String[0]);
diff --git a/test/java/src/org/apache/qetest/xalanj2/OutputSettingsTest.java b/test/java/src/org/apache/qetest/xalanj2/OutputSettingsTest.java
index 0f026f0..e3e1eed 100644
--- a/test/java/src/org/apache/qetest/xalanj2/OutputSettingsTest.java
+++ b/test/java/src/org/apache/qetest/xalanj2/OutputSettingsTest.java
@@ -26,6 +26,7 @@
*/
package org.apache.qetest.xalanj2;
+import android.platform.test.annotations.FlakyTest;
import java.io.File;
import java.util.Properties;
@@ -254,6 +255,7 @@
}
// Android-added: Run main method as a JUnit test case.
+ @FlakyTest(bugId = 292520220)
@Test
public void main() {
main(new String[0]);
diff --git a/test/java/src/org/apache/qetest/xalanj2/PrefixResolverAPITest.java b/test/java/src/org/apache/qetest/xalanj2/PrefixResolverAPITest.java
index 57b725e..7a1bba1 100644
--- a/test/java/src/org/apache/qetest/xalanj2/PrefixResolverAPITest.java
+++ b/test/java/src/org/apache/qetest/xalanj2/PrefixResolverAPITest.java
@@ -20,6 +20,7 @@
*/
package org.apache.qetest.xalanj2;
+import android.platform.test.annotations.FlakyTest;
import java.io.StringReader;
import java.util.Properties;
@@ -188,6 +189,7 @@
}
// Android-added: Run main method as a JUnit test case.
+ @FlakyTest(bugId = 292520220)
@Test
public void main() {
main(new String[0]);
diff --git a/test/java/src/org/apache/qetest/xalanj2/ProgrammaticDOMTest.java b/test/java/src/org/apache/qetest/xalanj2/ProgrammaticDOMTest.java
index 963040b..154233c 100644
--- a/test/java/src/org/apache/qetest/xalanj2/ProgrammaticDOMTest.java
+++ b/test/java/src/org/apache/qetest/xalanj2/ProgrammaticDOMTest.java
@@ -26,6 +26,7 @@
*/
package org.apache.qetest.xalanj2;
+import android.platform.test.annotations.FlakyTest;
import java.io.File;
import java.util.Properties;
@@ -513,6 +514,7 @@
}
// Android-added: Run main method as a JUnit test case.
+ @FlakyTest(bugId = 292520220)
@Test
public void main() {
main(new String[0]);
diff --git a/test/java/src/org/apache/qetest/xalanj2/SerializedStylesheetTest.java b/test/java/src/org/apache/qetest/xalanj2/SerializedStylesheetTest.java
index 3594ffd..5e82066 100644
--- a/test/java/src/org/apache/qetest/xalanj2/SerializedStylesheetTest.java
+++ b/test/java/src/org/apache/qetest/xalanj2/SerializedStylesheetTest.java
@@ -26,6 +26,7 @@
*/
package org.apache.qetest.xalanj2;
+import android.platform.test.annotations.FlakyTest;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -225,6 +226,7 @@
}
// Android-added: Run main method as a JUnit test case.
+ @FlakyTest(bugId = 292520220)
@Test
public void main() {
main(new String[0]);
diff --git a/test/java/src/org/apache/qetest/xalanj2/SystemIDResolverAPITest.java b/test/java/src/org/apache/qetest/xalanj2/SystemIDResolverAPITest.java
index 2a4ec78..219e636 100644
--- a/test/java/src/org/apache/qetest/xalanj2/SystemIDResolverAPITest.java
+++ b/test/java/src/org/apache/qetest/xalanj2/SystemIDResolverAPITest.java
@@ -20,6 +20,7 @@
*/
package org.apache.qetest.xalanj2;
+import android.platform.test.annotations.FlakyTest;
import org.apache.qetest.FileBasedTest;
import org.apache.xml.utils.SystemIDResolver;
import org.junit.Test;
@@ -183,6 +184,7 @@
}
// Android-added: Run main method as a JUnit test case.
+ @FlakyTest(bugId = 292520220)
@Test
public void main() {
main(new String[0]);
diff --git a/test/java/src/org/apache/qetest/xalanj2/TestXPathAPI.java b/test/java/src/org/apache/qetest/xalanj2/TestXPathAPI.java
index 1901b26..f548123 100644
--- a/test/java/src/org/apache/qetest/xalanj2/TestXPathAPI.java
+++ b/test/java/src/org/apache/qetest/xalanj2/TestXPathAPI.java
@@ -27,6 +27,7 @@
*/
package org.apache.qetest.xalanj2;
+import android.platform.test.annotations.FlakyTest;
import java.io.File;
import java.io.FileInputStream;
import java.util.Properties;
@@ -465,6 +466,7 @@
}
// Android-added: Run main method as a JUnit test case.
+ @FlakyTest(bugId = 292520220)
@Test
public void main() {
main(new String[0]);
diff --git a/test/java/src/org/apache/qetest/xalanj2/TraceListenerTest.java b/test/java/src/org/apache/qetest/xalanj2/TraceListenerTest.java
index b468e80..091ebb2 100644
--- a/test/java/src/org/apache/qetest/xalanj2/TraceListenerTest.java
+++ b/test/java/src/org/apache/qetest/xalanj2/TraceListenerTest.java
@@ -26,6 +26,7 @@
*/
package org.apache.qetest.xalanj2;
+import android.platform.test.annotations.FlakyTest;
import java.io.File;
import java.util.Properties;
@@ -481,6 +482,7 @@
}
// Android-added: Run main method as a JUnit test case.
+ @FlakyTest(bugId = 292520220)
@Test
public void main() {
main(new String[0]);
diff --git a/test/java/src/org/apache/qetest/xalanj2/TransformStateTest.java b/test/java/src/org/apache/qetest/xalanj2/TransformStateTest.java
index 3b6c31a..2f1b106 100644
--- a/test/java/src/org/apache/qetest/xalanj2/TransformStateTest.java
+++ b/test/java/src/org/apache/qetest/xalanj2/TransformStateTest.java
@@ -26,6 +26,7 @@
*/
package org.apache.qetest.xalanj2;
+import android.platform.test.annotations.FlakyTest;
import java.io.File;
import java.util.Properties;
import java.util.Vector;
@@ -299,6 +300,7 @@
}
// Android-added: Run main method as a JUnit test case.
+ @FlakyTest(bugId = 292520220)
@Test
public void main() {
main(new String[0]);
