Author: radu
Date: Mon Aug 17 12:13:59 2015
New Revision: 1696258
URL: http://svn.apache.org/r1696258
Log:
trivial: reorganised test packages
Added:
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/RepositoryScriptingTestBase.java
- copied, changed from r1696254,
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/RepositoryScriptingTestBase.java
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/TestSetupTest.java
- copied, changed from r1696254,
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/TestSetupTest.java
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java
- copied, changed from r1696254,
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableNodeTest.java
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResourceTest.java
- copied, changed from r1696254,
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableResourceTest.java
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableVersionTest.java
- copied, changed from r1696254,
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableVersionTest.java
Removed:
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/RepositoryScriptingTestBase.java
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/TestSetupTest.java
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableNodeTest.java
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableResourceTest.java
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableVersionTest.java
Modified:
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMapTest.java
Copied:
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/RepositoryScriptingTestBase.java
(from r1696254,
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/RepositoryScriptingTestBase.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/RepositoryScriptingTestBase.java?p2=sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/RepositoryScriptingTestBase.java&p1=sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/RepositoryScriptingTestBase.java&r1=1696254&r2=1696258&rev=1696258&view=diff
==============================================================================
---
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/RepositoryScriptingTestBase.java
(original)
+++
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/RepositoryScriptingTestBase.java
Mon Aug 17 12:13:59 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting;
+package org.apache.sling.scripting.javascript;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
Copied:
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/TestSetupTest.java
(from r1696254,
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/TestSetupTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/TestSetupTest.java?p2=sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/TestSetupTest.java&p1=sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/TestSetupTest.java&r1=1696254&r2=1696258&rev=1696258&view=diff
==============================================================================
---
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/TestSetupTest.java
(original)
+++
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/TestSetupTest.java
Mon Aug 17 12:13:59 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting;
+package org.apache.sling.scripting.javascript;
import org.apache.sling.scripting.javascript.internal.ScriptEngineHelper;
Modified:
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMapTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMapTest.java?rev=1696258&r1=1696257&r2=1696258&view=diff
==============================================================================
---
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMapTest.java
(original)
+++
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMapTest.java
Mon Aug 17 12:13:59 2015
@@ -21,7 +21,7 @@ import javax.script.ScriptException;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.api.wrappers.ValueMapDecorator;
-import org.apache.sling.scripting.RepositoryScriptingTestBase;
+import org.apache.sling.scripting.javascript.RepositoryScriptingTestBase;
import org.apache.sling.scripting.javascript.internal.ScriptEngineHelper;
import org.junit.After;
import org.junit.Before;
Copied:
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java
(from r1696254,
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableNodeTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java?p2=sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java&p1=sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableNodeTest.java&r1=1696254&r2=1696258&rev=1696258&view=diff
==============================================================================
---
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableNodeTest.java
(original)
+++
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java
Mon Aug 17 12:13:59 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.wrapper;
+package org.apache.sling.scripting.javascript.wrapper;
import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -26,7 +26,7 @@ import javax.jcr.Property;
import javax.jcr.Value;
import org.apache.sling.commons.json.jcr.JsonItemWriter;
-import org.apache.sling.scripting.RepositoryScriptingTestBase;
+import org.apache.sling.scripting.javascript.RepositoryScriptingTestBase;
import org.apache.sling.scripting.javascript.internal.ScriptEngineHelper;
/** Test the ScriptableNode class "live", by retrieving
Copied:
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResourceTest.java
(from r1696254,
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableResourceTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResourceTest.java?p2=sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResourceTest.java&p1=sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableResourceTest.java&r1=1696254&r2=1696258&rev=1696258&view=diff
==============================================================================
---
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableResourceTest.java
(original)
+++
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResourceTest.java
Mon Aug 17 12:13:59 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.wrapper;
+package org.apache.sling.scripting.javascript.wrapper;
import java.util.ArrayList;
import java.util.Calendar;
@@ -45,7 +45,7 @@ import org.apache.sling.api.resource.Val
import org.apache.sling.api.wrappers.ValueMapDecorator;
import org.apache.sling.commons.testing.sling.MockResourceResolver;
import org.apache.sling.jcr.resource.JcrResourceConstants;
-import org.apache.sling.scripting.RepositoryScriptingTestBase;
+import org.apache.sling.scripting.javascript.RepositoryScriptingTestBase;
import org.apache.sling.scripting.javascript.internal.ScriptEngineHelper;
import org.mozilla.javascript.Wrapper;
import org.slf4j.Logger;
Copied:
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableVersionTest.java
(from r1696254,
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableVersionTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableVersionTest.java?p2=sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableVersionTest.java&p1=sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableVersionTest.java&r1=1696254&r2=1696258&rev=1696258&view=diff
==============================================================================
---
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableVersionTest.java
(original)
+++
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableVersionTest.java
Mon Aug 17 12:13:59 2015
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.wrapper;
+package org.apache.sling.scripting.javascript.wrapper;
import javax.jcr.Node;
-import org.apache.sling.scripting.RepositoryScriptingTestBase;
+import org.apache.sling.scripting.javascript.RepositoryScriptingTestBase;
import org.apache.sling.scripting.javascript.internal.ScriptEngineHelper;
/** Test access to Version and VersionHistory objects */
