jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r615649 [12/14] - in /jackrabbit/trunk: jackrabbit-classloader/src/main/java/org/apache/jackrabbit/classloader/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ jackr...
Date Sun, 27 Jan 2008 21:08:36 GMT
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/lock/DigesterLockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/lock/DigesterLockTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/lock/DigesterLockTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/lock/DigesterLockTest.java Sun Jan 27 13:08:08 2008
@@ -58,7 +58,7 @@
                 new TestSuite(DigesterLockTest.class));
     }
 
-    
+
     public void testBasicLock()
     {
         try
@@ -77,56 +77,56 @@
             b.setB1("b1");
             b.setB2("b2");
             a.setB(b);
-            
+
             C c1 = new C();
             c1.setId("first");
             c1.setName("First Element");
             C c2 = new C();
             c2.setId("second");
             c2.setName("Second Element");
-            
+
             C c3 = new C();
             c3.setId("third");
             c3.setName("Third Element");
-            
-            
+
+
             Collection collection = new ArrayList();
             collection.add(c1);
             collection.add(c2);
             collection.add(c3);
-            
+
             a.setCollection(collection);
-            
+
             ocm.insert(a);
             ocm.save();
-            
+
 
             // --------------------------------------------------------------------------------
             // Get the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (A) ocm.getObject( "/test");
             assertNotNull("a is null", a);
-            
+
             // --------------------------------------------------------------------------------
             // Check if the object is locked
             // --------------------------------------------------------------------------------
             assertFalse("the object is locked", ocm.isLocked("/test"));
-            
+
             // --------------------------------------------------------------------------------
             // Lock the object
-            // --------------------------------------------------------------------------------           
-            
+            // --------------------------------------------------------------------------------
+
             Lock lock = ocm.lock("/test", true, false);
             assertTrue("the Lock owner is not correct", lock.getLockOwner().equals("superuser"));
-            
+
             // --------------------------------------------------------------------------------
             // Check if the object is locked
             // --------------------------------------------------------------------------------
             assertTrue("the object is not locked", ocm.isLocked("/test"));
-            
+
             // --------------------------------------------------------------------------------
             // Unlock the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             ocm.unlock("/test", lock.getLockToken());
 
             // --------------------------------------------------------------------------------
@@ -135,7 +135,7 @@
             assertFalse("the object is locked", ocm.isLocked("/test"));
 
             // --------------------------------------------------------------------------------
-            // Lock & update 
+            // Lock & update
             // --------------------------------------------------------------------------------
             lock = ocm.lock("/test", true, false);
             a = (A) ocm.getObject("/test");
@@ -143,22 +143,22 @@
             ocm.update(a);
             ocm.save();
             ocm.unlock("/test", lock.getLockToken());
-            
-            
+
+
             // --------------------------------------------------------------------------------
             // Remove the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             ocm.remove(a);
             ocm.save();
-            
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
-    }        
+
+    }
 
     /**
      *  Lock object which is assigned to a custome node type. This jcr node type inherits from mix:lockable
@@ -172,7 +172,7 @@
 
 
             // --------------------------------------------------------------------------------
-            // Create an object which is associated to the 
+            // Create an object which is associated to the
             // --------------------------------------------------------------------------------
             Lockable lockable = new Lockable();
             lockable.setPath("/test");
@@ -180,14 +180,14 @@
             lockable.setA2("a2");
             ocm.insert(lockable);
             ocm.save();
-            
+
 
             // --------------------------------------------------------------------------------
             // Get the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             lockable = (Lockable) ocm.getObject("/test");
             assertNotNull("a is null", lockable);
-            
+
             // --------------------------------------------------------------------------------
             // Check if the object is locked
             // --------------------------------------------------------------------------------
@@ -195,17 +195,17 @@
             assertNull("Attribute lockowner is not null", lockable.getLockOwner());
             // --------------------------------------------------------------------------------
             // Lock the object
-            // --------------------------------------------------------------------------------                       
+            // --------------------------------------------------------------------------------
             Lock lock = ocm.lock("/test", true, false);
-            
+
             // --------------------------------------------------------------------------------
             // Check if the object is locked
             // --------------------------------------------------------------------------------
             assertTrue("the object is not locked", ocm.isLocked("/test"));
-            
+
             // --------------------------------------------------------------------------------
             // Unlock the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             ocm.unlock("/test", lock.getLockToken());
 
             // --------------------------------------------------------------------------------
@@ -215,7 +215,7 @@
 
 
             // --------------------------------------------------------------------------------
-            // Lock & update 
+            // Lock & update
             // --------------------------------------------------------------------------------
             lock = ocm.lock("/test", true, false);
             assertTrue("the object is not locked", ocm.isLocked("/test"));
@@ -225,21 +225,21 @@
             ocm.update(lockable);
             ocm.save();
             ocm.unlock("/test", lock.getLockToken());
-            
-            
+
+
             // --------------------------------------------------------------------------------
             // Remove the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             ocm.remove(lockable);
             ocm.save();
-            
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
-    }        
-    
+
+    }
+
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/AllTests.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/AllTests.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/AllTests.java Sun Jan 27 13:08:08 2008
@@ -24,7 +24,7 @@
 
 /**
  * Package level tests.
- * 
+ *
  * @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
  */
 public class AllTests {
@@ -37,7 +37,7 @@
         TestSuite suite= new TestSuite("Test for org.apache.jackrabbit.ocm.manager.proxy");
         //$JUnit-BEGIN$
         suite.addTestSuite(DigesterProxyTest.class);
-        
+
         //$JUnit-END$
 
         return suite;

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/AnnotationProxyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/AnnotationProxyTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/AnnotationProxyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/AnnotationProxyTest.java Sun Jan 27 13:08:08 2008
@@ -93,7 +93,7 @@
 
 			
 			//---------------------------------------------------------------------------------------------------------
-			// Update  
+			// Update
 			//---------------------------------------------------------------------------------------------------------						
 			 detail = new Detail();
 			detail.setField("AnotherFieldValue");			
@@ -166,9 +166,9 @@
             assertNull("nullcollectionproxy  is not null", main.getNullProxyCollection());
 			
 			//---------------------------------------------------------------------------------------------------------
-			// Update  
+			// Update
 			//---------------------------------------------------------------------------------------------------------
-            
+
             Detail detail = new Detail();
 			detail.setField("newFieldValue");			
 			result.add(detail);
@@ -188,7 +188,7 @@
 			// Delete the main object
 			//---------------------------------------------------------------------------------------------------------						
 			ocm.remove("/test");
-			ocm.save();            
+			ocm.save();
 	
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -220,7 +220,7 @@
             assertNull("Collection is not null", result);
             			
 			//---------------------------------------------------------------------------------------------------------
-			// Update  
+			// Update
 			//---------------------------------------------------------------------------------------------------------
 			ArrayList  details= new ArrayList();
 			for(int i=1; i<=100;i++)
@@ -232,7 +232,7 @@
 			main.setProxyCollection(details);
 			ocm.update(main);
 			ocm.save();
-            
+
 			//---------------------------------------------------------------------------------------------------------
 			// Retrieve the main object
 			//---------------------------------------------------------------------------------------------------------						
@@ -241,11 +241,11 @@
 
             result = main.getProxyCollection();
             assertEquals("Invalide size", result.size(), 100);
-            
+
 			
 			//---------------------------------------------------------------------------------------------------------
-			// Update  
-			//---------------------------------------------------------------------------------------------------------            
+			// Update
+			//---------------------------------------------------------------------------------------------------------
             NTDetail detail = new NTDetail();
 			detail.setField("newFieldValue");			
 			result.add(detail);
@@ -259,13 +259,13 @@
 			main = (NTMain) ocm.getObject("/test");
 			assertNotNull("main  is null", main);
             assertEquals("Invalide size",main.getProxyCollection().size(), 101);
-            
+
 
             //---------------------------------------------------------------------------------------------------------
 			// Delete the main object
 			//---------------------------------------------------------------------------------------------------------						
 			ocm.remove("/test");
-			ocm.save();            
+			ocm.save();
 	
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -276,5 +276,5 @@
 	}
 
 
