Author: bdelacretaz
Date: Tue Jul 16 13:58:29 2013
New Revision: 1503719
URL: http://svn.apache.org/r1503719
Log:
SLING-2965 - oops, it's more useful if the assertNotNulls actually test
something - thanks to Igor Bogomolov for noticing
Modified:
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/WriteableResourcesTest.java
Modified:
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/WriteableResourcesTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/WriteableResourcesTest.java?rev=1503719&r1=1503718&r2=1503719&view=diff
==============================================================================
---
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/WriteableResourcesTest.java
(original)
+++
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/WriteableResourcesTest.java
Tue Jul 16 13:58:29 2013
@@ -57,7 +57,7 @@ public class WriteableResourcesTest {
resolver =
resourceResolverFactory.getAdministrativeResourceResolver(null);
assertNotNull("Expecting non-null ResourceResolver", resolver);
final Resource root = resolver.getResource("/");
- assertNotNull("Expecting non-null root Resource");
+ assertNotNull("Expecting non-null root Resource", root);
final String path = getClass().getSimpleName() + "_" +
System.currentTimeMillis();
testRoot = resolver.create(root, path, null);
}
@@ -88,7 +88,7 @@ public class WriteableResourcesTest {
{
// Retrieve and check child resource
final Resource r = resolver.getResource(fullPath);
- assertNotNull("Expecting Resource at " + fullPath);
+ assertNotNull("Expecting Resource at " + fullPath, r);
final ModifiableValueMap m = r.adaptTo(ModifiableValueMap.class);
assertValueMap(m, "title", "hello", "text", "world");
@@ -101,14 +101,14 @@ public class WriteableResourcesTest {
{
// Retrieve and check updated resource
final Resource r = resolver.getResource(fullPath);
- assertNotNull("Expecting modified Resource at " + fullPath);
+ assertNotNull("Expecting modified Resource at " + fullPath, r);
assertValueMap(r.adaptTo(ValueMap.class), "title", "changed",
"more", "fun", "text", "world");
}
{
// Delete test resource and check that it's gone
final Resource r = resolver.getResource(fullPath);
- assertNotNull("Expecting non-null resource to delete, at " +
fullPath);
+ assertNotNull("Expecting non-null resource to delete, at " +
fullPath, r);
resolver.delete(r);
resolver.commit();
assertNull("Expecting " + fullPath + " to be deleted",
resolver.getResource(fullPath));