svn commit: r1646727 - in /jackrabbit/oak/trunk/oak-core: pom.xml src/test/java/org/apache/jackrabbit/oak/stats/ClockTest.java

[md...@apache.org]

Author: mduerig
Date: Fri Dec 19 14:11:44 2014
New Revision: 1646727

URL: http://svn.apache.org/r1646727
Log:
OAK-2371: Helper class for CI configurations
Use CIHelper instead of ad-hoc method

Modified:
    jackrabbit/oak/trunk/oak-core/pom.xml
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/stats/ClockTest.java

Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1646727&r1=1646726&r2=1646727&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Fri Dec 19 14:11:44 2014
@@ -200,6 +200,13 @@
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-commons</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
       <artifactId>oak-blob</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/stats/ClockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/stats/ClockTest.java?rev=1646727&r1=1646726&r2=1646727&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/stats/ClockTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/stats/ClockTest.java Fri Dec 19 14:11:44 2014
@@ -17,12 +17,13 @@
 package org.apache.jackrabbit.oak.stats;
 
 import static junit.framework.Assert.assertTrue;
+import static org.apache.jackrabbit.oak.commons.CIHelper.buildBotTrunkWin7;
+import static org.junit.Assume.assumeTrue;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
 import org.apache.jackrabbit.oak.stats.Clock.Fast;
-import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -47,7 +48,7 @@ public class ClockTest {
     @Test
     public void testClockDrift() throws InterruptedException {
         // FIXME OAK-1904 temporary hack to disable this test on Apache buildbot
-        Assume.assumeTrue(!onBuildbot());
+        assumeTrue(!buildBotTrunkWin7());
         ScheduledExecutorService executor =
                 Executors.newSingleThreadScheduledExecutor();
 
@@ -90,11 +91,6 @@ public class ClockTest {
         }
     }
 
-    private static boolean onBuildbot() {
-        String user = System.getenv("USERDOMAIN");
-        return user != null && user.startsWith("bb-win7");
-    }
-
     private static long getGranularity(Clock clock) {
         return clock instanceof Fast
             ? FAST_CLOCK_GRANULARITY
@@ -126,11 +122,11 @@ public class ClockTest {
     }
 
     /**
-     * On some systems (for instance Windows), the granularity of {@link System.currentTimeMillis} depends
+     * On some systems (for instance Windows), the granularity of {@code System.currentTimeMillis} depends
      * on system-wide settings that can change depending on what applications are running
      * (see, for instance <a href="http://www.lifehacker.com.au/2009/05/hidden-windows-7-tool-troubleshoots-sleep-mode-problems/">http://www.lifehacker.com.au/2009/05/hidden-windows-7-tool-troubleshoots-sleep-mode-problems/</a>).
      * This method tries to measure the granularity.
-     * @return average granularity of {@link System.currentTimeMillis} in 1/1000 of milliseconds
+     * @return average granularity of {@code System.currentTimeMillis} in 1/1000 of milliseconds
      */
     private static long getAverageClockGranularity() {
         long sum = 0;