SLING-2311 - renaming tests to clarify that they are trying to resovle non-existing resources
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1378668 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveWith10000AliasTest.java b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000AliasTest.java
similarity index 84%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveWith10000AliasTest.java
rename to base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000AliasTest.java
index 4f6952a..49f7fc4 100644
--- a/base/src/main/java/org/apache/sling/performance/tests/ResolveWith10000AliasTest.java
+++ b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000AliasTest.java
@@ -18,9 +18,9 @@
import org.apache.sling.performance.TestHelper;
-public class ResolveWith10000AliasTest extends ResolveWithManyAliasTest {
+public class ResolveNonExistingWith10000AliasTest extends ResolveNonExistingWithManyAliasTest {
- public ResolveWith10000AliasTest(TestHelper helper) {
+ public ResolveNonExistingWith10000AliasTest(TestHelper helper) {
super(helper, 10000);
}
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveWith10000VanityPathTest.java b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000VanityPathTest.java
similarity index 83%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveWith10000VanityPathTest.java
rename to base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000VanityPathTest.java
index 88ad4ab..998b5c3 100644
--- a/base/src/main/java/org/apache/sling/performance/tests/ResolveWith10000VanityPathTest.java
+++ b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000VanityPathTest.java
@@ -18,9 +18,9 @@
import org.apache.sling.performance.TestHelper;
-public class ResolveWith10000VanityPathTest extends ResolveWithManyVanityPathTest {
+public class ResolveNonExistingWith10000VanityPathTest extends ResolveNonExistingWithManyVanityPathTest {
- public ResolveWith10000VanityPathTest(TestHelper helper) {
+ public ResolveNonExistingWith10000VanityPathTest(TestHelper helper) {
super(helper, 100, 100);
}
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveWith1000AliasTest.java b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000AliasTest.java
similarity index 85%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveWith1000AliasTest.java
rename to base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000AliasTest.java
index 9f93d1d..43fdfc9 100644
--- a/base/src/main/java/org/apache/sling/performance/tests/ResolveWith1000AliasTest.java
+++ b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000AliasTest.java
@@ -18,9 +18,9 @@
import org.apache.sling.performance.TestHelper;
-public class ResolveWith1000AliasTest extends ResolveWithManyAliasTest {
+public class ResolveNonExistingWith1000AliasTest extends ResolveNonExistingWithManyAliasTest {
- public ResolveWith1000AliasTest(TestHelper helper) {
+ public ResolveNonExistingWith1000AliasTest(TestHelper helper) {
super(helper, 1000);
}
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveWith1000VanityPathTest.java b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000VanityPathTest.java
similarity index 83%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveWith1000VanityPathTest.java
rename to base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000VanityPathTest.java
index 7c5f167..7e2bcfb 100644
--- a/base/src/main/java/org/apache/sling/performance/tests/ResolveWith1000VanityPathTest.java
+++ b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000VanityPathTest.java
@@ -18,9 +18,9 @@
import org.apache.sling.performance.TestHelper;
-public class ResolveWith1000VanityPathTest extends ResolveWithManyVanityPathTest {
+public class ResolveNonExistingWith1000VanityPathTest extends ResolveNonExistingWithManyVanityPathTest {
- public ResolveWith1000VanityPathTest(TestHelper helper) {
+ public ResolveNonExistingWith1000VanityPathTest(TestHelper helper) {
super(helper, 100, 10);
}
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveWith30000AliasTest.java b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000AliasTest.java
similarity index 84%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveWith30000AliasTest.java
rename to base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000AliasTest.java
index 56e4ab2..cd1ed35 100644
--- a/base/src/main/java/org/apache/sling/performance/tests/ResolveWith30000AliasTest.java
+++ b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000AliasTest.java
@@ -18,9 +18,9 @@
import org.apache.sling.performance.TestHelper;
-public class ResolveWith30000AliasTest extends ResolveWithManyAliasTest {
+public class ResolveNonExistingWith30000AliasTest extends ResolveNonExistingWithManyAliasTest {
- public ResolveWith30000AliasTest(TestHelper helper) {
+ public ResolveNonExistingWith30000AliasTest(TestHelper helper) {
super(helper, 30000);
}
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveWith30000VanityPathTest.java b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000VanityPathTest.java
similarity index 83%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveWith30000VanityPathTest.java
rename to base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000VanityPathTest.java
index 7248a6e..b4b2a7d 100644
--- a/base/src/main/java/org/apache/sling/performance/tests/ResolveWith30000VanityPathTest.java
+++ b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000VanityPathTest.java
@@ -18,9 +18,9 @@
import org.apache.sling.performance.TestHelper;
-public class ResolveWith30000VanityPathTest extends ResolveWithManyVanityPathTest {
+public class ResolveNonExistingWith30000VanityPathTest extends ResolveNonExistingWithManyVanityPathTest {
- public ResolveWith30000VanityPathTest(TestHelper helper) {
+ public ResolveNonExistingWith30000VanityPathTest(TestHelper helper) {
super(helper, 300, 100);
}
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveWith5000AliasTest.java b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000AliasTest.java
similarity index 85%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveWith5000AliasTest.java
rename to base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000AliasTest.java
index 54f9cdb..9771516 100644
--- a/base/src/main/java/org/apache/sling/performance/tests/ResolveWith5000AliasTest.java
+++ b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000AliasTest.java
@@ -18,9 +18,9 @@
import org.apache.sling.performance.TestHelper;
-public class ResolveWith5000AliasTest extends ResolveWithManyAliasTest {
+public class ResolveNonExistingWith5000AliasTest extends ResolveNonExistingWithManyAliasTest {
- public ResolveWith5000AliasTest(TestHelper helper) {
+ public ResolveNonExistingWith5000AliasTest(TestHelper helper) {
super(helper, 5000);
}
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveWith5000VanityPathTest.java b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000VanityPathTest.java
similarity index 83%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveWith5000VanityPathTest.java
rename to base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000VanityPathTest.java
index b22c6d4..0b3f6fb 100644
--- a/base/src/main/java/org/apache/sling/performance/tests/ResolveWith5000VanityPathTest.java
+++ b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000VanityPathTest.java
@@ -18,9 +18,9 @@
import org.apache.sling.performance.TestHelper;
-public class ResolveWith5000VanityPathTest extends ResolveWithManyVanityPathTest {
+public class ResolveNonExistingWith5000VanityPathTest extends ResolveNonExistingWithManyVanityPathTest {
- public ResolveWith5000VanityPathTest(TestHelper helper) {
+ public ResolveNonExistingWith5000VanityPathTest(TestHelper helper) {
super(helper, 100, 50);
}
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveWithManyAliasTest.java b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyAliasTest.java
similarity index 96%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveWithManyAliasTest.java
rename to base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyAliasTest.java
index a6d7061..f77ffb6 100644
--- a/base/src/main/java/org/apache/sling/performance/tests/ResolveWithManyAliasTest.java
+++ b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyAliasTest.java
@@ -33,7 +33,7 @@
import static org.junit.Assert.assertNotNull;
-class ResolveWithManyAliasTest extends AbstractRepositoryTest {
+class ResolveNonExistingWithManyAliasTest extends AbstractRepositoryTest {
private static final String PN_SLING_ALIAS = "sling:alias";
@@ -49,7 +49,7 @@
private final int nodeCount;
- public ResolveWithManyAliasTest(TestHelper helper, int nodeCount) {
+ public ResolveNonExistingWithManyAliasTest(TestHelper helper, int nodeCount) {
this.helper = helper;
this.nodeCount = nodeCount;
}
diff --git a/base/src/main/java/org/apache/sling/performance/tests/ResolveWithManyVanityPathTest.java b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyVanityPathTest.java
similarity index 96%
rename from base/src/main/java/org/apache/sling/performance/tests/ResolveWithManyVanityPathTest.java
rename to base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyVanityPathTest.java
index c803f33..3dbc2b4 100644
--- a/base/src/main/java/org/apache/sling/performance/tests/ResolveWithManyVanityPathTest.java
+++ b/base/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyVanityPathTest.java
@@ -33,7 +33,7 @@
import org.apache.sling.performance.TestHelper;
import org.apache.sling.performance.ResourceResolverTestRequest;
-class ResolveWithManyVanityPathTest extends AbstractRepositoryTest {
+class ResolveNonExistingWithManyVanityPathTest extends AbstractRepositoryTest {
private static final String NT_VANITY_PATH = "sling:VanityPath";
@@ -53,7 +53,7 @@
private final int childNodeCount;
- public ResolveWithManyVanityPathTest(TestHelper helper, int nodeCount, int childNodeCount) {
+ public ResolveNonExistingWithManyVanityPathTest(TestHelper helper, int nodeCount, int childNodeCount) {
this.helper = helper;
this.nodeCount = nodeCount;
this.childNodeCount = childNodeCount;
diff --git a/jcr-resource-2.0.10/src/test/java/org/apache/sling/performance/PerformanceTest.java b/jcr-resource-2.0.10/src/test/java/org/apache/sling/performance/PerformanceTest.java
index 4dc91c5..b7a66e0 100644
--- a/jcr-resource-2.0.10/src/test/java/org/apache/sling/performance/PerformanceTest.java
+++ b/jcr-resource-2.0.10/src/test/java/org/apache/sling/performance/PerformanceTest.java
@@ -31,14 +31,14 @@
import org.apache.sling.jcr.resource.internal.JcrResourceResolverFactoryImpl;
import org.apache.sling.jcr.resource.internal.helper.MapEntries;
import org.apache.sling.jcr.resource.internal.helper.Mapping;
-import org.apache.sling.performance.tests.ResolveWith10000AliasTest;
-import org.apache.sling.performance.tests.ResolveWith10000VanityPathTest;
-import org.apache.sling.performance.tests.ResolveWith1000AliasTest;
-import org.apache.sling.performance.tests.ResolveWith1000VanityPathTest;
-import org.apache.sling.performance.tests.ResolveWith30000AliasTest;
-import org.apache.sling.performance.tests.ResolveWith30000VanityPathTest;
-import org.apache.sling.performance.tests.ResolveWith5000AliasTest;
-import org.apache.sling.performance.tests.ResolveWith5000VanityPathTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith10000AliasTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith10000VanityPathTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith1000AliasTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith1000VanityPathTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith30000AliasTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith30000VanityPathTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith5000AliasTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith5000VanityPathTest;
public class PerformanceTest extends AbstractPerformanceTest {
@@ -91,14 +91,14 @@
Helper helper = new Helper();
List<AbstractTest> tests = new ArrayList<AbstractTest>();
- tests.add(new ResolveWith1000VanityPathTest(helper));
- tests.add(new ResolveWith5000VanityPathTest(helper));
- tests.add(new ResolveWith10000VanityPathTest(helper));
- //tests.add(new ResolveWith30000VanityPathTest(helper));
- tests.add(new ResolveWith1000AliasTest(helper));
- tests.add(new ResolveWith5000AliasTest(helper));
- tests.add(new ResolveWith10000AliasTest(helper));
- //tests.add(new ResolveWith30000AliasTest(helper));
+ tests.add(new ResolveNonExistingWith1000VanityPathTest(helper));
+ tests.add(new ResolveNonExistingWith5000VanityPathTest(helper));
+ tests.add(new ResolveNonExistingWith10000VanityPathTest(helper));
+ //tests.add(new ResolveNonExistingWith30000VanityPathTest(helper));
+ tests.add(new ResolveNonExistingWith1000AliasTest(helper));
+ tests.add(new ResolveNonExistingWith5000AliasTest(helper));
+ tests.add(new ResolveNonExistingWith10000AliasTest(helper));
+ //tests.add(new ResolveNonExistingWith30000AliasTest(helper));
testPerformance("jcr.resource-2.1.0", tests);
}
}
diff --git a/jcr-resource-2.1.0/src/test/java/org/apache/sling/performance/PerformanceTest.java b/jcr-resource-2.1.0/src/test/java/org/apache/sling/performance/PerformanceTest.java
index 5aee3fa..d9cd613 100644
--- a/jcr-resource-2.1.0/src/test/java/org/apache/sling/performance/PerformanceTest.java
+++ b/jcr-resource-2.1.0/src/test/java/org/apache/sling/performance/PerformanceTest.java
@@ -103,14 +103,14 @@
Helper helper = new Helper();
List<AbstractTest> tests = new ArrayList<AbstractTest>();
- tests.add(new ResolveWith1000VanityPathTest(helper));
- tests.add(new ResolveWith5000VanityPathTest(helper));
- tests.add(new ResolveWith10000VanityPathTest(helper));
- //tests.add(new ResolveWith30000VanityPathTest(helper));
- tests.add(new ResolveWith1000AliasTest(helper));
- tests.add(new ResolveWith5000AliasTest(helper));
- tests.add(new ResolveWith10000AliasTest(helper));
- //tests.add(new ResolveWith30000AliasTest(helper));
+ tests.add(new ResolveNonExistingWith1000VanityPathTest(helper));
+ tests.add(new ResolveNonExistingWith5000VanityPathTest(helper));
+ tests.add(new ResolveNonExistingWith10000VanityPathTest(helper));
+ //tests.add(new ResolveNonExistingWith30000VanityPathTest(helper));
+ tests.add(new ResolveNonExistingWith1000AliasTest(helper));
+ tests.add(new ResolveNonExistingWith5000AliasTest(helper));
+ tests.add(new ResolveNonExistingWith10000AliasTest(helper));
+ //tests.add(new ResolveNonExistingWith30000AliasTest(helper));
testPerformance("jcr.resource-2.1.0", tests);
}
}
diff --git a/jcr-resource-2.2.0/src/test/java/org/apache/sling/performance/PerformanceTest.java b/jcr-resource-2.2.0/src/test/java/org/apache/sling/performance/PerformanceTest.java
index d29c7a3..d67b90f 100644
--- a/jcr-resource-2.2.0/src/test/java/org/apache/sling/performance/PerformanceTest.java
+++ b/jcr-resource-2.2.0/src/test/java/org/apache/sling/performance/PerformanceTest.java
@@ -37,14 +37,14 @@
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.jcr.resource.JcrResourceConstants;
import org.apache.sling.jcr.resource.internal.helper.jcr.JcrResourceProviderFactory;
-import org.apache.sling.performance.tests.ResolveWith10000AliasTest;
-import org.apache.sling.performance.tests.ResolveWith10000VanityPathTest;
-import org.apache.sling.performance.tests.ResolveWith1000AliasTest;
-import org.apache.sling.performance.tests.ResolveWith1000VanityPathTest;
-import org.apache.sling.performance.tests.ResolveWith30000AliasTest;
-import org.apache.sling.performance.tests.ResolveWith30000VanityPathTest;
-import org.apache.sling.performance.tests.ResolveWith5000AliasTest;
-import org.apache.sling.performance.tests.ResolveWith5000VanityPathTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith10000AliasTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith10000VanityPathTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith1000AliasTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith1000VanityPathTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith30000AliasTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith30000VanityPathTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith5000AliasTest;
+import org.apache.sling.performance.tests.ResolveNonExistingWith5000VanityPathTest;
import org.apache.sling.resourceresolver.impl.ResourceResolverFactoryActivator;
import org.apache.sling.resourceresolver.impl.ResourceResolverFactoryImpl;
import org.apache.sling.resourceresolver.impl.mapping.MapEntries;
@@ -119,14 +119,14 @@
Helper helper = new Helper();
List<AbstractTest> tests = new ArrayList<AbstractTest>();
- tests.add(new ResolveWith1000VanityPathTest(helper));
- tests.add(new ResolveWith5000VanityPathTest(helper));
- tests.add(new ResolveWith10000VanityPathTest(helper));
- //tests.add(new ResolveWith30000VanityPathTest(helper));
- tests.add(new ResolveWith1000AliasTest(helper));
- tests.add(new ResolveWith5000AliasTest(helper));
- tests.add(new ResolveWith10000AliasTest(helper));
- //tests.add(new ResolveWith30000AliasTest(helper));
+ tests.add(new ResolveNonExistingWith1000VanityPathTest(helper));
+ tests.add(new ResolveNonExistingWith5000VanityPathTest(helper));
+ tests.add(new ResolveNonExistingWith10000VanityPathTest(helper));
+ //tests.add(new ResolveNonExistingWith30000VanityPathTest(helper));
+ tests.add(new ResolveNonExistingWith1000AliasTest(helper));
+ tests.add(new ResolveNonExistingWith5000AliasTest(helper));
+ tests.add(new ResolveNonExistingWith10000AliasTest(helper));
+ //tests.add(new ResolveNonExistingWith30000AliasTest(helper));
testPerformance("jcr.resource-2.2.0", tests);
}
}
