svn commit: r1534172 - in /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark: AbstractTest.java XmlImportTest.java

[thomasm]

Author: thomasm
Date: Mon Oct 21 14:08:37 2013
New Revision: 1534172

URL: http://svn.apache.org/r1534172
Log:
OAK-641: Improved benchmark tooling - use different node names

Modified:
    
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
    
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/XmlImportTest.java

Modified: 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java?rev=1534172&r1=1534171&r2=1534172&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
 Mon Oct 21 14:08:37 2013
@@ -48,13 +48,13 @@ abstract class AbstractTest extends Benc
      */
     static final String TEST_ID = Integer.toHexString(new Random().nextInt());
     
-    static AtomicInteger counter = new AtomicInteger();
+    static AtomicInteger nodeNameCounter = new AtomicInteger();
     
     /**
      * A node name that is guarantee to be unique within the current JVM.
      */
     static String nextNodeName() {
-        return "n" + Integer.toHexString(counter.getAndIncrement());
+        return "n" + Integer.toHexString(nodeNameCounter.getAndIncrement());
     }
     
     private static final Credentials CREDENTIALS = new 
SimpleCredentials("admin", "admin".toCharArray());

Modified: 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/XmlImportTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/XmlImportTest.java?rev=1534172&r1=1534171&r2=1534172&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/XmlImportTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/XmlImportTest.java
 Mon Oct 21 14:08:37 2013
@@ -37,7 +37,7 @@ public class XmlImportTest extends Abstr
     @Override
     protected void beforeTest() throws Exception {
         adminSession = loginWriter();
-        String name = getClass().getSimpleName() + counter++;
+        String name = getClass().getSimpleName() + TEST_ID + counter++;
         testRoot = adminSession.getRootNode().addNode(name, "nt:unstructured");
         adminSession.save();
     }