commit c21996a3198d8f0cc40759a828ff5ecb343bf281
author Tobias Thierer <tobiast@google.com> Fri Apr 21 12:37:14 2017 +0100
committer Tobias Thierer <tobiast@google.com> Fri Apr 21 14:43:42 2017 +0100
tree d3e1a2a6bb6a67beffed3274d07b323e64e79c94
parent 5625dd670ca4f36967343375f0e7b4875bb1b56d

Revert "BuildTest: split out test expected to fail on prerelease builds"

The commit was based on a misunderstanding of the semantics of
the @RestrictedBuildTest annotation.

This reverts commit b2d6cf2d3ac5e9a152b9deca8ae4e9b33e65c27b.

Test: nothing, ran BuildTest at subsequent CL
Bug: 35922665
Bug: 37484198

Change-Id: I9a41c7ae5255be2ec116f6af97959be8cecac11b

tests/tests/os/src/android/os/cts/BuildTest.java

diff --git a/tests/tests/os/src/android/os/cts/BuildTest.java b/tests/tests/os/src/android/os/cts/BuildTest.java
index d489a6a..668daa5 100644
--- a/tests/tests/os/src/android/os/cts/BuildTest.java
+++ b/tests/tests/os/src/android/os/cts/BuildTest.java
@@ -223,21 +223,7 @@
         assertTrue(TYPE_PATTERN.matcher(Build.TYPE).matches());
 
         assertNotEmpty(Build.USER);
-    }
 
-    public void testBuildConstants_forPrereleaseOrRelease() {
-        checkBuildConstants(CUR_DEVELOPMENT);
-    }
-
-    @RestrictedBuildTest // Expected to fail on prelease/dev builds, http://b/35922665
-    public void testBuildConstants_forRelease() {
-        checkBuildConstants(CUR_DEVELOPMENT - 1);
-    }
-
-    /**
-     * @param maxAllowedValue the maximum permitted value for constants other than CUR_DEVELOPMENT
-     */
-    private static void checkBuildConstants(int maxAllowedValue) {
         // CUR_DEVELOPMENT must be larger than any released version.
         Field[] fields = Build.VERSION_CODES.class.getDeclaredFields();
         for (Field field : fields) {
@@ -254,8 +240,8 @@
                     // should at least be a conscious decision.
                     assertEquals(10000, fieldValue);
                 } else {
-                    assertTrue("Expected " + fieldName + " value to be <= " + maxAllowedValue
-                            + ", got " + fieldValue, fieldValue <= maxAllowedValue);
+                    assertTrue("Expected " + fieldName + " value to be < " + CUR_DEVELOPMENT
+                            + ", got " + fieldValue, fieldValue < CUR_DEVELOPMENT);
                 }
             }
         }