Move verifyCompilationLogGenerated to OnDeviceSigningHostTest
Bug: 213573626
Test: atest odsign_e2e_tests
Change-Id: Id4fff0726468d111a9531bcdde9c09880cd5e5eb
diff --git a/test/odsign/test-src/com/android/tests/odsign/ActivationTest.java b/test/odsign/test-src/com/android/tests/odsign/ActivationTest.java
index ffcbc41..41a2972 100644
--- a/test/odsign/test-src/com/android/tests/odsign/ActivationTest.java
+++ b/test/odsign/test-src/com/android/tests/odsign/ActivationTest.java
@@ -64,14 +64,6 @@
}
@Test
- public void verifyCompilationLogGenerated() throws Exception {
- mTestUtils.enableAdbRootOrSkipTest();
-
- // Check there is a compilation log, we expect compilation to have occurred.
- assertTrue("Compilation log not found", mTestUtils.haveCompilationLog());
- }
-
- @Test
public void verifyGeneratedArtifactsLoaded() throws Exception {
// Checking zygote and system_server need the device have adb root to walk process maps.
mTestUtils.enableAdbRootOrSkipTest();
diff --git a/test/odsign/test-src/com/android/tests/odsign/CompOsSigningHostTest.java b/test/odsign/test-src/com/android/tests/odsign/CompOsSigningHostTest.java
index 699a83d..c646a44 100644
--- a/test/odsign/test-src/com/android/tests/odsign/CompOsSigningHostTest.java
+++ b/test/odsign/test-src/com/android/tests/odsign/CompOsSigningHostTest.java
@@ -30,7 +30,6 @@
import com.android.tradefed.testtype.junit4.BeforeClassWithInfo;
import com.android.tradefed.util.CommandResult;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -145,9 +144,6 @@
assertThat(numFiles).isEqualTo(0);
}
- @Ignore("Compilation log in CompOS isn't useful, and doesn't need to be generated")
- public void verifyCompilationLogGenerated() {}
-
private static String checksumDirectoryContentPartial(ITestDevice device, String path)
throws Exception {
// Sort by filename (second column) to make comparison easier.
diff --git a/test/odsign/test-src/com/android/tests/odsign/OnDeviceSigningHostTest.java b/test/odsign/test-src/com/android/tests/odsign/OnDeviceSigningHostTest.java
index 20a9ba7..cf83b0b 100644
--- a/test/odsign/test-src/com/android/tests/odsign/OnDeviceSigningHostTest.java
+++ b/test/odsign/test-src/com/android/tests/odsign/OnDeviceSigningHostTest.java
@@ -16,6 +16,8 @@
package com.android.tests.odsign;
+import static org.junit.Assert.assertTrue;
+
import com.android.tradefed.invoker.TestInformation;
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
import com.android.tradefed.testtype.junit4.AfterClassWithInfo;
@@ -48,4 +50,13 @@
testUtils.reboot();
testUtils.restoreAdbRoot();
}
+
+ @Test
+ public void verifyCompilationLogGenerated() throws Exception {
+ OdsignTestUtils testUtils = new OdsignTestUtils(getTestInformation());
+ testUtils.enableAdbRootOrSkipTest();
+
+ // Check there is a compilation log, we expect compilation to have occurred.
+ assertTrue("Compilation log not found", testUtils.haveCompilationLog());
+ }
}