-	    
+	
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/DigesterProxyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/DigesterProxyTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/DigesterProxyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/proxy/DigesterProxyTest.java Sun Jan 27 13:08:08 2008
@@ -92,7 +92,7 @@
 
 			
 			//---------------------------------------------------------------------------------------------------------
-			// Update  
+			// Update
 			//---------------------------------------------------------------------------------------------------------						
 			 detail = new Detail();
 			detail.setField("AnotherFieldValue");			
@@ -165,9 +165,9 @@
             assertNull("nullcollectionproxy  is not null", main.getNullProxyCollection());
 			
 			//---------------------------------------------------------------------------------------------------------
-			// Update  
+			// Update
 			//---------------------------------------------------------------------------------------------------------
-            
+
             Detail detail = new Detail();
 			detail.setField("newFieldValue");			
 			result.add(detail);
@@ -187,7 +187,7 @@
 			// Delete the main object
 			//---------------------------------------------------------------------------------------------------------						
 			ocm.remove("/test");
-			ocm.save();            
+			ocm.save();
 	
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -219,7 +219,7 @@
             assertNull("Collection is not null", result);
             			
 			//---------------------------------------------------------------------------------------------------------
-			// Update  
+			// Update
 			//---------------------------------------------------------------------------------------------------------
 			ArrayList  details= new ArrayList();
 			for(int i=1; i<=100;i++)
@@ -231,7 +231,7 @@
 			main.setProxyCollection(details);
 			ocm.update(main);
 			ocm.save();
-            
+
 			//---------------------------------------------------------------------------------------------------------
 			// Retrieve the main object
 			//---------------------------------------------------------------------------------------------------------						
@@ -240,11 +240,11 @@
 
             result = main.getProxyCollection();
             assertEquals("Invalide size", result.size(), 100);
-            
+
 			
 			//---------------------------------------------------------------------------------------------------------
-			// Update  
-			//---------------------------------------------------------------------------------------------------------            
+			// Update
+			//---------------------------------------------------------------------------------------------------------
             NTDetail detail = new NTDetail();
 			detail.setField("newFieldValue");			
 			result.add(detail);
@@ -258,13 +258,13 @@
 			main = (NTMain) ocm.getObject("/test");
 			assertNotNull("main  is null", main);
             assertEquals("Invalide size",main.getProxyCollection().size(), 101);
-            
+
 
             //---------------------------------------------------------------------------------------------------------
 			// Delete the main object
 			//---------------------------------------------------------------------------------------------------------						
 			ocm.remove("/test");
-			ocm.save();            
+			ocm.save();
 	
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -275,5 +275,5 @@
 	}
 
 
