incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r1538564 - in /sling/trunk/bundles/jcr/it-jackrabbit-oak: ./ src/test/java/org/apache/sling/jcr/repository/it/
Date Mon, 04 Nov 2013 11:39:12 GMT
Author: bdelacretaz
Date: Mon Nov  4 11:39:12 2013
New Revision: 1538564

URL: http://svn.apache.org/r1538564
Log:
More sensible base class name: CommonTests

Added:
    sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java
      - copied, changed from r1538561, sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/SlingRepositoryITBase.java
Removed:
    sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/SlingRepositoryITBase.java
Modified:
    sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
    sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java
    sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java

Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml?rev=1538564&r1=1538563&r2=1538564&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml (original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml Mon Nov  4 11:39:12 2013
@@ -167,7 +167,7 @@
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.logservice</artifactId>
             <version>1.0.2</version>
-            <scope>optional</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

Copied: sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java
(from r1538561, sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/SlingRepositoryITBase.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java?p2=sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java&p1=sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/SlingRepositoryITBase.java&r1=1538561&r2=1538564&rev=1538564&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/SlingRepositoryITBase.java
(original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java
Mon Nov  4 11:39:12 2013
@@ -41,7 +41,6 @@ import javax.jcr.query.Query;
 
 import org.apache.sling.jcr.api.SlingRepository;
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
@@ -55,7 +54,7 @@ import org.slf4j.LoggerFactory;
  *  in a quick test that didn't work well with variable
  *  @Config annotations.
  */
-public abstract class SlingRepositoryITBase {
+public abstract class CommonTests {
 
     private final Logger log = LoggerFactory.getLogger(getClass());
     private final AtomicInteger counter = new AtomicInteger();

Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java?rev=1538564&r1=1538563&r2=1538564&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java
(original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java
Mon Nov  4 11:39:12 2013
@@ -32,7 +32,7 @@ import org.ops4j.pax.exam.spi.reactors.P
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class JackrabbitRepositoryIT extends SlingRepositoryITBase {
+public class JackrabbitRepositoryIT extends CommonTests {
 
     @org.ops4j.pax.exam.Configuration
     public Option[] config() {

Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java?rev=1538564&r1=1538563&r2=1538564&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
(original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
Mon Nov  4 11:39:12 2013
@@ -32,7 +32,7 @@ import org.ops4j.pax.exam.spi.reactors.P
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class OakRepositoryIT extends SlingRepositoryITBase {
+public class OakRepositoryIT extends CommonTests {
 
     @org.ops4j.pax.exam.Configuration
     public Option[] config() {



Mime
View raw message