Author: sseifert
Date: Fri Sep 18 08:05:36 2015
New Revision: 1703762
URL: http://svn.apache.org/viewvc?rev=1703762&view=rev
Log:
SLING-5043 sling-mocks: Execute commit() after ContentLoader operations
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java?rev=1703762&r1=1703761&r2=1703762&view=diff
==============================================================================
---
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
Fri Sep 18 08:05:36 2015
@@ -52,6 +52,7 @@ import com.google.common.collect.Immutab
/**
* Imports JSON data and binary data into Sling resource hierarchy.
+ * After all import operations from json or binaries {@link
ResourceResolver#commit()} is called.
*/
public final class ContentLoader {
@@ -173,7 +174,9 @@ public final class ContentLoader {
String jsonString = convertToJsonString(inputStream).trim();
JSONObject json = new JSONObject(jsonString);
- return this.createResource(parentResource, childName, json);
+ Resource resource = this.createResource(parentResource, childName,
json);
+ resourceResolver.commit();
+ return resource;
} catch (JSONException ex) {
throw new RuntimeException(ex);
} catch (IOException ex) {
@@ -467,6 +470,7 @@ public final class ContentLoader {
resourceResolver.create(file, JcrConstants.JCR_CONTENT,
ImmutableMap.<String, Object>
builder().put(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_RESOURCE)
.put(JcrConstants.JCR_DATA,
inputStream).put(JcrConstants.JCR_MIMETYPE, mimeType).build());
+ resourceResolver.commit();
return file;
} catch (PersistenceException ex) {
throw new RuntimeException("Unable to create resource at " +
parentResource.getPath() + "/" + name, ex);
@@ -579,9 +583,11 @@ public final class ContentLoader {
*/
public Resource binaryResource(InputStream inputStream, Resource
parentResource, String name, String mimeType) {
try {
- return resourceResolver.create(parentResource, name,
+ Resource resource = resourceResolver.create(parentResource, name,
ImmutableMap.<String, Object>
builder().put(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_RESOURCE)
.put(JcrConstants.JCR_DATA,
inputStream).put(JcrConstants.JCR_MIMETYPE, mimeType).build());
+ resourceResolver.commit();
+ return resource;
} catch (PersistenceException ex) {
throw new RuntimeException("Unable to create resource at " +
parentResource.getPath() + "/" + name, ex);
}
Modified:
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java?rev=1703762&r1=1703761&r2=1703762&view=diff
==============================================================================
---
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java
Fri Sep 18 08:05:36 2015
@@ -19,6 +19,7 @@
package org.apache.sling.testing.mock.sling.loader;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.when;
@@ -35,6 +36,7 @@ import org.apache.sling.commons.mime.Mim
import org.apache.sling.testing.mock.osgi.MockOsgi;
import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -70,6 +72,18 @@ public abstract class AbstractContentLoa
when(mimeTypeService.getMimeType("gif")).thenReturn("image/gif");
}
+ @After
+ public final void tearDown() throws Exception {
+ // make sure all changes from ContentLoader are committed
+ assertFalse(resourceResolver.hasChanges());
+ // remove everything below /content
+ Resource content = resourceResolver.getResource("/content");
+ if (content != null) {
+ resourceResolver.delete(content);
+ resourceResolver.commit();
+ }
+ }
+
@Test
public void testBinaryFile() throws IOException {
contentLoader.binaryFile("/sample-image.gif",
"/content/binary/sample-image.gif");
Modified:
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java?rev=1703762&r1=1703761&r2=1703762&view=diff
==============================================================================
---
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java
Fri Sep 18 08:05:36 2015
@@ -20,6 +20,7 @@ package org.apache.sling.testing.mock.sl
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import java.io.IOException;
@@ -37,6 +38,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -73,6 +75,18 @@ public abstract class AbstractContentLoa
contentLoader.json("/json-import-samples/dam.json",
"/content/dam/sample");
}
+ @After
+ public final void tearDown() throws Exception {
+ // make sure all changes from ContentLoader are committed
+ assertFalse(resourceResolver.hasChanges());
+ // remove everything below /content
+ Resource content = resourceResolver.getResource("/content");
+ if (content != null) {
+ resourceResolver.delete(content);
+ resourceResolver.commit();
+ }
+ }
+
@Test
public void testDamAssetMetadata() throws IOException {
Resource assetMetadata = this.resourceResolver
Modified:
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java?rev=1703762&r1=1703761&r2=1703762&view=diff
==============================================================================
---
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java
Fri Sep 18 08:05:36 2015
@@ -20,6 +20,7 @@ package org.apache.sling.testing.mock.sl
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import java.util.Calendar;
@@ -37,6 +38,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -73,6 +75,18 @@ public abstract class AbstractContentLoa
contentLoader.json("/json-import-samples/content.json",
"/content/sample/en");
}
+ @After
+ public final void tearDown() throws Exception {
+ // make sure all changes from ContentLoader are committed
+ assertFalse(resourceResolver.hasChanges());
+ // remove everything below /content
+ Resource content = resourceResolver.getResource("/content");
+ if (content != null) {
+ resourceResolver.delete(content);
+ resourceResolver.commit();
+ }
+ }
+
@Test
public void testPageResourceType() {
Resource resource =
this.resourceResolver.getResource("/content/sample/en");