-	    
+	
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AllTests.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AllTests.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AllTests.java Sun Jan 27 13:08:08 2008
@@ -24,7 +24,7 @@
 
 /**
  * Package level tests.
- * 
+ *
  * @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
  */
 public class AllTests {
@@ -46,7 +46,7 @@
         suite.addTestSuite(DigesterMultiValueQueryTest.class);
         suite.addTestSuite(DigesterScopeQueryTest.class);
         suite.addTestSuite(DigesterSimpleQueryTest.class);
-        
+
         //$JUnit-END$
 
         return suite;

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationAtomicQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationAtomicQueryTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationAtomicQueryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationAtomicQueryTest.java Sun Jan 27 13:08:08 2008
@@ -70,7 +70,7 @@
 			this.importData(date);
 			ObjectContentManager ocm = this.getObjectContentManager();
 			
-			// Test Boolean value 
+			// Test Boolean value
 			QueryManager queryManager = this.getQueryManager();
 			Filter filter = queryManager.createFilter(Atomic.class);
 			filter.addEqualTo("booleanObject", new Boolean(true));

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationIteratorQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationIteratorQueryTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationIteratorQueryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationIteratorQueryTest.java Sun Jan 27 13:08:08 2008
@@ -73,9 +73,9 @@
     {
         super.setUp();
 		this.importData();
-        
+
     }
-    
+
     /**
      * Test equalTo
      *
@@ -86,38 +86,38 @@
     	try
     	{
     		
-    		  // No scope    		  
+    		  // No scope    		
     	      QueryManager queryManager = this.getQueryManager();
-    	      Filter filter = queryManager.createFilter(Page.class);        	      
-    	      Query query = queryManager.createQuery(filter);    	      
+    	      Filter filter = queryManager.createFilter(Page.class);        	
+    	      Query query = queryManager.createQuery(filter);    	
     	      ObjectContentManager ocm = this.getObjectContentManager();
-    	      
+    	
     	      long  start = System.currentTimeMillis();
     	      Iterator iterator = ocm.getObjectIterator(query);
     	      System.out.println("getObject takes : " + (System.currentTimeMillis() - start));
-    	          	      
+    	          	
     	      start = System.currentTimeMillis();
     	      Collection result = ocm.getObjects(query);
-    	      System.out.println("getObject takes : " + (System.currentTimeMillis() - start));   
-    	      
+    	      System.out.println("getObject takes : " + (System.currentTimeMillis() - start));
+    	
     	      start = System.currentTimeMillis();
     	      iterator = ocm.getObjectIterator(query);
-    	      System.out.println("getObject takes : " + (System.currentTimeMillis() - start));       	      
+    	      System.out.println("getObject takes : " + (System.currentTimeMillis() - start));       	
 
-    	      
+    	
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
 
-    
-    private void importData() throws JcrMappingException 
+
+    private void importData() throws JcrMappingException
     {
-        
+
     	try
 		{
     		ObjectContentManager ocm = getObjectContentManager();
@@ -203,8 +203,8 @@
 		{
 			
 			e.printStackTrace();
-		}            
-                
+		}
+
 
     }
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationMultiValueQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationMultiValueQueryTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationMultiValueQueryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationMultiValueQueryTest.java Sun Jan 27 13:08:08 2008
@@ -68,40 +68,40 @@
     {
         super.setUp();
 		this.importData();
-        
+
     }
     	
-    
+
     public void testMultiValueSearch()
     {
         try
         {
         	
   	      QueryManager queryManager = this.getQueryManager();
-	      Filter filter = queryManager.createFilter(MultiValue.class);    
+	      Filter filter = queryManager.createFilter(MultiValue.class);
 	      filter.addEqualTo("multiValues", "Value1");
-	      Query query = queryManager.createQuery(filter);    	      
+	      Query query = queryManager.createQuery(filter);    	
 	      ObjectContentManager ocm = this.getObjectContentManager();
 	      Collection result = ocm.getObjects(query);
-	      assertTrue("Invalid number of objects - should be = 3", result.size() == 3);            
-          
+	      assertTrue("Invalid number of objects - should be = 3", result.size() == 3);
+
   	      queryManager = this.getQueryManager();
-	      filter = queryManager.createFilter(MultiValue.class);    
+	      filter = queryManager.createFilter(MultiValue.class);
 	      filter.addEqualTo("multiValues", "Value9");
-	      query = queryManager.createQuery(filter);    	      
+	      query = queryManager.createQuery(filter);    	
 	      ocm = this.getObjectContentManager();
 	      result = ocm.getObjects(query);
 	      assertTrue("Invalid number of objects - should be = 1", result.size() == 1);
 	      MultiValue multiValue = (MultiValue)result.iterator().next();
 	      assertTrue("Incorrect MultiValue found ", multiValue.getName().equals("m3"));
-	      
+	
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
 
 
@@ -127,7 +127,7 @@
             values.add("Value4");
             multiValue.setMultiValues(values);
             ocm.insert(multiValue);
-            
+
             multiValue = new MultiValue();
             multiValue.setPath("/test/m2");
             multiValue.setName("m2");
@@ -135,10 +135,10 @@
             values.add("Value1");
             values.add("Value5");
             values.add("Value6");
-            values.add("Value7");            
+            values.add("Value7");
             multiValue.setMultiValues(values);
             ocm.insert(multiValue);
-            
+
             multiValue = new MultiValue();
             multiValue.setPath("/test/m3");
             multiValue.setName("m3");
@@ -147,12 +147,12 @@
             values.add("Value2");
             values.add("Value8");
             values.add("Value9");
-            
+
             multiValue.setMultiValues(values);
             ocm.insert(multiValue);
-                                   
+
             ocm.save();
-            
+
         }
         catch(Exception e)
         {

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationScopeQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationScopeQueryTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationScopeQueryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationScopeQueryTest.java Sun Jan 27 13:08:08 2008
@@ -74,11 +74,11 @@
         super.setUp();
 		this.importData();
 		//this.importDocument("data.xml", "/");
-        
+
 		
     }
 	
-    
+
     /**
      * Test equalTo
      *
@@ -89,78 +89,78 @@
     	try
     	{
     		
-              	      
+              	
     	      ObjectContentManager ocm = this.getObjectContentManager();
     	      // Search on subtree (test/node1)
     	      QueryManager queryManager = this.getQueryManager();
-    	      Filter filter = queryManager.createFilter(Paragraph.class);    
+    	      Filter filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test/node1//");
-    	      Query query = queryManager.createQuery(filter);    	      
+    	      Query query = queryManager.createQuery(filter);    	
     	      ocm = this.getObjectContentManager();
     	      Collection result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 8", result.size() == 8);
-    	      
-    	      
+    	
+    	
     	      queryManager = this.getQueryManager();
-    	      filter = queryManager.createFilter(Paragraph.class);    
+    	      filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test//");
-    	      query = queryManager.createQuery(filter);    	      
+    	      query = queryManager.createQuery(filter);    	
     	      ocm = this.getObjectContentManager();
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 16", result.size() == 16);
-    	      
-    	      // Test on children 
+    	
+    	      // Test on children
     	      queryManager = this.getQueryManager();
-    	      filter = queryManager.createFilter(Paragraph.class);    
+    	      filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test/");
-    	      query = queryManager.createQuery(filter);    	      
+    	      query = queryManager.createQuery(filter);    	
     	      ocm = this.getObjectContentManager();
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 0", result.size() == 0);
-    	      
+    	
               // Search on scope and properties
     	      queryManager = this.getQueryManager();
-    	      filter = queryManager.createFilter(Paragraph.class);    
+    	      filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test//");
     	      filter.addEqualTo("text", "Para 1");
-    	      query = queryManager.createQuery(filter);    	      
+    	      query = queryManager.createQuery(filter);    	
     	      ocm = this.getObjectContentManager();
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 3", result.size() == 3);
 
-    	      
+    	
     	      queryManager = this.getQueryManager();
-    	      filter = queryManager.createFilter(Paragraph.class);    
+    	      filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test//");
     	      filter.addContains("text", "another");
-    	      query = queryManager.createQuery(filter);    	      
+    	      query = queryManager.createQuery(filter);    	
     	      ocm = this.getObjectContentManager();
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 4", result.size() == 4);
-    	      
+    	
     	      queryManager = this.getQueryManager();
-    	      filter = queryManager.createFilter(Page.class);    
-    	      filter.setScope("/test/node1/");    	      
-    	      query = queryManager.createQuery(filter);    	      
+    	      filter = queryManager.createFilter(Page.class);
+    	      filter.setScope("/test/node1/");    	
+    	      query = queryManager.createQuery(filter);    	
     	      ocm = this.getObjectContentManager();
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 2", result.size() == 2);
     	      assertTrue ("Invalid object in the collection" , this.contains(result, "/test/node1/page1", Page.class));
     	      assertTrue ("Invalid object in the collection" , this.contains(result, "/test/node1/page2", Page.class));
-    	      
+    	
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
 
-    
-    private void importData() throws JcrMappingException 
+
+    private void importData() throws JcrMappingException
     {
-        
+
     	try
 		{
     		ObjectContentManager ocm = getObjectContentManager();
@@ -237,8 +237,8 @@
 		{
 			
 			e.printStackTrace();
-		}            
-                
+		}
+
 
     }
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationSimpleQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationSimpleQueryTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationSimpleQueryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/AnnotationSimpleQueryTest.java Sun Jan 27 13:08:08 2008
@@ -70,7 +70,7 @@
         importData();
     }
 
-    
+
     /**
      * Test equalTo
      *
@@ -80,29 +80,29 @@
 
     	try
     	{
-    		    		      		 
+    		    		      		
     		  // Build the Query Object
     	      QueryManager queryManager = this.getQueryManager();
     	      Filter filter = queryManager.createFilter(Paragraph.class);
-    	      filter.addEqualTo("text", "Para 1");    	          	     
-    	      
-    	      
+    	      filter.addEqualTo("text", "Para 1");    	          	
+    	
+    	
     	      Query query = queryManager.createQuery(filter);
-    	      
+    	
     	      ObjectContentManager ocm = this.getObjectContentManager();
     	      Paragraph paragraph = (Paragraph) ocm.getObject(query);
-    	      assertNotNull("Object is null", paragraph);    	      
+    	      assertNotNull("Object is null", paragraph);    	
     	      assertTrue("Invalid paragraph found" , paragraph.getText().equals("Para 1"));
-            
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
-    }    
-    
+
+    }
+
     /**
      * Test equalTo
      *
@@ -112,28 +112,28 @@
 
     	try
     	{
-    		    		      		 
+    		    		      		
     		  // Build the Query Object
     	      QueryManager queryManager = this.getQueryManager();
     	      Filter filter = queryManager.createFilter(Paragraph.class);
-    	      filter.addEqualTo("text", "Para 1");    	          	     
+    	      filter.addEqualTo("text", "Para 1");    	          	
     	      filter.setScope("/test/");
-    	      
+    	
     	      Query query = queryManager.createQuery(filter);
-    	      
+    	
     	      ObjectContentManager ocm = this.getObjectContentManager();
     	      Collection result = ocm.getObjects(query);
     	      assertEquals("Invalid number of objects - should be = 1", 1, result.size());
     	      Paragraph paragraph = (Paragraph) result.iterator().next();
     	      assertTrue("Invalid paragraph found" , paragraph.getText().equals("Para 1"));
-            
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
 
     /**
@@ -148,11 +148,11 @@
     		  // Build the Query Object
     	      QueryManager queryManager = this.getQueryManager();
     	      Filter filter = queryManager.createFilter(Paragraph.class);
-    	      filter.addLike("text", "Para%");    	          	     
+    	      filter.addLike("text", "Para%");    	          	
     	      filter.setScope("/test/");
-    	      
+    	
     	      Query query = queryManager.createQuery(filter);
-    	      
+    	
     	      ObjectContentManager ocm = this.getObjectContentManager();
     	      Collection result = ocm.getObjects(query);
     	      assertEquals("Invalid number of objects - should be = 3", 3, result.size());
@@ -161,7 +161,7 @@
     	      assertTrue("Invalid paragraph found", paragraphs[0].getText().equals("Para 1"));
     	      assertTrue("Invalid paragraph found", paragraphs[1].getText().equals("Para 2"));
     	      assertTrue("Invalid paragraph found", paragraphs[2].getText().equals("Para 3"));
-    	      
+    	
 
         }
         catch (Exception e)
@@ -169,10 +169,10 @@
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
-    
-    
+
+
     /**
      * Build an or expression between 2 filters
      *
@@ -186,33 +186,33 @@
     		  // Build the Query Object
     	      QueryManager queryManager = this.getQueryManager();
     	      Filter filter1 = queryManager.createFilter(Paragraph.class);
-    	      filter1.addEqualTo("text", "Para 1");    	     
+    	      filter1.addEqualTo("text", "Para 1");    	
     	      filter1.setScope("/test/");
 
     	      Filter filter2 = queryManager.createFilter(Paragraph.class);
-    	      filter2.addEqualTo("text", "Para 2");    	     
-    	      
+    	      filter2.addEqualTo("text", "Para 2");    	
+    	
               filter1.addOrFilter(filter2);
-    	      
+    	
     	      Query query = queryManager.createQuery(filter1);
-    	      
+    	
     	      ObjectContentManager ocm = this.getObjectContentManager();
     	      Collection result = ocm.getObjects(query);
     	      assertEquals("Invalid number of objects - should be = 2", 2, result.size());
-    	      
+    	
     	      Paragraph[] paragraphs = (Paragraph[]) result.toArray(new Paragraph[result.size()]);
     	      assertTrue("Invalid paragraph found", paragraphs[0].getText().equals("Para 1"));
     	      assertTrue("Invalid paragraph found", paragraphs[1].getText().equals("Para 2"));
-            
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
-    
+
     public void testGetObjectOrderBy()
     {
 
@@ -222,12 +222,12 @@
     		  // Build the Query Object
     	      QueryManager queryManager = this.getQueryManager();
     	      Filter filter = queryManager.createFilter(Paragraph.class);
-    	      filter.addLike("text", "Para%");    	          	     
+    	      filter.addLike("text", "Para%");    	          	
     	      filter.setScope("/test/");
-    	      
+    	
     	      Query query = queryManager.createQuery(filter);
     	      query.addOrderByDescending("text");
-    	      
+    	
     	      ObjectContentManager ocm = this.getObjectContentManager();
     	      Collection result = ocm.getObjects(query);
     	      assertEquals("Invalid number of objects - should be = 3", 3, result.size());
@@ -236,7 +236,7 @@
     	      assertTrue("Invalid paragraph found", paragraphs[0].getText().equals("Para 3"));
     	      assertTrue("Invalid paragraph found", paragraphs[1].getText().equals("Para 2"));
     	      assertTrue("Invalid paragraph found", paragraphs[2].getText().equals("Para 1"));
-    	      
+    	
 
         }
         catch (Exception e)
@@ -244,28 +244,28 @@
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
-    
-    private void importData() throws JcrMappingException 
+
+    private void importData() throws JcrMappingException
     {
     	ObjectContentManager ocm = getObjectContentManager();
 
         Page page = new Page();
         page.setPath("/test");
         page.setTitle("Page Title");
-        
+
         ArrayList paragraphs = new ArrayList();
-        
+
         paragraphs.add(new Paragraph("Para 1"));
         paragraphs.add(new Paragraph("Para 2"));
         paragraphs.add(new Paragraph("Para 3"));
         paragraphs.add(new Paragraph("Another Para "));
         page.setParagraphs(paragraphs);
-        
-        ocm.insert(page);  
+
+        ocm.insert(page);
         ocm.save();
-                
+
 
     }
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterAtomicQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterAtomicQueryTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterAtomicQueryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterAtomicQueryTest.java Sun Jan 27 13:08:08 2008
@@ -70,7 +70,7 @@
 			this.importData(date);
 			ObjectContentManager ocm = this.getObjectContentManager();
 			
-			// Test Boolean value 
+			// Test Boolean value
 			QueryManager queryManager = this.getQueryManager();
 			Filter filter = queryManager.createFilter(Atomic.class);
 			filter.addEqualTo("booleanObject", new Boolean(true));

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterIteratorQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterIteratorQueryTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterIteratorQueryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterIteratorQueryTest.java Sun Jan 27 13:08:08 2008
@@ -73,10 +73,10 @@
     {
         super.setUp();
 		this.importData();
-        
+
     }
     	
-    
+
     /**
      * Test equalTo
      *
@@ -87,38 +87,38 @@
     	try
     	{
     		
-    		  // No scope    		  
+    		  // No scope    		
     	      QueryManager queryManager = this.getQueryManager();
-    	      Filter filter = queryManager.createFilter(Page.class);        	      
-    	      Query query = queryManager.createQuery(filter);    	      
+    	      Filter filter = queryManager.createFilter(Page.class);        	
+    	      Query query = queryManager.createQuery(filter);    	
     	      ObjectContentManager ocm = this.getObjectContentManager();
-    	      
+    	
     	      long  start = System.currentTimeMillis();
     	      Iterator iterator = ocm.getObjectIterator(query);
     	      System.out.println("getObject takes : " + (System.currentTimeMillis() - start));
-    	          	      
+    	          	
     	      start = System.currentTimeMillis();
     	      Collection result = ocm.getObjects(query);
-    	      System.out.println("getObject takes : " + (System.currentTimeMillis() - start));   
-    	      
+    	      System.out.println("getObject takes : " + (System.currentTimeMillis() - start));
+    	
     	      start = System.currentTimeMillis();
     	      iterator = ocm.getObjectIterator(query);
-    	      System.out.println("getObject takes : " + (System.currentTimeMillis() - start));       	      
+    	      System.out.println("getObject takes : " + (System.currentTimeMillis() - start));       	
 
-    	      
+    	
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
 
-    
-    private void importData() throws JcrMappingException 
+
+    private void importData() throws JcrMappingException
     {
-        
+
     	try
 		{
     		ObjectContentManager ocm = getObjectContentManager();
@@ -204,8 +204,8 @@
 		{
 			
 			e.printStackTrace();
-		}            
-                
+		}
+
 
     }
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterMultiValueQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterMultiValueQueryTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterMultiValueQueryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterMultiValueQueryTest.java Sun Jan 27 13:08:08 2008
@@ -68,40 +68,40 @@
     {
         super.setUp();
 		this.importData();
-        
+
     }
-    
-    
+
+
     public void testMultiValueSearch()
     {
         try
         {
         	
   	      QueryManager queryManager = this.getQueryManager();
-	      Filter filter = queryManager.createFilter(MultiValue.class);    
+	      Filter filter = queryManager.createFilter(MultiValue.class);
 	      filter.addEqualTo("multiValues", "Value1");
-	      Query query = queryManager.createQuery(filter);    	      
+	      Query query = queryManager.createQuery(filter);    	
 	      ObjectContentManager ocm = this.getObjectContentManager();
 	      Collection result = ocm.getObjects(query);
-	      assertTrue("Invalid number of objects - should be = 3", result.size() == 3);            
-          
+	      assertTrue("Invalid number of objects - should be = 3", result.size() == 3);
+
   	      queryManager = this.getQueryManager();
-	      filter = queryManager.createFilter(MultiValue.class);    
+	      filter = queryManager.createFilter(MultiValue.class);
 	      filter.addEqualTo("multiValues", "Value9");
-	      query = queryManager.createQuery(filter);    	      
+	      query = queryManager.createQuery(filter);    	
 	      ocm = this.getObjectContentManager();
 	      result = ocm.getObjects(query);
 	      assertTrue("Invalid number of objects - should be = 1", result.size() == 1);
 	      MultiValue multiValue = (MultiValue)result.iterator().next();
 	      assertTrue("Incorrect MultiValue found ", multiValue.getName().equals("m3"));
-	      
+	
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
 
 
@@ -127,7 +127,7 @@
             values.add("Value4");
             multiValue.setMultiValues(values);
             ocm.insert(multiValue);
-            
+
             multiValue = new MultiValue();
             multiValue.setPath("/test/m2");
             multiValue.setName("m2");
@@ -135,10 +135,10 @@
             values.add("Value1");
             values.add("Value5");
             values.add("Value6");
-            values.add("Value7");            
+            values.add("Value7");
             multiValue.setMultiValues(values);
             ocm.insert(multiValue);
-            
+
             multiValue = new MultiValue();
             multiValue.setPath("/test/m3");
             multiValue.setName("m3");
@@ -147,12 +147,12 @@
             values.add("Value2");
             values.add("Value8");
             values.add("Value9");
-            
+
             multiValue.setMultiValues(values);
             ocm.insert(multiValue);
-                                   
+
             ocm.save();
-            
+
         }
         catch(Exception e)
         {

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterScopeQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterScopeQueryTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterScopeQueryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterScopeQueryTest.java Sun Jan 27 13:08:08 2008
@@ -73,11 +73,11 @@
         super.setUp();
 		this.importData();
 		//this.importDocument("data.xml", "/");
-        
+
 		
     }
     	
-    
+
     /**
      * Test equalTo
      *
@@ -88,78 +88,78 @@
     	try
     	{
     		
-              	      
+              	
     	      ObjectContentManager ocm = this.getObjectContentManager();
     	      // Search on subtree (test/node1)
     	      QueryManager queryManager = this.getQueryManager();
-    	      Filter filter = queryManager.createFilter(Paragraph.class);    
+    	      Filter filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test/node1//");
-    	      Query query = queryManager.createQuery(filter);    	      
+    	      Query query = queryManager.createQuery(filter);    	
     	      ocm = this.getObjectContentManager();
     	      Collection result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 8", result.size() == 8);
-    	      
-    	      
+    	
+    	
     	      queryManager = this.getQueryManager();
-    	      filter = queryManager.createFilter(Paragraph.class);    
+    	      filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test//");
-    	      query = queryManager.createQuery(filter);    	      
+    	      query = queryManager.createQuery(filter);    	
     	      ocm = this.getObjectContentManager();
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 16", result.size() == 16);
-    	      
-    	      // Test on children 
+    	
+    	      // Test on children
     	      queryManager = this.getQueryManager();
-    	      filter = queryManager.createFilter(Paragraph.class);    
+    	      filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test/");
-    	      query = queryManager.createQuery(filter);    	      
+    	      query = queryManager.createQuery(filter);    	
     	      ocm = this.getObjectContentManager();
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 0", result.size() == 0);
-    	      
+    	
               // Search on scope and properties
     	      queryManager = this.getQueryManager();
-    	      filter = queryManager.createFilter(Paragraph.class);    
+    	      filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test//");
     	      filter.addEqualTo("text", "Para 1");
-    	      query = queryManager.createQuery(filter);    	      
+    	      query = queryManager.createQuery(filter);    	
     	      ocm = this.getObjectContentManager();
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 3", result.size() == 3);
 
-    	      
+    	
     	      queryManager = this.getQueryManager();
-    	      filter = queryManager.createFilter(Paragraph.class);    
+    	      filter = queryManager.createFilter(Paragraph.class);
     	      filter.setScope("/test//");
     	      filter.addContains("text", "another");
-    	      query = queryManager.createQuery(filter);    	      
+    	      query = queryManager.createQuery(filter);    	
     	      ocm = this.getObjectContentManager();
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 4", result.size() == 4);
-    	      
+    	
     	      queryManager = this.getQueryManager();
-    	      filter = queryManager.createFilter(Page.class);    
-    	      filter.setScope("/test/node1/");    	      
-    	      query = queryManager.createQuery(filter);    	      
+    	      filter = queryManager.createFilter(Page.class);
+    	      filter.setScope("/test/node1/");    	
+    	      query = queryManager.createQuery(filter);    	
     	      ocm = this.getObjectContentManager();
     	      result = ocm.getObjects(query);
     	      assertTrue("Invalid number of objects - should be = 2", result.size() == 2);
     	      assertTrue ("Invalid object in the collection" , this.contains(result, "/test/node1/page1", Page.class));
     	      assertTrue ("Invalid object in the collection" , this.contains(result, "/test/node1/page2", Page.class));
-    	      
+    	
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
 
-    
-    private void importData() throws JcrMappingException 
+
+    private void importData() throws JcrMappingException
     {
-        
+
     	try
 		{
     		ObjectContentManager ocm = getObjectContentManager();
@@ -236,8 +236,8 @@
 		{
 			
 			e.printStackTrace();
-		}            
-                
+		}
+
 
     }
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterSimpleQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterSimpleQueryTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterSimpleQueryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/query/DigesterSimpleQueryTest.java Sun Jan 27 13:08:08 2008
@@ -40,7 +40,7 @@
 
 /**
  * Test QueryManagerImpl Query methods
- * 
+ *
  * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe
  *         Lombart</a>
  */
@@ -51,7 +51,7 @@
      * <p>
      * Defines the test case name for junit.
      * </p>
-     * 
+     *
      * @param testName
      *            The test case name.
      */
@@ -74,7 +74,7 @@
 
     /**
      * Test equalTo
-     * 
+     *
      */
     public void testGetObjectEqualsTo() {
 
@@ -101,7 +101,7 @@
 
     /**
      * Test equalTo
-     * 
+     *
      */
     public void testGetObjectsEqualsTo() {
 
@@ -161,7 +161,7 @@
 
     /**
      * Build an or expression between 2 filters
-     * 
+     *
      */
     public void testGetObjectsOr() {
 
@@ -232,7 +232,7 @@
 
             Page[] pages = (Page[]) result.toArray(new Page[result.size()]);
             assertTrue("Invalid Page found", pages[0].getTitle().equals("Page Title"));
-            
+
             result = ocm.getObjects(Page.class, "/folder/test");
             assertEquals("Invalid number of objects", 4, result.size());
 
@@ -245,7 +245,7 @@
         }
     }
 
-    private void importData() throws JcrMappingException 
+    private void importData() throws JcrMappingException
     {
         try {
 			ObjectContentManager ocm = getObjectContentManager();
@@ -324,13 +324,13 @@
 			ocm.insert(page);
 			
 			ocm.save();
-		} 
-        catch (Exception e) 
+		}
+        catch (Exception e)
         {
         	fail("Impossible to create the data " + e);
         }
 		
-                
+
 
     }
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AllTests.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AllTests.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AllTests.java Sun Jan 27 13:08:08 2008
@@ -24,7 +24,7 @@
 
 /**
  * Package level tests.
- * 
+ *
  * @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru Popescu</a>
  */
 public class AllTests {
@@ -38,7 +38,7 @@
         //$JUnit-BEGIN$
         suite.addTestSuite(AnnotationUuidTest.class);
         suite.addTestSuite(DigesterUuidTest.class);
-        
+
         //$JUnit-END$
 
         return suite;

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AnnotationUuidTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AnnotationUuidTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AnnotationUuidTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/AnnotationUuidTest.java Sun Jan 27 13:08:08 2008
@@ -58,11 +58,11 @@
                 new TestSuite(AnnotationUuidTest.class));
     }
 
