svn commit: r832612 - /sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java

[cziegeler]

Author: cziegeler
Date: Tue Nov  3 23:44:31 2009
New Revision: 832612

URL: http://svn.apache.org/viewvc?rev=832612&view=rev
Log:
Clean up code

Modified:
    
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java

Modified: 
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java?rev=832612&r1=832611&r2=832612&view=diff
==============================================================================
--- 
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java
 (original)
+++ 
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java
 Tue Nov  3 23:44:31 2009
@@ -30,8 +30,8 @@
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceMetadata;
+import org.apache.sling.api.resource.ResourceUtil;
 import org.apache.sling.jcr.resource.JcrResourceConstants;
-import org.apache.sling.jcr.resource.JcrResourceUtil;
 
 public class JcrNodeResourceTest extends JcrItemResourceTestBase {
 
@@ -140,7 +140,7 @@
 
         jnr = new JcrNodeResource(resourceResolver, node, null, null);
         assertEquals(typeName, jnr.getResourceType());
-        assertEquals(superTypeName, JcrResourceUtil.getResourceSuperType(jnr));
+        assertEquals(superTypeName, ResourceUtil.findResourceSuperType(jnr));
 
         // overwrite super type with direct property
         String otherSuperTypeName = "othersupertype";
@@ -235,14 +235,4 @@
         assertEquals(TEST_TYPE, rm.getContentType());
         assertEquals(TEST_ENCODING, rm.getCharacterEncoding());
     }
-
-    private void assertProperty(Object expected, Object actual) {
-        if (expected != null) {
-            assertNotNull(actual);
-
-            assertEquals(expected, actual);
-        } else {
-            assertNull(actual);
-        }
-    }
 }