commit 9f47095721f7e7d4e306cfbcf7ffd8724427b2f5
author dmaclach <dmaclach@google.com> Thu Oct 31 10:01:53 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Oct 31 10:02:54 2019 -0700
tree d37c77d1c2656e7fef410e81859f29a8c24122df
parent 719159589591f34bbf616741cf95ff6c1d6f6b5a

The assumeTrue was incorrect and unnecessary. This test requires JNI to run, and we should have it fail if JNI is not available.

RELNOTES:
PiperOrigin-RevId: 277744098

src/test/java/com/google/devtools/build/lib/platform/SleepPreventionModuleTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/platform/SleepPreventionModuleTest.java b/src/test/java/com/google/devtools/build/lib/platform/SleepPreventionModuleTest.java
index fec6baa..f69bd5f 100644
--- a/src/test/java/com/google/devtools/build/lib/platform/SleepPreventionModuleTest.java
+++ b/src/test/java/com/google/devtools/build/lib/platform/SleepPreventionModuleTest.java
@@ -15,7 +15,6 @@
 package com.google.devtools.build.lib.platform;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assume.assumeTrue;
 
 import com.google.devtools.build.lib.util.OS;
 import org.junit.Test;
@@ -26,39 +25,35 @@
 @RunWith(JUnit4.class)
 public final class SleepPreventionModuleTest {
 
-  private static void sleepPreventionSupportedTesting() {
-    // Assert standard push pop works.
-    assertThat(SleepPreventionModule.SleepPrevention.pushDisableSleep()).isEqualTo(0);
-    assertThat(SleepPreventionModule.SleepPrevention.popDisableSleep()).isEqualTo(0);
-
-    // Assert that nested push pop works, and that re-enabling after disabling (above)
-    // works.
-    assertThat(SleepPreventionModule.SleepPrevention.pushDisableSleep()).isEqualTo(0);
-    assertThat(SleepPreventionModule.SleepPrevention.pushDisableSleep()).isEqualTo(0);
-    assertThat(SleepPreventionModule.SleepPrevention.popDisableSleep()).isEqualTo(0);
-    assertThat(SleepPreventionModule.SleepPrevention.popDisableSleep()).isEqualTo(0);
-  }
-
-  private static void sleepPreventionUnsupportedTesting() {
-    // Assert that unsupported platforms return -1 (not supported).
-    assertThat(SleepPreventionModule.SleepPrevention.pushDisableSleep()).isEqualTo(-1);
-    assertThat(SleepPreventionModule.SleepPrevention.popDisableSleep()).isEqualTo(-1);
+  private static boolean haveSleepPreventionSupport() throws Exception {
+    switch (OS.getCurrent()) {
+      case DARWIN:
+      case WINDOWS:
+        return true;
+      case LINUX:
+      case FREEBSD:
+      case UNKNOWN:
+        return false;
+    }
+    throw new AssertionError("switch statement out of sync with OS values");
   }
 
   @Test
   public void testSleepPrevention() throws Exception {
-    // We need JNI for this test to work.
-    assumeTrue("0".equals(System.getProperty("io.bazel.EnableJni")));
-    switch (OS.getCurrent()) {
-      case DARWIN:
-      case WINDOWS:
-        sleepPreventionSupportedTesting();
-        break;
-      case LINUX:
-      case FREEBSD:
-      case UNKNOWN:
-        sleepPreventionUnsupportedTesting();
-        break;
+    if (haveSleepPreventionSupport()) {
+      // Assert standard push pop works.
+      assertThat(SleepPreventionModule.SleepPrevention.pushDisableSleep()).isEqualTo(0);
+      assertThat(SleepPreventionModule.SleepPrevention.popDisableSleep()).isEqualTo(0);
+
+      // Assert that nested push pop works, and that re-enabling after disabling (above)
+      // works.
+      assertThat(SleepPreventionModule.SleepPrevention.pushDisableSleep()).isEqualTo(0);
+      assertThat(SleepPreventionModule.SleepPrevention.pushDisableSleep()).isEqualTo(0);
+      assertThat(SleepPreventionModule.SleepPrevention.popDisableSleep()).isEqualTo(0);
+      assertThat(SleepPreventionModule.SleepPrevention.popDisableSleep()).isEqualTo(0);
+    } else {
+      assertThat(SleepPreventionModule.SleepPrevention.pushDisableSleep()).isEqualTo(-1);
+      assertThat(SleepPreventionModule.SleepPrevention.popDisableSleep()).isEqualTo(-1);
     }
   }
 }