-    
+
     /**
-     * 
+     *
      *  Map the jcr uuid into a String attribute
-     *  
+     *
      */
     public void testUuid()
     {
@@ -78,17 +78,17 @@
             a.setPath("/test");
             a.setStringData("testdata");
             ocm.insert(a);
-            ocm.save();           
+            ocm.save();
 
             // --------------------------------------------------------------------------------
             // Get the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (A) ocm.getObject( "/test");
             assertNotNull("a is null", a);
             String uuidA = a.getUuid();
             assertNotNull("uuid is null", uuidA);
             System.out.println("UUID : " + uuidA);
-            
+
             // --------------------------------------------------------------------------------
             // Update the object
             // --------------------------------------------------------------------------------
@@ -98,22 +98,22 @@
 
             // --------------------------------------------------------------------------------
             // Get the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (A) ocm.getObject("/test");
             assertNotNull("a is null", a);
             assertTrue("The uuid has been modified", uuidA.equals(a.getUuid()));
-            
+
             // --------------------------------------------------------------------------------
             // Get the object with the uuid
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (A) ocm.getObjectByUuid(uuidA);
             assertNotNull("a is null", a);
             assertTrue("Invalid object found with the uuid ", "testdata2".equals(a.getStringData()));
-            
+
             // --------------------------------------------------------------------------------
             // Get the object with an invalid uuid
-            // --------------------------------------------------------------------------------           
-            try 
+            // --------------------------------------------------------------------------------
+            try
             {
                 a = (A) ocm.getObjectByUuid("1234");
                 fail("Exception not throw");
@@ -124,20 +124,20 @@
             	System.out.println(e);
 
             }
-            
-            
+
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
     /**
-     * 
-     * Map a Reference into a String attribute. 
-     * Object B has an attribute containing the object A uuid. 
+     *
+     * Map a Reference into a String attribute.
+     * Object B has an attribute containing the object A uuid.
      *
      */
     public void testFieldReference()
@@ -153,17 +153,17 @@
             a.setPath("/test");
             a.setStringData("testdata");
             ocm.insert(a);
-            ocm.save();           
+            ocm.save();
 
             // --------------------------------------------------------------------------------
             // Get the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (A) ocm.getObject( "/test");
             assertNotNull("a is null", a);
             String uuidA = a.getUuid();
             assertNotNull("uuid is null", uuidA);
             System.out.println("UUID : " + uuidA);
-                        
+
             // --------------------------------------------------------------------------------
             // Create and store an object B in the repository which has a reference to A
             // --------------------------------------------------------------------------------
@@ -172,16 +172,16 @@
             b.setPath("/testB");
             ocm.insert(b);
             ocm.save();
-            
+
+            // --------------------------------------------------------------------------------
+            // Retrieve the object B with an invalid reference
             // --------------------------------------------------------------------------------
-            // Retrieve the object B with an invalid reference 
-            // --------------------------------------------------------------------------------            
             b = (B) ocm.getObject("/testB");
             assertNotNull("b is null", b);
             assertTrue("Invalid uuid property", b.getReference2A().equals(uuidA));
-            
+
             // --------------------------------------------------------------------------------
-            // Update the object B with an invalid reference 
+            // Update the object B with an invalid reference
             // --------------------------------------------------------------------------------
             b.setReference2A("1245");
             try
@@ -195,22 +195,22 @@
             	System.out.println("Invalid uuid : " + e);
             	
             }
