svn commit: r1693473 - in /sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader: internal/ it/

[ol...@apache.org]

Author: olli
Date: Thu Jul 30 18:55:58 2015
New Revision: 1693473

URL: http://svn.apache.org/r1693473
Log:
give U and P meaningful names

Added:
    sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/ImportOptionsFactory.java
      - copied, changed from r1693466, sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/U.java
    sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/PaxExamUtilities.java
      - copied, changed from r1693466, sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/P.java
Removed:
    sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/U.java
    sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/P.java
Modified:
    sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/CreateNodeTest.java
    sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreatorTest.java
    sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/BasicInitialContentIT.java
    sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/ContentBundleTestBase.java

Modified: sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/CreateNodeTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/CreateNodeTest.java?rev=1693473&r1=1693472&r2=1693473&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/CreateNodeTest.java (original)
+++ sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/CreateNodeTest.java Thu Jul 30 18:55:58 2015
@@ -51,7 +51,7 @@ public class CreateNodeTest {
         final SlingRepository repo = RepositoryProvider.instance().getRepository();
         session = repo.loginAdministrative(null);
         contentCreator = new DefaultContentCreator(null);
-        contentCreator.init(U.createImportOptions(true, true, true, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(true, true, true, false, false),
                 new HashMap<String, ContentReader>(), null, null);
         testRoot = session.getRootNode().addNode(getClass().getSimpleName()).addNode(uniqueId());
     }

Modified: sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreatorTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreatorTest.java?rev=1693473&r1=1693472&r2=1693473&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreatorTest.java (original)
+++ sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreatorTest.java Thu Jul 30 18:55:58 2015
@@ -56,7 +56,7 @@ public class DefaultContentCreatorTest {
         final SlingRepository repo = RepositoryProvider.instance().getRepository();
         session = repo.loginAdministrative(null);
         contentCreator = new DefaultContentCreator(null);
-        contentCreator.init(U.createImportOptions(true, true, true, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(true, true, true, false, false),
                 new HashMap<String, ContentReader>(), null, null);
         parentNode = session.getRootNode().addNode(getClass().getSimpleName()).addNode(uniqueId());
     }
@@ -74,7 +74,7 @@ public class DefaultContentCreatorTest {
     public void willRewriteUndefinedPropertyType() throws RepositoryException {
         parentNode = mockery.mock(Node.class);
         prop = mockery.mock(Property.class);
-        contentCreator.init(U.createImportOptions(true, true, true, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(true, true, true, false, false),
                 new HashMap<String, ContentReader>(), null, null);
 
         contentCreator.prepareParsing(parentNode, null);
@@ -91,7 +91,7 @@ public class DefaultContentCreatorTest {
     public void willNotRewriteUndefinedPropertyType() throws RepositoryException {
         parentNode = mockery.mock(Node.class);
         prop = mockery.mock(Property.class);
-        contentCreator.init(U.createImportOptions(false, false, true, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(false, false, true, false, false),
                 new HashMap<String, ContentReader>(), null, null);
 
         contentCreator.prepareParsing(parentNode, null);
@@ -114,7 +114,7 @@ public class DefaultContentCreatorTest {
             oneOf(parentNode).getProperty(propertyName); will(returnValue(prop));
             oneOf(prop).isNew(); will(returnValue(false));
         }});
-        contentCreator.init(U.createImportOptions(false, false, false, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(false, false, false, false, false),
                 new HashMap<String, ContentReader>(), null, null);
         contentCreator.prepareParsing(parentNode, null);
         //By calling this method we expect that it will returns on first if-statement
@@ -149,7 +149,7 @@ public class DefaultContentCreatorTest {
             oneOf(listener).onCreate(with(any(String.class)));
         }});
 
-        contentCreator.init(U.createImportOptions(false, false, false, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(false, false, false, false, false),
                 new HashMap<String, ContentReader>(), null, listener);
         contentCreator.prepareParsing(parentNode,null);
         contentCreator.createProperty(propertyName, PropertyType.REFERENCE, propertyValue);
@@ -165,7 +165,7 @@ public class DefaultContentCreatorTest {
             oneOf(parentNode).hasProperty(with(any(String.class)));
         }});
 
-        contentCreator.init(U.createImportOptions(false, false, false, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(false, false, false, false, false),
                 new HashMap<String, ContentReader>(), null, null);
         contentCreator.prepareParsing(parentNode, null);
 
@@ -184,7 +184,7 @@ public class DefaultContentCreatorTest {
             oneOf(parentNode).hasProperty(with(any(String.class)));
         }});
 
-        contentCreator.init(U.createImportOptions(false, false, false, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(false, false, false, false, false),
                 new HashMap<String, ContentReader>(), null, null);
         contentCreator.prepareParsing(parentNode, null);
 
@@ -211,7 +211,7 @@ public class DefaultContentCreatorTest {
             oneOf(listener).onCreate(with(any(String.class)));
         }});
 
-        contentCreator.init(U.createImportOptions(false, false, false, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(false, false, false, false, false),
                 new HashMap<String, ContentReader>(), null, listener);
         contentCreator.prepareParsing(parentNode, null);
 
@@ -236,7 +236,7 @@ public class DefaultContentCreatorTest {
             oneOf(listener).onCreate(with(any(String.class)));
         }});
 
-        contentCreator.init(U.createImportOptions(false, false, false, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(false, false, false, false, false),
                 new HashMap<String, ContentReader>(), null, listener);
         contentCreator.prepareParsing(parentNode, null);
 
@@ -248,7 +248,7 @@ public class DefaultContentCreatorTest {
 
     @Test
     public void createNodeWithoutNameAndTwoInStack() throws RepositoryException {
-        contentCreator.init(U.createImportOptions(true, true, true, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(true, true, true, false, false),
                 new HashMap<String, ContentReader>(), null, null);
         //Making parentNodeStack.size() == 1
         contentCreator.prepareParsing(parentNode, DEFAULT_NAME);
@@ -263,7 +263,7 @@ public class DefaultContentCreatorTest {
     public void createNodeWithoutProvidedNames() throws RepositoryException, NoSuchFieldException {
         Stack nodesStack = (Stack)PrivateAccessor.getField(contentCreator, "parentNodeStack");
 
-        contentCreator.init(U.createImportOptions(true, true, true, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(true, true, true, false, false),
                 new HashMap<String, ContentReader>(), null, null);
 
         contentCreator.prepareParsing(parentNode, null);
@@ -285,7 +285,7 @@ public class DefaultContentCreatorTest {
             oneOf(listener).onCreate(with(any(String.class)));
         }});
 
-        contentCreator.init(U.createImportOptions(true, false, true, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(true, false, true, false, false),
                 new HashMap<String, ContentReader>(), null, listener);
         contentCreator.prepareParsing(parentNode, DEFAULT_NAME);
 
@@ -305,7 +305,7 @@ public class DefaultContentCreatorTest {
         final String[] mixins = {"mix:versionable"};
         final List<Node> versionables = (List<Node>) PrivateAccessor.getField(contentCreator, "versionables");
 
-        contentCreator.init(U.createImportOptions(false, false, false, true, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(false, false, false, true, false),
                 new HashMap<String, ContentReader>(), null, null);
         contentCreator.prepareParsing(parentNode, DEFAULT_NAME);
 
@@ -327,7 +327,7 @@ public class DefaultContentCreatorTest {
             oneOf(listener).onCreate(with(any(String.class)));
         }});
 
-        contentCreator.init(U.createImportOptions(true, false, true, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(true, false, true, false, false),
                 new HashMap<String, ContentReader>(), createdNodes, listener);
         contentCreator.prepareParsing(parentNode, DEFAULT_NAME);
 
@@ -346,7 +346,7 @@ public class DefaultContentCreatorTest {
     public void propertyDoesntOverwritten() throws RepositoryException {
         final String newPropertyName = uniqueId();
         final String newPropertyValue = uniqueId();
-        contentCreator.init(U.createImportOptions(false, false, false, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(false, false, false, false, false),
                 new HashMap<String, ContentReader>(), null, null);
         contentCreator.prepareParsing(parentNode, DEFAULT_NAME);
 
@@ -370,7 +370,7 @@ public class DefaultContentCreatorTest {
             oneOf(listener).onCreate(with(any(String.class)));
         }});
 
-        contentCreator.init(U.createImportOptions(false, false, false, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(false, false, false, false, false),
                 new HashMap<String, ContentReader>(), null, listener);
         contentCreator.prepareParsing(parentNode, DEFAULT_NAME);
 
@@ -396,7 +396,7 @@ public class DefaultContentCreatorTest {
         }});
         parentNode.addMixin("mix:versionable");
 
-        contentCreator.init(U.createImportOptions(false, false, true, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(false, false, true, false, false),
                 new HashMap<String, ContentReader>(), null, listener);
         contentCreator.prepareParsing(parentNode, null);
 
@@ -420,7 +420,7 @@ public class DefaultContentCreatorTest {
             oneOf(listener).onCreate(with(any(String.class)));
         }});
 
-        contentCreator.init(U.createImportOptions(false, false, false, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(false, false, false, false, false),
                 new HashMap<String, ContentReader>(), null, listener);
         contentCreator.prepareParsing(parentNode, null);
 
@@ -434,7 +434,7 @@ public class DefaultContentCreatorTest {
     public void createOtherProperty() throws RepositoryException {
         final String propName = uniqueId();
 
-        contentCreator.init(U.createImportOptions(false, false, false, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(false, false, false, false, false),
                 new HashMap<String, ContentReader>(), null, null);
         contentCreator.prepareParsing(parentNode, null);
 
@@ -457,7 +457,7 @@ public class DefaultContentCreatorTest {
             exactly(3).of(listener).onCreate(with(any(String.class)));
         }});
 
-        contentCreator.init(U.createImportOptions(false, false, false, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(false, false, false, false, false),
                 new HashMap<String, ContentReader>(), null, listener);
         contentCreator.prepareParsing(parentNode, null);
 
@@ -483,7 +483,7 @@ public class DefaultContentCreatorTest {
             exactly(2).of(listener).onCreate(with(any(String.class)));
         }});
 
-        contentCreator.init(U.createImportOptions(false, false, false, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(false, false, false, false, false),
                 new HashMap<String, ContentReader>(), null, listener);
         contentCreator.prepareParsing(parentNode, null);
 
@@ -503,7 +503,7 @@ public class DefaultContentCreatorTest {
         final String propName = uniqueId();
         final String underTestNodeName = uniqueId();
 
-        contentCreator.init(U.createImportOptions(false, false, false, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(false, false, false, false, false),
                 new HashMap<String, ContentReader>(), null, null);
         contentCreator.prepareParsing(parentNode, null);
 
@@ -519,7 +519,7 @@ public class DefaultContentCreatorTest {
         final String propName = uniqueId();
         final String underTestNodeName = uniqueId();
 
-        contentCreator.init(U.createImportOptions(false, false, false, false, false),
+        contentCreator.init(ImportOptionsFactory.createImportOptions(false, false, false, false, false),
                 new HashMap<String, ContentReader>(), null, null);
         contentCreator.prepareParsing(parentNode, null);
 

Copied: sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/ImportOptionsFactory.java (from r1693466, sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/U.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/ImportOptionsFactory.java?p2=sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/ImportOptionsFactory.java&p1=sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/U.java&r1=1693466&r2=1693473&rev=1693473&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/U.java (original)
+++ sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/ImportOptionsFactory.java Thu Jul 30 18:55:58 2015
@@ -21,7 +21,7 @@ import org.apache.sling.jcr.contentloade
 
 import java.util.Map;
 
-class U {
+public final class ImportOptionsFactory {
     public static ImportOptions createImportOptions(final boolean isOverwrite, final boolean isPropertyOverwrite,
             final boolean isAutoCheckout, final boolean isCheckin, final boolean isIgnoredImportProvider){
         return new ImportOptions() {

Modified: sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/BasicInitialContentIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/BasicInitialContentIT.java?rev=1693473&r1=1693472&r2=1693473&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/BasicInitialContentIT.java (original)
+++ sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/BasicInitialContentIT.java Thu Jul 30 18:55:58 2015
@@ -46,7 +46,7 @@ public class BasicInitialContentIT exten
     @Test
     @Retry(intervalMsec=RETRY_INTERVAL, timeoutMsec=RETRY_TIMEOUT)
     public void bundleStarted() {
-        final Bundle b = P.findBundle(bundleContext, bundleSymbolicName);
+        final Bundle b = PaxExamUtilities.findBundle(bundleContext, bundleSymbolicName);
         assertNotNull("Expecting bundle to be found:" + bundleSymbolicName, b);
         assertEquals("Expecting bundle to be active:" + bundleSymbolicName, Bundle.ACTIVE, b.getState());
     }

Modified: sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/ContentBundleTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/ContentBundleTestBase.java?rev=1693473&r1=1693472&r2=1693473&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/ContentBundleTestBase.java (original)
+++ sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/ContentBundleTestBase.java Thu Jul 30 18:55:58 2015
@@ -78,7 +78,7 @@ public abstract class ContentBundleTestB
     
     @org.ops4j.pax.exam.Configuration
     public Option[] config() {
-        return P.paxConfig();
+        return PaxExamUtilities.paxConfig();
     }
     
     @BeforeClass

Copied: sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/PaxExamUtilities.java (from r1693466, sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/P.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/PaxExamUtilities.java?p2=sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/PaxExamUtilities.java&p1=sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/P.java&r1=1693466&r2=1693473&rev=1693473&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/P.java (original)
+++ sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/it/PaxExamUtilities.java Thu Jul 30 18:55:58 2015
@@ -34,8 +34,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /** Utilities for Pax Exam testing */
-public class P {
-    private static final Logger log = LoggerFactory.getLogger(P.class);
+public final class PaxExamUtilities {
+    private static final Logger log = LoggerFactory.getLogger(PaxExamUtilities.class);
     
     public static Option[] paxConfig() {
         final File thisProjectsBundle = new File(System.getProperty( "bundle.file.name", "BUNDLE_FILE_NOT_SET" ));