You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/01/27 22:08:36 UTC
svn commit: r615649 [11/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...
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterDefaultCollectionConverterImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterDefaultCollectionConverterImplTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterDefaultCollectionConverterImplTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterDefaultCollectionConverterImplTest.java Sun Jan 27 13:08:08 2008
@@ -65,17 +65,17 @@
// Create and store an object with a null collection field
// --------------------------------------------------------------------------------
A a = new A();
- a.setPath("/test");
-
+ a.setPath("/test");
+
ocm.insert(a);
ocm.save();
-
+
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
a = (A) ocm.getObject( "/test");
assertNull("a.collection is not null", a.getCollection());
-
+
// --------------------------------------------------------------------------------
// Update the object
// --------------------------------------------------------------------------------
@@ -85,58 +85,58 @@
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.update(a);
ocm.save();
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
a = (A) ocm.getObject("/test");
assertNotNull("a is null", a);
assertNotNull("a.collection is null", a.getCollection());
assertTrue("Incorrect collection size", a.getCollection().size() == 3);
assertTrue("Incorrect a.collection", ((C) a.getCollection().iterator().next()).getId().equals("first"));
-
+
// --------------------------------------------------------------------------------
// Update the object
// --------------------------------------------------------------------------------
a.setCollection(null);
ocm.update(a);
ocm.save();
-
+
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
a = (A) ocm.getObject( "/test");
assertNull("a.collection is not null", a.getCollection());
-
+
// --------------------------------------------------------------------------------
// Export to check the content
- // --------------------------------------------------------------------------------
- this.exportDocument("target/DefaultCollectionConverterExport.xml", "/test", true, false);
-
+ // --------------------------------------------------------------------------------
+ this.exportDocument("target/DefaultCollectionConverterExport.xml", "/test", true, false);
+
}
catch (Exception e)
{
e.printStackTrace();
fail("Exception occurs during the unit test : " + e);
}
-
+
}
-
+
public void testDropElement()
{
try
@@ -154,70 +154,70 @@
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.collection is null", a.getCollection());
assertEquals("Incorrect a.collection size", 3, a.getCollection().size());
assertTrue("Incorrect a.collection", ((C) a.getCollection().iterator().next()).getId().equals("first"));
-
+
// --------------------------------------------------------------------------------
// Update the object
// --------------------------------------------------------------------------------
c1 = new C();
c1.setId("new first");
c1.setName("First Element");
-
+
c2 = new C();
c2.setId("new second");
c2.setName("Second Element");
-
+
collection = new ArrayList();
collection.add(c1);
collection.add(c2);
a.setCollection(collection);
-
+
ocm.update(a);
ocm.save();
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
a = (A) ocm.getObject( "/test");
assertNotNull("a is null", a);
assertNotNull("a.collection is null", a.getCollection());
assertTrue("Incorrect collection size", a.getCollection().size() == 2);
assertTrue("Incorrect a.collection", ((C) a.getCollection().iterator().next()).getId().equals("new first"));
-
+
// --------------------------------------------------------------------------------
// Export to check the content
- // --------------------------------------------------------------------------------
- this.exportDocument("target/DefaultCollectionConverterExport.xml", "/test", true, false);
-
+ // --------------------------------------------------------------------------------
+ this.exportDocument("target/DefaultCollectionConverterExport.xml", "/test", true, false);
+
}
catch (Exception e)
{
e.printStackTrace();
fail("Exception occurs during the unit test : " + e);
}
-
+
}
public void testAddElement()
@@ -238,63 +238,63 @@
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.collection is null", a.getCollection());
assertEquals("Incorrect a.collection size", 3, a.getCollection().size());
assertEquals("Incorrect a.collection", "first", ((C) a.getCollection().iterator().next()).getId());
-
+
// --------------------------------------------------------------------------------
// Update the object
// --------------------------------------------------------------------------------
C c4 = new C();
c4.setId("Fourth");
c4.setName("Fourth Element");
-
+
collection = new ArrayList();
collection.add(c1);
collection.add(c2);
collection.add(c3);
collection.add(c4);
a.setCollection(collection);
-
+
ocm.update(a);
ocm.save();
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
a = (A) ocm.getObject( "/test");
assertNotNull("a is null", a);
assertNotNull("a.collection is null", a.getCollection());
assertEquals("Incorrect collection size", 4, a.getCollection().size());
assertEquals("Incorrect a.collection", "first", ((C) a.getCollection().iterator().next()).getId());
-
+
}
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/collectionconverter/DigesterHashMapTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterHashMapTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterHashMapTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterHashMapTest.java Sun Jan 27 13:08:08 2008
@@ -52,7 +52,7 @@
return new RepositoryLifecycleTestSetup(new TestSuite(DigesterHashMapTest.class));
}
-
+
public void testHashMap()
{
try
@@ -66,17 +66,17 @@
Main main = new Main();
main.setPath("/test");
main.setText("Main text");
-
+
ocm.insert(main);
ocm.save();
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
- main = (Main) ocm.getObject( "/test");
- assertTrue("Incorrect text", main.getText().equals("Main text"));
+ // --------------------------------------------------------------------------------
+ main = (Main) ocm.getObject( "/test");
+ assertTrue("Incorrect text", main.getText().equals("Main text"));
assertNull("HashMap is not null", main.getHashMap());
-
+
// --------------------------------------------------------------------------------
// Update an object graph in the repository
// --------------------------------------------------------------------------------
@@ -84,31 +84,31 @@
main = new Main();
main.setPath("/test");
main.setText("Main text");
-
+
HashMapElement hashMapElement = new HashMapElement();
Element e1 = new Element();
e1.setId("e1");
e1.setText("Element 1");
hashMapElement.addObject(e1);
-
+
Element e2 = new Element();
e2.setId("e2");
e2.setText("Element 2");
hashMapElement.addObject(e2);
-
+
main.setHashMap(hashMapElement);
-
+
ocm.update(main);
ocm.save();
-
+
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
main = (Main) ocm.getObject( "/test");
assertNotNull("main.getHashMap() is null", main.getHashMap());
- assertTrue("Incorrect text", main.getText().equals("Main text"));
+ assertTrue("Incorrect text", main.getText().equals("Main text"));
assertTrue("Incorrect para element", ((Element) main.getHashMap().get("e1")).getText().equals("Element 1"));
-
+
// --------------------------------------------------------------------------------
// Update the object
// --------------------------------------------------------------------------------
@@ -117,7 +117,7 @@
e1.setId("e1");
e1.setText("Element 1");
hashMapElement.addObject(e1);
-
+
e2 = new Element();
e2.setId("e3");
e2.setText("Element 3");
@@ -128,26 +128,26 @@
e3.setText("Element 4");
hashMapElement.addObject(e3);
main.setHashMap(hashMapElement);
-
+
ocm.update(main);
ocm.save();
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
assertNotNull("main.getElements() is null", main.getHashMap());
- assertTrue("Incorrect text", main.getText().equals("Main text"));
+ assertTrue("Incorrect text", main.getText().equals("Main text"));
assertTrue("Incorrect para element", ((Element) main.getHashMap().get("e4")).getText().equals("Element 4"));
-
+
}
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/collectionconverter/DigesterMultiValueCollectionConverterImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueCollectionConverterImplTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueCollectionConverterImplTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterMultiValueCollectionConverterImplTest.java Sun Jan 27 13:08:08 2008
@@ -56,7 +56,7 @@
// All methods starting with "test" will be executed in the test suite.
return new RepositoryLifecycleTestSetup(new TestSuite(DigesterMultiValueCollectionConverterImplTest.class));
}
-
+
public void testMultiValue()
{
@@ -70,26 +70,26 @@
MultiValue multiValue = new MultiValue();
multiValue.setPath("/test");
-
+
ArrayList values = new ArrayList();
values.add("Value1");
values.add("Value2");
values.add("Value3");
values.add("Value4");
multiValue.setMultiValues(values);
-
+
ocm.insert(multiValue);
ocm.save();
-
+
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
multiValue = (MultiValue) ocm.getObject( "/test");
assertNotNull("Object is null", multiValue);
assertNull("nullMultiValues field is not null", multiValue.getNullMultiValues());
- assertTrue("Incorrect number of values", multiValue.getMultiValues().size() == 4);
+ assertTrue("Incorrect number of values", multiValue.getMultiValues().size() == 4);
assertTrue("Incorrect collection element", ((String) multiValue.getMultiValues().iterator().next()).equals("Value1"));
-
+
// --------------------------------------------------------------------------------
// Update the object
// --------------------------------------------------------------------------------
@@ -100,29 +100,29 @@
values.add("Value4");
values.add("Value5");
multiValue.setMultiValues(values);
-
+
ocm.update(multiValue);
ocm.save();
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
multiValue = (MultiValue) ocm.getObject( "/test");
assertNotNull("Object is null", multiValue);
assertNull("nullMultiValues field is not null", multiValue.getNullMultiValues());
- assertTrue("Incorrect number of values", multiValue.getMultiValues().size() == 5);
+ assertTrue("Incorrect number of values", multiValue.getMultiValues().size() == 5);
assertTrue("Incorrect collection element", ((String) multiValue.getMultiValues().iterator().next()).equals("Value1"));
-
-
+
+
}
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/collectionconverter/DigesterNTCollectionConverterImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterNTCollectionConverterImplTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterNTCollectionConverterImplTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterNTCollectionConverterImplTest.java Sun Jan 27 13:08:08 2008
@@ -56,14 +56,14 @@
return new RepositoryLifecycleTestSetup(
new TestSuite(DigesterNTCollectionConverterImplTest.class));
}
-
+
public void testCollection()
{
try
{
ObjectContentManager ocm = getObjectContentManager();
-
+
// --------------------------------------------------------------------------------
// Create and store an object graph in the repository with a null collection
// --------------------------------------------------------------------------------
@@ -71,75 +71,75 @@
Page page = new Page();
page.setPath("/test");
page.setTitle("Page Title");
-
+
ocm.insert(page);
ocm.save();
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
page = (Page) ocm.getObject( "/test");
assertNull("page.getParagraphs is not null", page.getParagraphs());
- assertTrue("Incorrect page title", page.getTitle().equals("Page Title"));
-
+ assertTrue("Incorrect page title", page.getTitle().equals("Page Title"));
+
// --------------------------------------------------------------------------------
// Create and store an object graph in the repository
// --------------------------------------------------------------------------------
ArrayList paragraphs = new ArrayList();
-
+
paragraphs.add(new Paragraph("Para 1"));
paragraphs.add(new Paragraph("Para 2"));
paragraphs.add(new Paragraph("Para 3"));
page.setParagraphs(paragraphs);
-
+
ocm.update(page);
ocm.save();
-
+
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
page = (Page) ocm.getObject( "/test");
assertNotNull("page.getParagraphs is null", page.getParagraphs());
assertTrue("Incorrect page title", page.getTitle().equals("Page Title"));
assertTrue("Incorrect page.getParagraphs size", page.getParagraphs().size() == 3);
assertTrue("Incorrect para element", ((Paragraph) page.getParagraphs().iterator().next()).getText().equals("Para 1"));
-
+
// --------------------------------------------------------------------------------
// Update the object
// --------------------------------------------------------------------------------
paragraphs = new ArrayList();
-
+
paragraphs.add(new Paragraph("Para 1"));
paragraphs.add(new Paragraph("Para 2"));
paragraphs.add(new Paragraph("Para 4"));
paragraphs.add(new Paragraph("Para 5"));
page.setParagraphs(paragraphs);
-
+
ocm.update(page);
ocm.save();
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
page = (Page) ocm.getObject( "/test");
assertNotNull("page.getParagraphs is null", page.getParagraphs());
assertTrue("Incorrect page title", page.getTitle().equals("Page Title"));
assertTrue("Incorrect page.getParagraphs size", page.getParagraphs().size() == 4);
assertTrue("Incorrect para element", ((Paragraph) page.getParagraphs().iterator().next()).getText().equals("Para 1"));
-
+
// --------------------------------------------------------------------------------
// Export to check the content
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
this.exportDocument("target/NTCollectionExport.xml", "/test", true, false);
-
+
}
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/collectionconverter/DigesterResidualNodesCollectionConverterImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualNodesCollectionConverterImplTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualNodesCollectionConverterImplTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualNodesCollectionConverterImplTest.java Sun Jan 27 13:08:08 2008
@@ -32,7 +32,7 @@
* Test ResidualNodesCollectionConverterImpl
*
* @author <a href="mailto:fmeschbe[at]apache[dot]com">Felix Meschberger</a>
- *
+ *
*/
public class DigesterResidualNodesCollectionConverterImplTest extends DigesterTestBase
{
@@ -52,7 +52,7 @@
// All methods starting with "test" will be executed in the test suite.
return new RepositoryLifecycleTestSetup(new TestSuite(DigesterResidualNodesCollectionConverterImplTest.class));
}
-
+
public void testResidualNodes()
{
try
@@ -70,36 +70,36 @@
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
residual = (Residual) ocm.getObject( "/test");
assertNotNull("Object is null", residual);
assertNull("Map is not null", residual.getElements());
-
+
// --------------------------------------------------------------------------------
// Update an object graph in the repository
// --------------------------------------------------------------------------------
residual = new Residual.ResidualNodes();
residual.setPath("/test");
-
+
ManagedHashMap map = new ManagedHashMap();
map.put("value1", new Paragraph("Value1"));
map.put("value2", new Paragraph("Value2"));
map.put("value3", new Paragraph("Value3"));
map.put("value4", new Paragraph("Value4"));
residual.setElements(map);
-
+
ocm.update(residual);
ocm.save();
-
+
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
residual = (Residual) ocm.getObject( "/test");
assertNotNull("Object is null", residual);
- assertTrue("Incorrect number of values", residual.getElements().size() == 4);
+ assertTrue("Incorrect number of values", residual.getElements().size() == 4);
assertTrue("Incorrect collection element type", (residual.getElements().get("value2") instanceof Paragraph));
assertEquals("Incorrect collection element text", ((Paragraph) residual.getElements().get("value2")).getText(), "Value2");
-
+
// --------------------------------------------------------------------------------
// Update the object
// --------------------------------------------------------------------------------
@@ -110,13 +110,13 @@
map.put("value14", new Paragraph("Value14"));
map.put("value15", new Paragraph("Value15"));
residual.setElements(map);
-
+
ocm.update(residual);
ocm.save();
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
residual = (Residual) ocm.getObject( "/test");
assertNotNull("Object is null", residual);
@@ -130,8 +130,8 @@
e.printStackTrace();
fail("Exception occurs during the unit test : " + e);
}
-
+
}
-
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualPropertiesCollectionConverterImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualPropertiesCollectionConverterImplTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualPropertiesCollectionConverterImplTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/collectionconverter/DigesterResidualPropertiesCollectionConverterImplTest.java Sun Jan 27 13:08:08 2008
@@ -34,7 +34,7 @@
* Test ResidualPropertiesCollectionConverterImpl
*
* @author <a href="mailto:fmeschbe[at]apache[dot]com">Felix Meschberger</a>
- *
+ *
*/
public class DigesterResidualPropertiesCollectionConverterImplTest extends DigesterTestBase
{
@@ -68,24 +68,24 @@
Residual residual = new Residual.ResidualProperties();
residual.setPath("/test");
-
+
ocm.insert(residual);
ocm.save();
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
residual = (Residual) ocm.getObject( "/test");
assertNotNull("Object is null", residual);
assertNull("Hashmap is not null", residual.getElements());
-
+
// --------------------------------------------------------------------------------
// Update an object graph in the repository
// --------------------------------------------------------------------------------
residual = new Residual.ResidualProperties();
residual.setPath("/test");
-
+
ManagedHashMap map = new ManagedHashMap();
map.put("value1", "Value1");
map.put("value2", "Value2");
@@ -93,22 +93,22 @@
map.put("value4", "Value4");
map.put("value5", Arrays.asList(new String[]{ "Value5-1", "Value5-2" }));
residual.setElements(map);
-
+
ocm.update(residual);
ocm.save();
-
+
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
residual = (Residual) ocm.getObject( "/test");
assertNotNull("Object is null", residual);
- assertTrue("Incorrect number of values", residual.getElements().size() == 5);
+ assertTrue("Incorrect number of values", residual.getElements().size() == 5);
assertTrue("Incorrect collection element", residual.getElements().get("value2").equals("Value2"));
assertNotNull("Missing collection element", residual.getElements().get("value5"));
assertTrue("Incorrect collection element type", (residual.getElements().get("value5") instanceof List));
assertEquals("Incorrect collection element list size", ((List) residual.getElements().get("value5")).size(), 2);
assertEquals("Incorrect collection element list value", ((List) residual.getElements().get("value5")).get(0), "Value5-1");
-
+
// --------------------------------------------------------------------------------
// Update the object
// --------------------------------------------------------------------------------
@@ -120,13 +120,13 @@
map.put("value15", "Value15");
map.put("value16", Arrays.asList(new String[]{ "Value16-1", "Value16-2" }));
residual.setElements(map);
-
+
ocm.update(residual);
ocm.save();
// --------------------------------------------------------------------------------
// Get the object
- // --------------------------------------------------------------------------------
+ // --------------------------------------------------------------------------------
residual = (Residual) ocm.getObject( "/test");
assertNotNull("Object is null", residual);
@@ -144,8 +144,8 @@
e.printStackTrace();
fail("Exception occurs during the unit test : " + e);
}
-
+
}
-
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AllTests.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AllTests.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/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 {
@@ -39,7 +39,7 @@
suite.addTestSuite(AnnotationInheritanceConcreteClassTest.class);
suite.addTestSuite(AnnotationInheritanceHierarchyTest.class);
suite.addTestSuite(DigesterInheritanceConcreteClassTest.class);
- suite.addTestSuite(DigesterInheritanceHierarchyTest.class);
+ suite.addTestSuite(DigesterInheritanceHierarchyTest.class);
//$JUnit-END$
return suite;
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceHierarchyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceHierarchyTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceHierarchyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/AnnotationInheritanceHierarchyTest.java Sun Jan 27 13:08:08 2008
@@ -234,7 +234,7 @@
assertTrue("Invalid item in the collection", this.contains(result, "/anotherdescendant2", AnotherDescendant.class));
assertTrue("Invalid item in the collection", this.contains(result, "/anotherdescendant3", AnotherDescendant.class));
-
+
}
-
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceHierarchyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceHierarchyTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceHierarchyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/inheritance/DigesterInheritanceHierarchyTest.java Sun Jan 27 13:08:08 2008
@@ -233,7 +233,7 @@
assertTrue("Invalid item in the collection", this.contains(result, "/anotherdescendant2", AnotherDescendant.class));
assertTrue("Invalid item in the collection", this.contains(result, "/anotherdescendant3", AnotherDescendant.class));
-
+
}
-
+
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AllTests.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AllTests.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/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 {
@@ -39,7 +39,7 @@
suite.addTestSuite(AnnotationConcreteClassTest.class);
suite.addTestSuite(DigesterConcreteClassTest.class);
suite.addTestSuite(AnnotationInterfaceHierarchyTest.class);
- suite.addTestSuite(DigesterInterfaceHierarchyTest.class);
+ suite.addTestSuite(DigesterInterfaceHierarchyTest.class);
//$JUnit-END$
return suite;
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationConcreteClassTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationConcreteClassTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationConcreteClassTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationConcreteClassTest.java Sun Jan 27 13:08:08 2008
@@ -43,7 +43,7 @@
*
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
*/
-public class AnnotationConcreteClassTest extends AnnotationTestBase
+public class AnnotationConcreteClassTest extends AnnotationTestBase
{
private final static Log log = LogFactory.getLog(AnnotationConcreteClassTest.class);
@@ -70,23 +70,23 @@
ObjectContentManager ocm = this.getObjectContentManager();
//---------------------------------------------------------------------------------------------------------
- // Insert
+ // Insert
//---------------------------------------------------------------------------------------------------------
DocumentImpl documentImpl = new DocumentImpl();
documentImpl.setPath("/document1");
documentImpl.setName("document name");
- documentImpl.setContentType("plain/text");
+ documentImpl.setContentType("plain/text");
DocumentStream documentStream = new DocumentStream();
documentStream.setEncoding("utf-8");
documentStream.setContent("Test Content".getBytes());
documentImpl.setDocumentStream(documentStream);
Document document = documentImpl;
-
+
ocm.insert(document);
ocm.save();
//---------------------------------------------------------------------------------------------------------
- // Retrieve
+ // Retrieve
//---------------------------------------------------------------------------------------------------------
document = (Document) ocm.getObject( "/document1");
assertTrue("Invalid implementation for Document", document instanceof DocumentImpl);
@@ -134,58 +134,58 @@
DocumentImpl document = new DocumentImpl();
document.setPath("/document1");
document.setName("document name 1");
- document.setContentType("plain/text");
+ document.setContentType("plain/text");
DocumentStream documentStream = new DocumentStream();
documentStream.setEncoding("utf-8");
documentStream.setContent("Test Content".getBytes());
- document.setDocumentStream(documentStream);
+ document.setDocumentStream(documentStream);
ocm.insert(document);
-
+
document = new DocumentImpl();
- document.setPath("/document2");
+ document.setPath("/document2");
document.setName("document name 2");
- document.setContentType("plain/text");
+ document.setContentType("plain/text");
documentStream = new DocumentStream();
documentStream.setEncoding("utf-8");
documentStream.setContent("Test Content".getBytes());
- document.setDocumentStream(documentStream);
+ document.setDocumentStream(documentStream);
ocm.insert(document);
document = new DocumentImpl();
- document.setPath("/document3");
+ document.setPath("/document3");
document.setName("document 3");
- document.setContentType("plain/text");
+ document.setContentType("plain/text");
documentStream = new DocumentStream();
documentStream.setEncoding("utf-8");
documentStream.setContent("Test Content 3".getBytes());
- document.setDocumentStream(documentStream);
+ document.setDocumentStream(documentStream);
ocm.insert(document);
-
+
FolderImpl folder = new FolderImpl();
folder.setPath("/folder1");
folder.setName("folder1");
ocm.insert(folder);
- document = new DocumentImpl();
+ document = new DocumentImpl();
document.setName("document4");
- document.setContentType("plain/text");
+ document.setContentType("plain/text");
documentStream = new DocumentStream();
documentStream.setEncoding("utf-8");
documentStream.setContent("Test Content 4".getBytes());
- document.setDocumentStream(documentStream);
+ document.setDocumentStream(documentStream);
FolderImpl subFolder = new FolderImpl();
subFolder.setName("subfolder");
-
+
folder = new FolderImpl();
folder.setPath("/folder2");
- folder.setName("folder2");
+ folder.setName("folder2");
folder.addChild(document);
folder.addChild(subFolder);
ocm.insert(folder);
-
+
Atomic a = new Atomic();
a.setPath("/atomic");
a.setBooleanPrimitive(true);
@@ -207,7 +207,7 @@
//---------------------------------------------------------------------------------------------------------
- // Retrieve Documents
+ // Retrieve Documents
//---------------------------------------------------------------------------------------------------------
queryManager = ocm.getQueryManager();
filter = queryManager.createFilter(Document.class);
@@ -222,7 +222,7 @@
//---------------------------------------------------------------------------------------------------------
- // Retrieve folder2
+ // Retrieve folder2
//---------------------------------------------------------------------------------------------------------
Folder folder2 = (Folder) ocm.getObject( "/folder2");
assertNotNull("folder 2 is null", folder2);
@@ -247,7 +247,7 @@
assertTrue("Invalid item in the collection", this.contains(parenFolder.getChildren(), "/folder2/subfolder", FolderImpl.class));
//---------------------------------------------------------------------------------------------------------
- // Retrieve Contents (ancestor of Documents)
+ // Retrieve Contents (ancestor of Documents)
//---------------------------------------------------------------------------------------------------------
queryManager = ocm.getQueryManager();
filter = queryManager.createFilter(Content.class);
@@ -295,7 +295,7 @@
assertTrue("Invalid item in the collection", this.contains(result, "/folder2/subfolder",FolderImpl.class));
}
-
+
public void testBeanCollection() {
ObjectContentManager ocm = this.getObjectContentManager();
@@ -305,26 +305,26 @@
//---------------------------------------------------------------------------------------------------------
Folder folder = new FolderImpl();
folder.setPath("/mainfolder");
- folder.setName("Main folder");
-
+ folder.setName("Main folder");
+
for (int i=1; i<=100;i++)
{
- Document document = new DocumentImpl();
+ Document document = new DocumentImpl();
document.setName("document" + i);
- document.setContentType("plain/text");
+ document.setContentType("plain/text");
DocumentStream documentStream = new DocumentStream();
documentStream.setEncoding("utf-8");
documentStream.setContent("Test Content".getBytes());
document.setDocumentStream(documentStream);
folder.addChild(document);
-
+
Folder subFolder = new FolderImpl();
subFolder.setName("folder" + i);
subFolder.addChild(document);
folder.addChild(subFolder);
-
+
}
- log.debug("Save the folder and its 200 children");
+ log.debug("Save the folder and its 200 children");
ocm.insert(folder);
ocm.save();
log.debug("End - Save the folder and its 200 children");
@@ -338,7 +338,7 @@
assertEquals("Invalid number of children", children.size(), 200);
for (int i=1; i<=100;i++)
{
-
+
assertTrue("Invalid item in the collection : " +"/mainfolder/document" + i , this.contains(children, "/mainfolder/document" + i,DocumentImpl.class));
assertTrue("Invalid item in the collection : " + "/mainfolder/folder" + i, this.contains(children, "/mainfolder/folder" + i, FolderImpl.class));
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationInterfaceHierarchyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationInterfaceHierarchyTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationInterfaceHierarchyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/AnnotationInterfaceHierarchyTest.java Sun Jan 27 13:08:08 2008
@@ -66,7 +66,7 @@
ObjectContentManager ocm = this.getObjectContentManager();
//---------------------------------------------------------------------------------------------------------
- // Insert
+ // Insert
//---------------------------------------------------------------------------------------------------------
AnotherDescendant anotherDescendant = new AnotherDescendant();
anotherDescendant.setAnotherDescendantField("anotherDescendantValue");
@@ -77,11 +77,11 @@
ocm.save();
//---------------------------------------------------------------------------------------------------------
- // Retrieve
+ // Retrieve
//---------------------------------------------------------------------------------------------------------
Interface result = (Interface) ocm.getObject("/test");
assertNotNull("Object is null", result);
- anotherDescendant = (AnotherDescendant) result;
+ anotherDescendant = (AnotherDescendant) result;
assertEquals("Descendant path is invalid", anotherDescendant.getPath(), "/test");
assertEquals("Descendant ancestorField is invalid", anotherDescendant.getAncestorField(), "ancestorValue");
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterConcreteClassTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterConcreteClassTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterConcreteClassTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterConcreteClassTest.java Sun Jan 27 13:08:08 2008
@@ -67,23 +67,23 @@
ObjectContentManager ocm = this.getObjectContentManager();
//---------------------------------------------------------------------------------------------------------
- // Insert
+ // Insert
//---------------------------------------------------------------------------------------------------------
DocumentImpl documentImpl = new DocumentImpl();
documentImpl.setPath("/document1");
documentImpl.setName("document name");
- documentImpl.setContentType("plain/text");
+ documentImpl.setContentType("plain/text");
DocumentStream documentStream = new DocumentStream();
documentStream.setEncoding("utf-8");
documentStream.setContent("Test Content".getBytes());
documentImpl.setDocumentStream(documentStream);
Document document = documentImpl;
-
+
ocm.insert(document);
ocm.save();
//---------------------------------------------------------------------------------------------------------
- // Retrieve
+ // Retrieve
//---------------------------------------------------------------------------------------------------------
document = (Document) ocm.getObject( "/document1");
assertTrue("Invalid implementation for Document", document instanceof DocumentImpl);
@@ -131,58 +131,58 @@
DocumentImpl document = new DocumentImpl();
document.setPath("/document1");
document.setName("document name 1");
- document.setContentType("plain/text");
+ document.setContentType("plain/text");
DocumentStream documentStream = new DocumentStream();
documentStream.setEncoding("utf-8");
documentStream.setContent("Test Content".getBytes());
- document.setDocumentStream(documentStream);
+ document.setDocumentStream(documentStream);
ocm.insert(document);
-
+
document = new DocumentImpl();
- document.setPath("/document2");
+ document.setPath("/document2");
document.setName("document name 2");
- document.setContentType("plain/text");
+ document.setContentType("plain/text");
documentStream = new DocumentStream();
documentStream.setEncoding("utf-8");
documentStream.setContent("Test Content".getBytes());
- document.setDocumentStream(documentStream);
+ document.setDocumentStream(documentStream);
ocm.insert(document);
document = new DocumentImpl();
- document.setPath("/document3");
+ document.setPath("/document3");
document.setName("document 3");
- document.setContentType("plain/text");
+ document.setContentType("plain/text");
documentStream = new DocumentStream();
documentStream.setEncoding("utf-8");
documentStream.setContent("Test Content 3".getBytes());
- document.setDocumentStream(documentStream);
+ document.setDocumentStream(documentStream);
ocm.insert(document);
-
+
FolderImpl folder = new FolderImpl();
folder.setPath("/folder1");
folder.setName("folder1");
ocm.insert(folder);
- document = new DocumentImpl();
+ document = new DocumentImpl();
document.setName("document4");
- document.setContentType("plain/text");
+ document.setContentType("plain/text");
documentStream = new DocumentStream();
documentStream.setEncoding("utf-8");
documentStream.setContent("Test Content 4".getBytes());
- document.setDocumentStream(documentStream);
+ document.setDocumentStream(documentStream);
FolderImpl subFolder = new FolderImpl();
subFolder.setName("subfolder");
-
+
folder = new FolderImpl();
folder.setPath("/folder2");
- folder.setName("folder2");
+ folder.setName("folder2");
folder.addChild(document);
folder.addChild(subFolder);
ocm.insert(folder);
-
+
Atomic a = new Atomic();
a.setPath("/atomic");
a.setBooleanPrimitive(true);
@@ -204,7 +204,7 @@
//---------------------------------------------------------------------------------------------------------
- // Retrieve Documents
+ // Retrieve Documents
//---------------------------------------------------------------------------------------------------------
queryManager = ocm.getQueryManager();
filter = queryManager.createFilter(Document.class);
@@ -219,7 +219,7 @@
//---------------------------------------------------------------------------------------------------------
- // Retrieve folder2
+ // Retrieve folder2
//---------------------------------------------------------------------------------------------------------
Folder folder2 = (Folder) ocm.getObject( "/folder2");
assertNotNull("folder 2 is null", folder2);
@@ -244,7 +244,7 @@
assertTrue("Invalid item in the collection", this.contains(parenFolder.getChildren(), "/folder2/subfolder", FolderImpl.class));
//---------------------------------------------------------------------------------------------------------
- // Retrieve Contents (ancestor of Documents)
+ // Retrieve Contents (ancestor of Documents)
//---------------------------------------------------------------------------------------------------------
queryManager = ocm.getQueryManager();
filter = queryManager.createFilter(Content.class);
@@ -292,7 +292,7 @@
assertTrue("Invalid item in the collection", this.contains(result, "/folder2/subfolder",FolderImpl.class));
}
-
+
public void testBeanCollection() {
ObjectContentManager ocm = this.getObjectContentManager();
@@ -302,26 +302,26 @@
//---------------------------------------------------------------------------------------------------------
Folder folder = new FolderImpl();
folder.setPath("/mainfolder");
- folder.setName("Main folder");
-
+ folder.setName("Main folder");
+
for (int i=1; i<=100;i++)
{
- Document document = new DocumentImpl();
+ Document document = new DocumentImpl();
document.setName("document" + i);
- document.setContentType("plain/text");
+ document.setContentType("plain/text");
DocumentStream documentStream = new DocumentStream();
documentStream.setEncoding("utf-8");
documentStream.setContent("Test Content".getBytes());
document.setDocumentStream(documentStream);
folder.addChild(document);
-
+
Folder subFolder = new FolderImpl();
subFolder.setName("folder" + i);
subFolder.addChild(document);
folder.addChild(subFolder);
-
+
}
- log.debug("Save the folder and its 200 children");
+ log.debug("Save the folder and its 200 children");
ocm.insert(folder);
ocm.save();
log.debug("End - Save the folder and its 200 children");
@@ -335,7 +335,7 @@
assertEquals("Invalid number of children", children.size(), 200);
for (int i=1; i<=100;i++)
{
-
+
assertTrue("Invalid item in the collection : " +"/mainfolder/document" + i , this.contains(children, "/mainfolder/document" + i,DocumentImpl.class));
assertTrue("Invalid item in the collection : " + "/mainfolder/folder" + i, this.contains(children, "/mainfolder/folder" + i, FolderImpl.class));
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterInterfaceHierarchyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterInterfaceHierarchyTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterInterfaceHierarchyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/interfaces/DigesterInterfaceHierarchyTest.java Sun Jan 27 13:08:08 2008
@@ -66,7 +66,7 @@
ObjectContentManager ocm = this.getObjectContentManager();
//---------------------------------------------------------------------------------------------------------
- // Insert
+ // Insert
//---------------------------------------------------------------------------------------------------------
AnotherDescendant anotherDescendant = new AnotherDescendant();
anotherDescendant.setAnotherDescendantField("anotherDescendantValue");
@@ -77,11 +77,11 @@
ocm.save();
//---------------------------------------------------------------------------------------------------------
- // Retrieve
+ // Retrieve
//---------------------------------------------------------------------------------------------------------
Interface result = (Interface) ocm.getObject("/test");
assertNotNull("Object is null", result);
- anotherDescendant = (AnotherDescendant) result;
+ anotherDescendant = (AnotherDescendant) result;
assertEquals("Descendant path is invalid", anotherDescendant.getPath(), "/test");
assertEquals("Descendant ancestorField is invalid", anotherDescendant.getAncestorField(), "ancestorValue");
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AllTests.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AllTests.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/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.jcrnodetype");
//$JUnit-BEGIN$
suite.addTestSuite(AnnotationJcrNodeTypeTest.class);
- suite.addTestSuite(DigesterJcrNodeTypeTest.class);
+ suite.addTestSuite(DigesterJcrNodeTypeTest.class);
suite.addTestSuite(AnnotationJcrPropertyTest.class);
suite.addTestSuite(DigesterJcrPropertyTest.class);
//$JUnit-END$
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrNodeTypeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrNodeTypeTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrNodeTypeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrNodeTypeTest.java Sun Jan 27 13:08:08 2008
@@ -54,10 +54,10 @@
AnnotationJcrNodeTypeTest.class));
}
- public void testRetrieveSingleton()
+ public void testRetrieveSingleton()
{
- try
+ try
{
ObjectContentManager ocm = this.getObjectContentManager();
@@ -65,18 +65,18 @@
// Insert a folder (class mapped to jcr:folder) with one file (class mapped to jcr:file)
//---------------------------------------------------------------------------------------------------------
Resource resource = new Resource();
- resource.setData(new ByteArrayInputStream("this is the content".getBytes()));
+ resource.setData(new ByteArrayInputStream("this is the content".getBytes()));
resource.setLastModified(Calendar.getInstance());
resource.setMimeType("plain/text");
- File file = new File();
+ File file = new File();
file.setResource(resource);
-
-
+
+
Folder folder = new Folder();
folder.setPath("/folder1");
folder.addChild(file);
-
- ocm.insert(folder);
+
+ ocm.insert(folder);
ocm.save();
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrPropertyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrPropertyTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrPropertyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/AnnotationJcrPropertyTest.java Sun Jan 27 13:08:08 2008
@@ -31,7 +31,7 @@
*
* @author <a href="mailto:christophe.lombart@gmail.com">Christophe Lombart</a>
*/
-public class AnnotationJcrPropertyTest extends AnnotationTestBase
+public class AnnotationJcrPropertyTest extends AnnotationTestBase
{
private final static Log log = LogFactory.getLog(AnnotationJcrPropertyTest.class);
@@ -49,10 +49,10 @@
return new RepositoryLifecycleTestSetup(new TestSuite(AnnotationJcrPropertyTest.class));
}
- public void testRequiredProperty()
+ public void testRequiredProperty()
{
- try
+ try
{
ObjectContentManager ocm = this.getObjectContentManager();
//---------------------------------------------------------------------------------------------------------
@@ -63,8 +63,8 @@
propertyTest.setPath("/test");
propertyTest.setRequiredProp("requiredPropValue");
propertyTest.setRequiredWithConstraintsProp("abc");
-
- try
+
+ try
{
ocm.insert(propertyTest);
fail("Incorrect insert operation - the mandatory fields have no value");
@@ -74,7 +74,7 @@
// Normal behaviour
ocm.refresh(false);
}
-
+
//---------------------------------------------------------------------------------------------------------
// Insert with the mandatory fields
//---------------------------------------------------------------------------------------------------------
@@ -82,23 +82,23 @@
propertyTest.setMandatoryWithConstaintsProp("xx");
ocm.insert(propertyTest);
ocm.save();
-
+
//---------------------------------------------------------------------------------------------------------
// Retrieve
//---------------------------------------------------------------------------------------------------------
propertyTest = (PropertyTest) ocm.getObject("/test");
assertTrue("Invalid required property", propertyTest.getRequiredProp().equals("requiredPropValue"));
- assertTrue("Invalid required property with constraints", propertyTest.getRequiredWithConstraintsProp().equals("abc"));
- assertTrue("Invalid autocreated property", propertyTest.getAutoCreatedProp().equals("aaa"));
+ assertTrue("Invalid required property with constraints", propertyTest.getRequiredWithConstraintsProp().equals("abc"));
+ assertTrue("Invalid autocreated property", propertyTest.getAutoCreatedProp().equals("aaa"));
assertTrue("Invalid autocreated property", propertyTest.getAutoCreatedWithConstraintsProp().equals("ccc"));
assertTrue("Invalid protected property", propertyTest.getProtectedWithDefaultValueProp().equals("protectedValue"));
-
+
//---------------------------------------------------------------------------------------------------------
// update the property requiredWithConstraintsProp with bad value
//---------------------------------------------------------------------------------------------------------
propertyTest = (PropertyTest) ocm.getObject("/test");
propertyTest.setRequiredWithConstraintsProp("invalid value");
- try
+ try
{
ocm.update(propertyTest);
ocm.save();
@@ -108,13 +108,13 @@
{
// Do nothing - normal behaviour, the value
}
-
+
//---------------------------------------------------------------------------------------------------------
// update the property AutoCreatedWithConstraintsProp with bad value
//---------------------------------------------------------------------------------------------------------
propertyTest = (PropertyTest) ocm.getObject("/test");
propertyTest.setAutoCreatedWithConstraintsProp("invalid value");
- try
+ try
{
ocm.update(propertyTest);
ocm.save();
@@ -125,13 +125,13 @@
// Do nothing - normal behaviour, the value is not valid
}
-
+
//---------------------------------------------------------------------------------------------------------
// update the property mandatoryWithConstaintsProp with bad value
//---------------------------------------------------------------------------------------------------------
propertyTest = (PropertyTest) ocm.getObject("/test");
propertyTest.setMandatoryWithConstaintsProp("yy");
- try
+ try
{
ocm.update(propertyTest);
ocm.save();
@@ -140,7 +140,7 @@
catch(Exception e)
{
e.printStackTrace();
- }
+ }
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrNodeTypeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrNodeTypeTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrNodeTypeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrNodeTypeTest.java Sun Jan 27 13:08:08 2008
@@ -56,10 +56,10 @@
}
- public void testRetrieveSingleton()
+ public void testRetrieveSingleton()
{
- try
+ try
{
ObjectContentManager ocm = this.getObjectContentManager();
@@ -67,18 +67,18 @@
// Insert a folder (class mapped to jcr:folder) with one file (class mapped to jcr:file)
//---------------------------------------------------------------------------------------------------------
Resource resource = new Resource();
- resource.setData(new ByteArrayInputStream("this is the content".getBytes()));
+ resource.setData(new ByteArrayInputStream("this is the content".getBytes()));
resource.setLastModified(Calendar.getInstance());
resource.setMimeType("plain/text");
- File file = new File();
+ File file = new File();
file.setResource(resource);
-
-
+
+
Folder folder = new Folder();
folder.setPath("/folder1");
folder.addChild(file);
-
- ocm.insert(folder);
+
+ ocm.insert(folder);
ocm.save();
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrPropertyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrPropertyTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrPropertyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/jcrnodetype/DigesterJcrPropertyTest.java Sun Jan 27 13:08:08 2008
@@ -48,10 +48,10 @@
return new RepositoryLifecycleTestSetup(new TestSuite(DigesterJcrPropertyTest.class));
}
- public void testRequiredProperty()
+ public void testRequiredProperty()
{
- try
+ try
{
ObjectContentManager ocm = this.getObjectContentManager();
//---------------------------------------------------------------------------------------------------------
@@ -62,8 +62,8 @@
propertyTest.setPath("/test");
propertyTest.setRequiredProp("requiredPropValue");
propertyTest.setRequiredWithConstraintsProp("abc");
-
- try
+
+ try
{
ocm.insert(propertyTest);
fail("Incorrect insert operation - the mandatory fields have no value");
@@ -73,7 +73,7 @@
// Normal behaviour
ocm.refresh(false);
}
-
+
//---------------------------------------------------------------------------------------------------------
// Insert with the mandatory fields
//---------------------------------------------------------------------------------------------------------
@@ -81,23 +81,23 @@
propertyTest.setMandatoryWithConstaintsProp("xx");
ocm.insert(propertyTest);
ocm.save();
-
+
//---------------------------------------------------------------------------------------------------------
// Retrieve
//---------------------------------------------------------------------------------------------------------
propertyTest = (PropertyTest) ocm.getObject("/test");
assertTrue("Invalid required property", propertyTest.getRequiredProp().equals("requiredPropValue"));
- assertTrue("Invalid required property with constraints", propertyTest.getRequiredWithConstraintsProp().equals("abc"));
- assertTrue("Invalid autocreated property", propertyTest.getAutoCreatedProp().equals("aaa"));
+ assertTrue("Invalid required property with constraints", propertyTest.getRequiredWithConstraintsProp().equals("abc"));
+ assertTrue("Invalid autocreated property", propertyTest.getAutoCreatedProp().equals("aaa"));
assertTrue("Invalid autocreated property", propertyTest.getAutoCreatedWithConstraintsProp().equals("ccc"));
assertTrue("Invalid protected property", propertyTest.getProtectedWithDefaultValueProp().equals("protectedValue"));
-
+
//---------------------------------------------------------------------------------------------------------
// update the property requiredWithConstraintsProp with bad value
//---------------------------------------------------------------------------------------------------------
propertyTest = (PropertyTest) ocm.getObject("/test");
propertyTest.setRequiredWithConstraintsProp("invalid value");
- try
+ try
{
ocm.update(propertyTest);
ocm.save();
@@ -107,13 +107,13 @@
{
// Do nothing - normal behaviour, the value
}
-
+
//---------------------------------------------------------------------------------------------------------
// update the property AutoCreatedWithConstraintsProp with bad value
//---------------------------------------------------------------------------------------------------------
propertyTest = (PropertyTest) ocm.getObject("/test");
propertyTest.setAutoCreatedWithConstraintsProp("invalid value");
- try
+ try
{
ocm.update(propertyTest);
ocm.save();
@@ -124,13 +124,13 @@
// Do nothing - normal behaviour, the value is not valid
}
-
+
//---------------------------------------------------------------------------------------------------------
// update the property mandatoryWithConstaintsProp with bad value
//---------------------------------------------------------------------------------------------------------
propertyTest = (PropertyTest) ocm.getObject("/test");
propertyTest.setMandatoryWithConstaintsProp("yy");
- try
+ try
{
ocm.update(propertyTest);
ocm.save();
@@ -139,7 +139,7 @@
catch(Exception e)
{
e.printStackTrace();
- }
+ }
}
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AllTests.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AllTests.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AllTests.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/lock/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 {
Modified: jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AnnotationLockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AnnotationLockTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AnnotationLockTest.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/test/java/org/apache/jackrabbit/ocm/manager/lock/AnnotationLockTest.java Sun Jan 27 13:08:08 2008
@@ -58,7 +58,7 @@
new TestSuite(AnnotationLockTest.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);
}
-
- }
-
+
+ }
+
}