-            
-            
+
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
 
     /**
-     * 
-     * Map a Reference into a bean attribute. 
-     * Object B has an attribute containing the object A. 
-     * The jcr node matching to the object B contains a reference (the jcr node matching to the object B).   
+     *
+     * Map a Reference into a bean attribute.
+     * Object B has an attribute containing the object A.
+     * The jcr node matching to the object B contains a reference (the jcr node matching to the object B).
      *
      */
     public void testBeanReference()
@@ -226,17 +226,17 @@
             a.setPath("/test");
             a.setStringData("testdata");
             ocm.insert(a);
-            ocm.save();           
+            ocm.save();
 
             // --------------------------------------------------------------------------------
             // Get the object a
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (A) ocm.getObject( "/test");
             assertNotNull("a is null", a);
             String uuidA = a.getUuid();
             assertNotNull("uuid is null", uuidA);
             System.out.println("UUID : " + uuidA);
-            
+
             // --------------------------------------------------------------------------------
             // Create and store an object B in the repository which has a reference to A
             // --------------------------------------------------------------------------------
@@ -245,7 +245,7 @@
             b.setPath("/testB2");
             ocm.insert(b);
             ocm.save();
-            
+
             // --------------------------------------------------------------------------------
             // Retrieve object B
             // --------------------------------------------------------------------------------
