You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by as...@apache.org on 2012/10/03 13:39:18 UTC
svn commit: r1393435 - in /sling/trunk/performance/tests/src/main/java/org/apache/sling/performance/tests: ResolveNonExistingWithManyAliasTest.java ResolveNonExistingWithManyVanityPathTest.java

Author: asanso
Date: Wed Oct  3 11:39:18 2012
New Revision: 1393435

URL: http://svn.apache.org/viewvc?rev=1393435&view=rev
Log:
SLING-2593 - Improvement for the Sling performance tools. Minor fix in order to run the test at project level.

Modified:
    sling/trunk/performance/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyAliasTest.java
    sling/trunk/performance/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyVanityPathTest.java

Modified: sling/trunk/performance/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyAliasTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/performance/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyAliasTest.java?rev=1393435&r1=1393434&r2=1393435&view=diff
==============================================================================
--- sling/trunk/performance/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyAliasTest.java (original)
+++ sling/trunk/performance/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyAliasTest.java Wed Oct  3 11:39:18 2012
@@ -21,7 +21,7 @@ import java.security.SecureRandom;
 
 import javax.jcr.Node;
 import javax.servlet.http.HttpServletRequest;
-
+import junit.framework.Assert;
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
@@ -33,8 +33,6 @@ import org.apache.sling.performance.Reso
 import org.junit.After;
 import org.junit.Before;
 
-import static org.junit.Assert.assertNotNull;
-
 class ResolveNonExistingWithManyAliasTest extends AbstractRepositoryTest {
     
     private static final String PN_SLING_ALIAS = "sling:alias";
@@ -120,6 +118,6 @@ class ResolveNonExistingWithManyAliasTes
                 + ".print.html");
         HttpServletRequest request = new ResourceResolverTestRequest(path);
         Resource res = resResolver.resolve(request, path);
-        assertNotNull(res);
+        Assert.assertNotNull(res);
     }
 }

Modified: sling/trunk/performance/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyVanityPathTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/performance/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyVanityPathTest.java?rev=1393435&r1=1393434&r2=1393435&view=diff
==============================================================================
--- sling/trunk/performance/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyVanityPathTest.java (original)
+++ sling/trunk/performance/tests/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyVanityPathTest.java Wed Oct  3 11:39:18 2012
@@ -16,14 +16,11 @@
  */
 package org.apache.sling.performance.tests;
 
-import static org.junit.Assert.assertNotNull;
-
 import java.math.BigInteger;
 import java.security.SecureRandom;
-
 import javax.jcr.Node;
 import javax.servlet.http.HttpServletRequest;
-
+import junit.framework.Assert;
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
@@ -132,7 +129,7 @@ class ResolveNonExistingWithManyVanityPa
                 + ".print.html");
         HttpServletRequest request = new ResourceResolverTestRequest(path);
         Resource res = resResolver.resolve(request, path);
-        assertNotNull(res);
+        Assert.assertNotNull(res);
     }
 
 }