@@ -261,27 +261,27 @@
             b.setA(null);
             ocm.update(b);
             ocm.save();
-            
+
             // --------------------------------------------------------------------------------
             // Retrieve object B
             // --------------------------------------------------------------------------------
             b = (B2) ocm.getObject("/testB2");
             a = b.getA();
             assertNull("a is not null", a);
-            
-            
+
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
 
     /**
-     * Map a list of uuid  into a collection of String 
-     * The list is defined in a jcr property (Referece type / multi values) 
+     * Map a list of uuid  into a collection of String
+     * The list is defined in a jcr property (Referece type / multi values)
      *
      */
     public void testCollectionOfUuid()
@@ -297,16 +297,16 @@
             a1.setPath("/a1");
             a1.setStringData("testdata1");
             ocm.insert(a1);
-            
+
             A a2 = new A();
             a2.setPath("/a2");
             a2.setStringData("testdata2");
-            ocm.insert(a2);            
-            ocm.save();           
+            ocm.insert(a2);
+            ocm.save();
 
             // --------------------------------------------------------------------------------
             // Get the objects
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a1 = (A) ocm.getObject( "/a1");
             assertNotNull("a1 is null", a1);
             a2 = (A) ocm.getObject( "/a2");
@@ -314,7 +314,7 @@
             ArrayList references = new ArrayList();
             references.add(a1.getUuid());
             references.add(a2.getUuid());
-            
+
             // --------------------------------------------------------------------------------
             // Create and store an object B in the repository which has a collection of A
             // --------------------------------------------------------------------------------
@@ -323,7 +323,7 @@
             b.setMultiReferences(references);
             ocm.insert(b);
             ocm.save();
-            
+
             // --------------------------------------------------------------------------------
             // Retrieve object B
             // --------------------------------------------------------------------------------
@@ -348,33 +348,33 @@
             	System.out.println("Invalid uuid value in the collection : " + e);
             	
             }
-            
+
             // --------------------------------------------------------------------------------
             // Update object B with an null value
             // --------------------------------------------------------------------------------
             b.setMultiReferences(null);
             ocm.update(b);
             ocm.save();
-            
+
             // --------------------------------------------------------------------------------
             // Retrieve object B
             // --------------------------------------------------------------------------------
-            b = (B) ocm.getObject("/testB");            
+            b = (B) ocm.getObject("/testB");
             assertNull("a is not null", b.getMultiReferences());
-            
-            
+
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
 
     /**
      * Map a list of uuid  into a collection
-     * The list is defined in a jcr property (multi values) 
+     * The list is defined in a jcr property (multi values)
      *
      */
     public void testCollectionOfBeanWithUuid()
@@ -390,16 +390,16 @@
             a1.setPath("/a1");
             a1.setStringData("testdata1");
             ocm.insert(a1);
-            
+
             A a2 = new A();
             a2.setPath("/a2");
             a2.setStringData("testdata2");
-            ocm.insert(a2);            
-            ocm.save();           
+            ocm.insert(a2);
+            ocm.save();
 
             // --------------------------------------------------------------------------------
             // Get the objects
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a1 = (A) ocm.getObject( "/a1");
             assertNotNull("a1 is null", a1);
             a2 = (A) ocm.getObject( "/a2");
@@ -407,7 +407,7 @@
             ArrayList references = new ArrayList();
             references.add(a1);
             references.add(a2);
-            
+
             // --------------------------------------------------------------------------------
             // Create and store an object B in the repository which has a collection of A
             // --------------------------------------------------------------------------------
@@ -416,7 +416,7 @@
             b.setMultiReferences(references);
             ocm.insert(b);
             ocm.save();
-            
+
             // --------------------------------------------------------------------------------
             // Retrieve object B
             // --------------------------------------------------------------------------------
@@ -433,24 +433,24 @@
             b.setMultiReferences(null);
             ocm.update(b);
             ocm.save();
-            
+
             // --------------------------------------------------------------------------------
             // Retrieve object B
             // --------------------------------------------------------------------------------
-            b = (B2) ocm.getObject("/testB2");            
+            b = (B2) ocm.getObject("/testB2");
             assertNull("a is not null", b.getMultiReferences());
-            
-            
+
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
-    
-    
+
+
     /**
      * Test on uuid field defined in an ancestor class
      *
@@ -469,17 +469,17 @@
             a.setPath("/descendant");
             a.setStringData("testdata");
             ocm.insert(a);
-            ocm.save();           
+            ocm.save();
 
             // --------------------------------------------------------------------------------
             // Get the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (Descendant) ocm.getObject( "/descendant");
             assertNotNull("a is null", a);
             String uuidA = a.getUuid();
             assertNotNull("uuid is null", uuidA);
             System.out.println("UUID : " + uuidA);
-            
+
             // --------------------------------------------------------------------------------
             // Update the object
             // --------------------------------------------------------------------------------
@@ -489,26 +489,26 @@
 
             // --------------------------------------------------------------------------------
             // Get the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (Descendant) ocm.getObject("/descendant");
             assertNotNull("a is null", a);
             assertTrue("The uuid has been modified", uuidA.equals(a.getUuid()));
-            
+
             // --------------------------------------------------------------------------------
             // Get the object with the uuid
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (Descendant) ocm.getObjectByUuid(uuidA);
             assertNotNull("a is null", a);
             assertTrue("Invalid object found with the uuid ", "testdata2".equals(a.getStringData()));
-            
-            
+
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
 
 }

Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/DigesterUuidTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/DigesterUuidTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/DigesterUuidTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/uuid/DigesterUuidTest.java Sun Jan 27 13:08:08 2008
@@ -58,11 +58,11 @@
                 new TestSuite(DigesterUuidTest.class));
     }
 
-    
+
     /**
-     * 
+     *
      *  Map the jcr uuid into a String attribute
-     *  
+     *
      */
     public void testUuid()
     {
@@ -78,17 +78,17 @@
             a.setPath("/test");
             a.setStringData("testdata");
             ocm.insert(a);
-            ocm.save();           
+            ocm.save();
 
             // --------------------------------------------------------------------------------
             // Get the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (A) ocm.getObject( "/test");
             assertNotNull("a is null", a);
             String uuidA = a.getUuid();
             assertNotNull("uuid is null", uuidA);
             System.out.println("UUID : " + uuidA);
-            
+
             // --------------------------------------------------------------------------------
             // Update the object
             // --------------------------------------------------------------------------------
@@ -98,22 +98,22 @@
 
             // --------------------------------------------------------------------------------
             // Get the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (A) ocm.getObject("/test");
             assertNotNull("a is null", a);
             assertTrue("The uuid has been modified", uuidA.equals(a.getUuid()));
-            
+
             // --------------------------------------------------------------------------------
             // Get the object with the uuid
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (A) ocm.getObjectByUuid(uuidA);
             assertNotNull("a is null", a);
             assertTrue("Invalid object found with the uuid ", "testdata2".equals(a.getStringData()));
-            
+
             // --------------------------------------------------------------------------------
             // Get the object with an invalid uuid
-            // --------------------------------------------------------------------------------           
-            try 
+            // --------------------------------------------------------------------------------
+            try
             {
                 a = (A) ocm.getObjectByUuid("1234");
                 fail("Exception not throw");
@@ -124,20 +124,20 @@
             	System.out.println(e);
 
             }
-            
-            
+
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
     /**
-     * 
-     * Map a Reference into a String attribute. 
-     * Object B has an attribute containing the object A uuid. 
+     *
+     * Map a Reference into a String attribute.
+     * Object B has an attribute containing the object A uuid.
      *
      */
     public void testFieldReference()
@@ -153,17 +153,17 @@
             a.setPath("/test");
             a.setStringData("testdata");
             ocm.insert(a);
-            ocm.save();           
+            ocm.save();
 
             // --------------------------------------------------------------------------------
             // Get the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (A) ocm.getObject( "/test");
             assertNotNull("a is null", a);
             String uuidA = a.getUuid();
             assertNotNull("uuid is null", uuidA);
             System.out.println("UUID : " + uuidA);
-                        
+
             // --------------------------------------------------------------------------------
             // Create and store an object B in the repository which has a reference to A
             // --------------------------------------------------------------------------------
@@ -172,16 +172,16 @@
             b.setPath("/testB");
             ocm.insert(b);
             ocm.save();
-            
+
+            // --------------------------------------------------------------------------------
+            // Retrieve the object B with an invalid reference
             // --------------------------------------------------------------------------------
-            // Retrieve the object B with an invalid reference 
-            // --------------------------------------------------------------------------------            
             b = (B) ocm.getObject("/testB");
             assertNotNull("b is null", b);
             assertTrue("Invalid uuid property", b.getReference2A().equals(uuidA));
-            
+
             // --------------------------------------------------------------------------------
-            // Update the object B with an invalid reference 
+            // Update the object B with an invalid reference
             // --------------------------------------------------------------------------------
             b.setReference2A("1245");
             try
@@ -195,22 +195,22 @@
             	System.out.println("Invalid uuid : " + e);
             	
             }
-            
-            
+
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
 
     /**
-     * 
-     * Map a Reference into a bean attribute. 
-     * Object B has an attribute containing the object A. 
-     * The jcr node matching to the object B contains a reference (the jcr node matching to the object B).   
+     *
+     * Map a Reference into a bean attribute.
+     * Object B has an attribute containing the object A.
+     * The jcr node matching to the object B contains a reference (the jcr node matching to the object B).
      *
      */
     public void testBeanReference()
@@ -226,17 +226,17 @@
             a.setPath("/test");
             a.setStringData("testdata");
             ocm.insert(a);
-            ocm.save();           
+            ocm.save();
 
             // --------------------------------------------------------------------------------
             // Get the object a
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (A) ocm.getObject( "/test");
             assertNotNull("a is null", a);
             String uuidA = a.getUuid();
             assertNotNull("uuid is null", uuidA);
             System.out.println("UUID : " + uuidA);
-            
+
             // --------------------------------------------------------------------------------
             // Create and store an object B in the repository which has a reference to A
             // --------------------------------------------------------------------------------
@@ -245,7 +245,7 @@
             b.setPath("/testB2");
             ocm.insert(b);
             ocm.save();
-            
+
             // --------------------------------------------------------------------------------
             // Retrieve object B
             // --------------------------------------------------------------------------------
@@ -261,27 +261,27 @@
             b.setA(null);
             ocm.update(b);
             ocm.save();
-            
+
             // --------------------------------------------------------------------------------
             // Retrieve object B
             // --------------------------------------------------------------------------------
             b = (B2) ocm.getObject("/testB2");
             a = b.getA();
             assertNull("a is not null", a);
-            
-            
+
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
 
     /**
-     * Map a list of uuid  into a collection of String 
-     * The list is defined in a jcr property (Referece type / multi values) 
+     * Map a list of uuid  into a collection of String
+     * The list is defined in a jcr property (Referece type / multi values)
      *
      */
     public void testCollectionOfUuid()
@@ -297,16 +297,16 @@
             a1.setPath("/a1");
             a1.setStringData("testdata1");
             ocm.insert(a1);
-            
+
             A a2 = new A();
             a2.setPath("/a2");
             a2.setStringData("testdata2");
-            ocm.insert(a2);            
-            ocm.save();           
+            ocm.insert(a2);
+            ocm.save();
 
             // --------------------------------------------------------------------------------
             // Get the objects
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a1 = (A) ocm.getObject( "/a1");
             assertNotNull("a1 is null", a1);
             a2 = (A) ocm.getObject( "/a2");
@@ -314,7 +314,7 @@
             ArrayList references = new ArrayList();
             references.add(a1.getUuid());
             references.add(a2.getUuid());
-            
+
             // --------------------------------------------------------------------------------
             // Create and store an object B in the repository which has a collection of A
             // --------------------------------------------------------------------------------
@@ -323,7 +323,7 @@
             b.setMultiReferences(references);
             ocm.insert(b);
             ocm.save();
-            
+
             // --------------------------------------------------------------------------------
             // Retrieve object B
             // --------------------------------------------------------------------------------
@@ -348,33 +348,33 @@
             	System.out.println("Invalid uuid value in the collection : " + e);
             	
             }
-            
+
             // --------------------------------------------------------------------------------
             // Update object B with an null value
             // --------------------------------------------------------------------------------
             b.setMultiReferences(null);
             ocm.update(b);
             ocm.save();
-            
+
             // --------------------------------------------------------------------------------
             // Retrieve object B
             // --------------------------------------------------------------------------------
-            b = (B) ocm.getObject("/testB");            
+            b = (B) ocm.getObject("/testB");
             assertNull("a is not null", b.getMultiReferences());
-            
-            
+
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
 
     /**
      * Map a list of uuid  into a collection
-     * The list is defined in a jcr property (multi values) 
+     * The list is defined in a jcr property (multi values)
      *
      */
     public void testCollectionOfBeanWithUuid()
@@ -390,16 +390,16 @@
             a1.setPath("/a1");
             a1.setStringData("testdata1");
             ocm.insert(a1);
-            
+
             A a2 = new A();
             a2.setPath("/a2");
             a2.setStringData("testdata2");
-            ocm.insert(a2);            
-            ocm.save();           
+            ocm.insert(a2);
+            ocm.save();
 
             // --------------------------------------------------------------------------------
             // Get the objects
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a1 = (A) ocm.getObject( "/a1");
             assertNotNull("a1 is null", a1);
             a2 = (A) ocm.getObject( "/a2");
@@ -407,7 +407,7 @@
             ArrayList references = new ArrayList();
             references.add(a1);
             references.add(a2);
-            
+
             // --------------------------------------------------------------------------------
             // Create and store an object B in the repository which has a collection of A
             // --------------------------------------------------------------------------------
@@ -416,7 +416,7 @@
             b.setMultiReferences(references);
             ocm.insert(b);
             ocm.save();
-            
+
             // --------------------------------------------------------------------------------
             // Retrieve object B
             // --------------------------------------------------------------------------------
@@ -433,24 +433,24 @@
             b.setMultiReferences(null);
             ocm.update(b);
             ocm.save();
-            
+
             // --------------------------------------------------------------------------------
             // Retrieve object B
             // --------------------------------------------------------------------------------
-            b = (B2) ocm.getObject("/testB2");            
+            b = (B2) ocm.getObject("/testB2");
             assertNull("a is not null", b.getMultiReferences());
-            
-            
+
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
-    
-    
+
+
     /**
      * Test on uuid field defined in an ancestor class
      *
@@ -469,17 +469,17 @@
             a.setPath("/descendant");
             a.setStringData("testdata");
             ocm.insert(a);
-            ocm.save();           
+            ocm.save();
 
             // --------------------------------------------------------------------------------
             // Get the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (Descendant) ocm.getObject( "/descendant");
             assertNotNull("a is null", a);
             String uuidA = a.getUuid();
             assertNotNull("uuid is null", uuidA);
             System.out.println("UUID : " + uuidA);
-            
+
             // --------------------------------------------------------------------------------
             // Update the object
             // --------------------------------------------------------------------------------
@@ -489,26 +489,26 @@
 
             // --------------------------------------------------------------------------------
             // Get the object
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (Descendant) ocm.getObject("/descendant");
             assertNotNull("a is null", a);
             assertTrue("The uuid has been modified", uuidA.equals(a.getUuid()));
-            
+
             // --------------------------------------------------------------------------------
             // Get the object with the uuid
-            // --------------------------------------------------------------------------------           
+            // --------------------------------------------------------------------------------
             a = (Descendant) ocm.getObjectByUuid(uuidA);
             assertNotNull("a is null", a);
             assertTrue("Invalid object found with the uuid ", "testdata2".equals(a.getStringData()));
-            
-            
+
+
         }
         catch (Exception e)
         {
             e.printStackTrace();
             fail("Exception occurs during the unit test : " + e);
         }
-        
+
     }
 
 }



Mime
View raw message