Author: kelvingoodson
Date: Mon Oct 30 11:24:06 2006
New Revision: 469239

URL: http://svn.apache.org/viewvc?view=rev&rev=469239
Log:
TUSCANY-829 first fixup to improve test behaviour

Modified:
    incubator/tuscany/sandbox/kgoodson/roguewave-tests/pom.xml
    
incubator/tuscany/sandbox/kgoodson/roguewave-tests/src/test/java/com/roguewave/rwsf/sdo/DataObjectListTest.java
    
incubator/tuscany/sandbox/kgoodson/roguewave-tests/src/test/java/com/roguewave/rwsf/sdo/TestHelper.java
    
incubator/tuscany/sandbox/kgoodson/roguewave-tests/src/test/java/com/roguewave/rwsf/sdo/XMLDataObjectTest.java

Modified: incubator/tuscany/sandbox/kgoodson/roguewave-tests/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/kgoodson/roguewave-tests/pom.xml?view=diff&rev=469239&r1=469238&r2=469239
==============================================================================
--- incubator/tuscany/sandbox/kgoodson/roguewave-tests/pom.xml (original)
+++ incubator/tuscany/sandbox/kgoodson/roguewave-tests/pom.xml Mon Oct 30 
11:24:06 2006
@@ -11,7 +11,7 @@
       <dependency>
           <groupId>org.apache.tuscany.sdo</groupId>
           <artifactId>tuscany-sdo-impl</artifactId>
-          <version>1.0-incubator-M2</version>
+          <version>1.0-incubator-M2-SNAPSHOT</version>
           <scope>compile</scope>
       </dependency>
 

Modified: 
incubator/tuscany/sandbox/kgoodson/roguewave-tests/src/test/java/com/roguewave/rwsf/sdo/DataObjectListTest.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/kgoodson/roguewave-tests/src/test/java/com/roguewave/rwsf/sdo/DataObjectListTest.java?view=diff&rev=469239&r1=469238&r2=469239
==============================================================================
--- 
incubator/tuscany/sandbox/kgoodson/roguewave-tests/src/test/java/com/roguewave/rwsf/sdo/DataObjectListTest.java
 (original)
+++ 
incubator/tuscany/sandbox/kgoodson/roguewave-tests/src/test/java/com/roguewave/rwsf/sdo/DataObjectListTest.java
 Mon Oct 30 11:24:06 2006
@@ -8,15 +8,19 @@
 package com.roguewave.rwsf.sdo;
 
 import commonj.sdo.DataObject;
+import commonj.sdo.Property;
 import commonj.sdo.Type;
 import commonj.sdo.helper.DataFactory;
 import commonj.sdo.helper.TypeHelper;
 import commonj.sdo.helper.XMLHelper;
 import commonj.sdo.helper.XMLDocument;
+import commonj.sdo.helper.XSDHelper;
 import junit.framework.TestCase;
 
 import java.util.*;
 
+import org.apache.tuscany.sdo.util.SDOUtil;
+
 /**
  * Test cases for the DataObject SDO implementation.
  */
@@ -109,23 +113,39 @@
         Type typeCheck=TypeHelper.INSTANCE.getType("","catalog2");
         if (typeCheck==null)
         {
+               /*
+                * create type system
+                * catalog2
+                *  - product2:DataObject[isMany:true]
+                * 
+                * product2
+                *  - nameTest:String
+                * 
+                * my guess is that the intention is
+                * catalog2
+                *  - product2:product2(isMany:true)
+                *    - nameTest:String
+                */
             DataObject newType = createType("","catalog2");
-            // define the type
+
             TypeHelper types = TypeHelper.INSTANCE;
-            types.define( newType );
             
             DataObject newType2 = createType("","product2");
 
             DataObject property = newType2.createDataObject( "property" );
-            property.set( "name", "nameTest" );
+            property.set( "name", "name" );
             property.set( "type", TypeHelper.INSTANCE.getType( "commonj.sdo", 
"String" ) );
                         
-            types.define( newType2 );
+            Type nt2 = types.define( newType2 );
             
             DataObject property2 = newType.createDataObject( "property" );
             property2.set( "name", "product2" );
-            property2.set( "type", TypeHelper.INSTANCE.getType( "commonj.sdo", 
"DataObject" ) );
+            property2.set( "type", nt2 );
             property2.setBoolean( "many", true );
+            
+            types.define( newType );
+            
+
         }
       }
     
@@ -181,8 +201,9 @@
     }
     
     public void testToArray(){
-        
//<catalog2><product2><name>name1</name></product2><product2><name>name2</name></product2></catalog2>
-        XMLDocument doc=loadDocFromString("<catalog2><product2 
nameTest=\"name1\"/><product2 nameTest=\"name2\"/></catalog2>");
+        String xmldoc = 
"<catalog2><product2><name>name1</name></product2><product2><name>name2</name></product2></catalog2>";
+        // "<catalog2><product2 nameTest=\"name1\"/><product2 
nameTest=\"name2\"/></catalog2>"
+        XMLDocument doc=loadDocFromString(xmldoc);
         List listTest=createTestObj(doc);
         assertNotNull(listTest);
         
@@ -190,8 +211,8 @@
         
         assertNotNull(objArray);
         assertEquals(2,objArray.length);
-        assertEquals("name1",((DataObject)objArray[0]).getString("nameTest"));
-        //assertEquals("name2",((DataObject)objArray[1]).getString("name"));
+        
//assertEquals("name1",((DataObject)objArray[0]).getString("nameTest"));
+        assertEquals("name2",((DataObject)objArray[1]).getString("name"));
     }
     
     public void testAddNull(){
@@ -203,8 +224,12 @@
             listTest.add(null);
             fail("no exception were thrown");
         }
+        // TODO investigate interoperability issue
         catch(java.lang.NullPointerException e){
-            //success
+            //RogueWave success
+        }
+        catch (IllegalArgumentException e) {
+               //Tuscany success
         }
     }
     
@@ -216,12 +241,12 @@
          
          DataObject doInsert=DataFactory.INSTANCE.create("","product2");
          assertNotNull(doInsert);
-         doInsert.setString("nameTest","aname");
+         doInsert.setString("name","aname");
          listTest.add(0,doInsert);
          
          assertEquals(1,listTest.size());
          DataObject doRes=(DataObject) listTest.get(0);
-         assertEquals("aname",doRes.getString("nameTest"));
+         assertEquals("aname",doRes.getString("name"));
     }
     
      public void testAddAll(){
@@ -232,11 +257,11 @@
          
          DataObject doInsert1=DataFactory.INSTANCE.create("","product2");
          assertNotNull(doInsert1);
-         doInsert1.setString("nameTest","aname1");
+         doInsert1.setString("name","aname1");
          
          DataObject doInsert2=DataFactory.INSTANCE.create("","product2");
          assertNotNull(doInsert2);
-         doInsert2.setString("nameTest","aname2");
+         doInsert2.setString("name","aname2");
          
          ArrayList arraylist2 = new ArrayList();
          arraylist2.add(doInsert1);
@@ -246,7 +271,7 @@
          
          assertEquals(4,listTest.size());
          DataObject doRes=(DataObject)listTest.get(0);
-         assertEquals("aname1",doRes.getString("nameTest"));
+         assertEquals("aname1",doRes.getString("name"));
     }
     
     public void testAddAllCollection(){
@@ -257,11 +282,11 @@
         
         DataObject doInsert1=DataFactory.INSTANCE.create("","product2");
         assertNotNull(doInsert1);
-        doInsert1.setString("nameTest","aname1");
+        doInsert1.setString("name","aname1");
         
         DataObject doInsert2=DataFactory.INSTANCE.create("","product2");
         assertNotNull(doInsert2);
-        doInsert2.setString("nameTest","aname2");
+        doInsert2.setString("name","aname2");
         
         ArrayList arraylist2 = new ArrayList();
         arraylist2.add(doInsert1);
@@ -272,7 +297,7 @@
         assertTrue(bRes);        
         assertEquals(4,listTest.size());
         DataObject doRes=(DataObject)listTest.get(2);
-        assertEquals("aname1",doRes.getString("nameTest"));
+        assertEquals("aname1",doRes.getString("name"));
     }
     
     public void testAddAllCollectionEmpty(){
@@ -481,7 +506,7 @@
                          
         DataObject doTest=DataFactory.INSTANCE.create("","product2");
         assertNotNull(doTest);
-        doTest.setString("nameTest","aname3");
+        doTest.setString("name","aname3");
         
         Object objRes=listTest.set(0,doTest);
         

Modified: 
incubator/tuscany/sandbox/kgoodson/roguewave-tests/src/test/java/com/roguewave/rwsf/sdo/TestHelper.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/kgoodson/roguewave-tests/src/test/java/com/roguewave/rwsf/sdo/TestHelper.java?view=diff&rev=469239&r1=469238&r2=469239
==============================================================================
--- 
incubator/tuscany/sandbox/kgoodson/roguewave-tests/src/test/java/com/roguewave/rwsf/sdo/TestHelper.java
 (original)
+++ 
incubator/tuscany/sandbox/kgoodson/roguewave-tests/src/test/java/com/roguewave/rwsf/sdo/TestHelper.java
 Mon Oct 30 11:24:06 2006
@@ -1,20 +1,19 @@
 package com.roguewave.rwsf.sdo;
 
-import com.roguewave.rwsf.sdo.xml.DataGraphImpl;
-import com.roguewave.rwsf.sdo.xml.XMLParser;
-import com.roguewave.rwsf.sdo.xml.XMLParserFactory;
-import com.roguewave.rwsf.sdo.xml.api.RWSFXMLDocument;
-import com.roguewave.rwsf.sdo.xml.api.XMLDataAccessService;
-import com.roguewave.rwsf.sdo.xml.api.XMLDataAccessServiceFactory;
-import commonj.sdo.DataGraph;
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.XMLDocument;
-
+import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import org.apache.tuscany.sdo.util.SDOUtil;
+
+import commonj.sdo.DataGraph;
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.XMLDocument;
+import commonj.sdo.helper.XMLHelper;
+
 /**
  * @author Andy Grove
  */
@@ -34,23 +33,26 @@
 
   public static DataGraph createDataGraph() {
 
-    try {
-      XMLParser p = XMLParserFactory.getParser();
-      RWSFXMLDocument doc = p.parse( "<document></document>" );
-      DataGraphImpl dataGraph = new DataGraphImpl(doc);
-//      dataGraph.deleteRoot();
-      return dataGraph;
-    }
-    catch (IOException e) {
-      throw new RuntimeException(e);
-    }
+//    try {
+//      XMLParser p = XMLParserFactory.getParser();
+//      RWSFXMLDocument doc = p.parse( "<document></document>" );
+//      DataGraphImpl dataGraph = new DataGraphImpl(doc);
+////      dataGraph.deleteRoot();
+//      return dataGraph;
+//    }
+//    catch (IOException e) {
+//      throw new RuntimeException(e);
+//    }
+         return SDOUtil.createDataGraph();
   }
 
   public static DataGraph loadDataGraph(File xmlFile) throws IOException {
-           XMLParser parser = XMLParserFactory.getParser();
-           RWSFXMLDocument doc = parser.parse(xmlFile);
-           return new DataGraphImpl(doc);
-         }
+//         XMLParser parser = XMLParserFactory.getParser();
+//         RWSFXMLDocument doc = parser.parse(xmlFile);
+//         return new DataGraphImpl(doc);
+           DataGraph graph = SDOUtil.loadDataGraph(new 
FileInputStream(xmlFile), null);
+           return graph;
+  }
 
 
   public static DataGraph createEmptyGraph() {
@@ -66,15 +68,15 @@
   }
 
   public static XMLDocument loadDocument(File file) throws IOException {
-    DataGraphImpl graph = (DataGraphImpl) loadDataGraph(file);
-    return graph.getXmlDocument();
+    XMLDocument doc = XMLHelper.INSTANCE.load(new FileInputStream(file));
+    return doc;
   }
 
-    public static DataGraph createProductCatalog() {
+    public static DataGraph createProductCatalog() throws IOException {
       // create a test document using the SDO API
       String xml = "<catalog></catalog>";
-      XMLDataAccessService das = XMLDataAccessServiceFactory.create();
-      DataGraph dataGraph = das.load( xml );
+      ByteArrayInputStream bis = new ByteArrayInputStream(xml.getBytes());
+      DataGraph dataGraph = SDOUtil.loadDataGraph(bis, null);
       DataObject root = dataGraph.getRootObject();
       DataObject catalog = root.getDataObject( "catalog" );
       for (int i = 0; i < 10; i++) {

Modified: 
incubator/tuscany/sandbox/kgoodson/roguewave-tests/src/test/java/com/roguewave/rwsf/sdo/XMLDataObjectTest.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/kgoodson/roguewave-tests/src/test/java/com/roguewave/rwsf/sdo/XMLDataObjectTest.java?view=diff&rev=469239&r1=469238&r2=469239
==============================================================================
--- 
incubator/tuscany/sandbox/kgoodson/roguewave-tests/src/test/java/com/roguewave/rwsf/sdo/XMLDataObjectTest.java
 (original)
+++ 
incubator/tuscany/sandbox/kgoodson/roguewave-tests/src/test/java/com/roguewave/rwsf/sdo/XMLDataObjectTest.java
 Mon Oct 30 11:24:06 2006
@@ -7,12 +7,12 @@
  ***************************************************************************/
 package com.roguewave.rwsf.sdo;
 
-import com.roguewave.rwsf.sdo.xml.api.XMLDataAccessService;
-import com.roguewave.rwsf.sdo.xml.api.RWSFDataGraph;
-import com.roguewave.rwsf.sdo.xml.api.XMLDataAccessServiceFactory;
-import com.roguewave.rwsf.sdo.xml.XMLDocumentImpl;
-import com.roguewave.rwsf.sdo.xml.TypeHelperImpl;
-import com.roguewave.rwsf.sdo.xml.SDOProperty;
+//import com.roguewave.rwsf.sdo.xml.api.XMLDataAccessService;
+//import com.roguewave.rwsf.sdo.xml.api.RWSFDataGraph;
+//import com.roguewave.rwsf.sdo.xml.api.XMLDataAccessServiceFactory;
+//import com.roguewave.rwsf.sdo.xml.XMLDocumentImpl;
+//import com.roguewave.rwsf.sdo.xml.TypeHelperImpl;
+//import com.roguewave.rwsf.sdo.xml.SDOProperty;
 import junit.framework.TestCase;
 import commonj.sdo.DataObject;
 import commonj.sdo.DataGraph;
@@ -41,7 +41,7 @@
    */
   public static final int DATA_TYPE_ITERATIONS = 10;
 
-  private XMLDataAccessService das;
+  // private XMLDataAccessService das;
   private String URI = "http://www.roguewave.com/uri/test/XMLDataObjectTest";;
   private DataObject simpleXmlDataGraphRootObject;
   private DataObject catalogDataGraphRootObject;
@@ -73,7 +73,7 @@
     catalogDataGraphRootObject = 
TestHelper.loadDataGraph(catalogXmlFile).getRootObject();
   }
 
-  private DataObject getTestDataObject(String strObject) {
+  private DataObject getTestDataObject(String strObject) throws IOException {
       DataGraph dataGraph = TestHelper.createProductCatalog();
       DataObject catalog = dataGraph.getRootObject().getDataObject( "catalog" 
);
 
@@ -94,7 +94,7 @@
             + "</xproduct>"
         + "</catalog>"
     );
-    XMLDocumentImpl docImpl = (XMLDocumentImpl)doc;
+//    XMLDocumentImpl docImpl = (XMLDocumentImpl)doc;
 
 
     assertNotNull( doc );
@@ -116,11 +116,11 @@
     assertEquals( "898", product1.getString( "pid" ) );
     assertEquals( "House", product1.getString( "xname.0/text.0" ) );
 
-    // ensure we default to caching on
-    assertEquals(((XMLDocumentImpl)doc).getOption("xpath-caching"), "true");
-    assertEquals(3, docImpl.getXPathCacheSize());
-    docImpl.clearXPathCache();
-    assertEquals(0, docImpl.getXPathCacheSize());
+//    // ensure we default to caching on
+//    assertEquals(((XMLDocumentImpl)doc).getOption("xpath-caching"), "true");
+//    assertEquals(3, docImpl.getXPathCacheSize());
+//    docImpl.clearXPathCache();
+//    assertEquals(0, docImpl.getXPathCacheSize());
   }
 
   public void testGetRootElementURI() throws Exception {
@@ -163,11 +163,11 @@
       + "</color>"
       + "</data>" );
 
-    XMLDocumentImpl docImpl = (XMLDocumentImpl)doc;
-    docImpl.clearXPathCache();
-    docImpl.setOption("xpath-caching", "false");
-    // turn off caching
-    assertEquals(docImpl.getOption("xpath-caching"), "false");
+//    XMLDocumentImpl docImpl = (XMLDocumentImpl)doc;
+//    docImpl.clearXPathCache();
+//    docImpl.setOption("xpath-caching", "false");
+//    // turn off caching
+//    assertEquals(docImpl.getOption("xpath-caching"), "false");
 
     assertEquals( "FF", doc.getRootObject().getString( "color.0/red.0/text.0" 
) );
     assertEquals( "DD", doc.getRootObject().getString( 
"color.0/green.0/text.0" ) );
@@ -181,8 +181,8 @@
     assertEquals( green, doc.getRootObject().getBytes( 
"color.0/green.0/text.0" )[0] );
     assertEquals( blue, doc.getRootObject().getBytes( "color.0/blue.0/text.0" 
)[0] );
 
-    // ensure that no cache is being built with caching turned off
-    assertEquals(0, docImpl.getXPathCacheSize());
+//    // ensure that no cache is being built with caching turned off
+//    assertEquals(0, docImpl.getXPathCacheSize());
   }
 
   public void testExtractStringFromDocument() throws Exception {
@@ -426,7 +426,7 @@
     assertEquals("two", rootObject.getString(name));
   }
 
-  public void testGetContainerAndGetContainmentProperty() {
+  public void testGetContainerAndGetContainmentProperty() throws IOException {
     DataGraph catalog = TestHelper.createProductCatalog();
     DataObject root = catalog.getRootObject();
 
@@ -475,7 +475,7 @@
     assertFalse( prop.isMany() );
   }
 
-  public void testIsSetAndUnset() {
+  public void testIsSetAndUnset() throws IOException {
 
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
@@ -531,7 +531,7 @@
 
   }
 
-  public void testGetDataGraph() {
+  public void testGetDataGraph()  throws IOException {
     DataGraph graph = TestHelper.createProductCatalog();
     DataObject dataObject = graph.getRootObject().getDataObject( 
"catalog/product.0" );
 
@@ -541,7 +541,7 @@
     assertTrue( graph == graph2 );
   }
 
-  public void testDelete() {
+  public void testDelete()  throws IOException {
     DataGraph graph = TestHelper.createProductCatalog();
 
     DataObject rootObject = graph.getRootObject();
@@ -562,7 +562,7 @@
 //     assertEquals( 9, graph.getRootObject().getList( 
"catalog/product").size() );
   }
 
-  public void _ignore_testDetach() {
+  public void _ignore_testDetach()  throws IOException {
     DataGraph graph = TestHelper.createProductCatalog();
 
     DataObject rootObject = graph.getRootObject();
@@ -623,29 +623,31 @@
     assertEquals( "Hello", compare.getString( "c" ) );
   }
 
-  public void testGetInstanceProperties() {
+  // TODO reintroduce
+//  public void testGetInstanceProperties() {
+//
+//    // look for open content property
+//    TypeHelperImpl th = (TypeHelperImpl)TypeHelper.INSTANCE;
+//    assertFalse(th.isOpenContentProperty("", "p1"));
+//    DataObject catalog = catalogDataGraphRootObject.getDataObject("catalog");
+//    catalog.createDataObject("p1");
+//    List listProps = catalog.getInstanceProperties();
+//    assertTrue(th.isOpenContentProperty("", "p1"));
+//  }
+
+  // TODO reintroduce
+//  public void testGetProperty() {
+//
+//    // look for open content property
+//    TypeHelperImpl th = (TypeHelperImpl)TypeHelper.INSTANCE;
+//    assertFalse(th.isOpenContentProperty("", "p2"));
+//    DataObject catalog = catalogDataGraphRootObject.getDataObject("catalog");
+//    catalog.createDataObject("p2");
+//    Property prop = catalog.getProperty("p2");
+//    assertTrue(th.isOpenContentProperty("", "p2"));
+//  }
 
-    // look for open content property
-    TypeHelperImpl th = (TypeHelperImpl)TypeHelper.INSTANCE;
-    assertFalse(th.isOpenContentProperty("", "p1"));
-    DataObject catalog = catalogDataGraphRootObject.getDataObject("catalog");
-    catalog.createDataObject("p1");
-    List listProps = catalog.getInstanceProperties();
-    assertTrue(th.isOpenContentProperty("", "p1"));
-  }
-
-  public void testGetProperty() {
-
-    // look for open content property
-    TypeHelperImpl th = (TypeHelperImpl)TypeHelper.INSTANCE;
-    assertFalse(th.isOpenContentProperty("", "p2"));
-    DataObject catalog = catalogDataGraphRootObject.getDataObject("catalog");
-    catalog.createDataObject("p2");
-    Property prop = catalog.getProperty("p2");
-    assertTrue(th.isOpenContentProperty("", "p2"));
-  }
-
-  public void testXPathGetRootObject() {
+  public void testXPathGetRootObject()  throws IOException {
 
     DataGraph dataGraph = TestHelper.createProductCatalog();
 
@@ -679,7 +681,7 @@
    * void setList(String path, List value);
    * method
    */
-  public void testSetListString() {
+  public void testSetListString()  throws IOException {
     //precondition
     //building list to pass in setList() as an argument
     DataGraph dataGraph = TestHelper.createProductCatalog();
@@ -712,7 +714,7 @@
    * void setDataObject(String path, DataObject value);
    * method
    */
-  public void _invalid_testSetDataObjectString() {
+  public void _invalid_testSetDataObjectString()  throws IOException {
     //precondition
     DataGraph dataGraph = TestHelper.createProductCatalog();
 
@@ -953,7 +955,7 @@
    * method
    */
 
-  public void _ignore_testEmptyIsSetIndex() {
+  public void _ignore_testEmptyIsSetIndex()  throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject().getDataObject( "catalog" );
 
@@ -972,7 +974,7 @@
    * method
    */
 
-  public void _ignore_testEmptyIsSetProperty() {
+  public void _ignore_testEmptyIsSetProperty()  throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject().getDataObject( "catalog" );
 
@@ -992,7 +994,7 @@
    * method
    */
 
-  public void _ignore_testUnsetIndex() {
+  public void _ignore_testUnsetIndex()  throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject().getDataObject( "catalog" );
 
@@ -1011,7 +1013,7 @@
    * method
    */
 
-  public void _ignore_testUnsetProperty() {
+  public void _ignore_testUnsetProperty()  throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject().getDataObject( "catalog" );
 
@@ -1030,7 +1032,7 @@
    * void setList(int propertyIndex, List value);
    * method
    */
-  public void testSetListIndex() {
+  public void testSetListIndex()  throws IOException {
     //precondition
     //building list to pass in setList() as an argument
     DataGraph dataGraph = TestHelper.createProductCatalog();
@@ -1069,7 +1071,7 @@
    * void setList(Property property, List value);
    * method
    */
-  public void testSetListProperty() {
+  public void testSetListProperty() throws IOException {
     //precondition
     //building list to pass in setList() as an argument
     DataGraph dataGraph = TestHelper.createProductCatalog();
@@ -1105,7 +1107,7 @@
    * void setDataObject(int propertyIndex, DataObject value);
    * method
    */
-  public void _invalid_testSetDataObjectIndex() {
+  public void _invalid_testSetDataObjectIndex() throws IOException {
     //precondition
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject().getDataObject( "catalog" );
@@ -1141,7 +1143,7 @@
    * void setDataObject(Property property, DataObject value);
    * method
    */
-  public void _invalid_testSetDataObjectProperty() {
+  public void _invalid_testSetDataObjectProperty() throws IOException {
     //precondition
     DataGraph dataGraph = TestHelper.createProductCatalog();
 
@@ -1175,7 +1177,7 @@
    * boolean getBoolean(String path);
    * method
    */
-  public void testGetBooleanString() {
+  public void testGetBooleanString() throws IOException {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
     //preconditions
@@ -1192,7 +1194,7 @@
    * boolean getBoolean(int propertyIndex);
    * method
    */
-  public void testGetBooleanIndex() {
+  public void testGetBooleanIndex() throws IOException {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
     //preconditions
@@ -1202,13 +1204,14 @@
     //getting property of newly created value
     Property property =product.getProperty("result1");
     assertNotNull(property);
-    SDOProperty p = (SDOProperty) property;
+    // SDOProperty p = (SDOProperty) property;
 
     //getting property index
     List listProperties=product.getInstanceProperties();
     Iterator iter = listProperties.iterator();
     while (iter.hasNext()) {
-      p = (SDOProperty) iter.next();
+      //  p = (SDOProperty) iter.next();
+       assertNotNull(iter.next());
     }
     int indexProperty=listProperties.indexOf(property);
 
@@ -1223,7 +1226,7 @@
    * boolean getBoolean(Property property);
    * method
    */
-  public void testGetBooleanProperty() {
+  public void testGetBooleanProperty() throws IOException {
   DataObject product = getTestDataObject("1");
     assertNotNull(product);
     //preconditions
@@ -1245,7 +1248,7 @@
    * byte getByte(String path);
    * method
    */
-  public void testGetByteString() {
+  public void testGetByteString() throws IOException {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
 
@@ -1260,7 +1263,7 @@
    * byte getByte(int propertyIndex);
    * method
    */
-  public void testGetByteIndex() {
+  public void testGetByteIndex() throws IOException {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
 
@@ -1282,7 +1285,7 @@
    * byte getByte(Property property);
    * method
    */
-  public void testGetByteProperty() {
+  public void testGetByteProperty() throws IOException {
     DataObject product = getTestDataObject("2");
     assertNotNull(product);
     //preconditions
@@ -1301,7 +1304,7 @@
    * char getChar(String path);
    * method
    */
-  public void testGetCharString() {
+  public void testGetCharString() throws IOException {
   DataObject product = getTestDataObject("1");
     assertNotNull(product);
     //actual test.
@@ -1315,7 +1318,7 @@
    * char getChar(int propertyIndex);
    * method
    */
-  public void testGetCharIndex() {
+  public void testGetCharIndex() throws IOException {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
     //preconditions
@@ -1337,7 +1340,7 @@
    * char getChar(Property property);
    * method
    */
-  public void testGetCharProperty() {
+  public void testGetCharProperty() throws IOException {
   DataObject product = getTestDataObject("2");
     assertNotNull(product);
     //preconditions
@@ -1355,7 +1358,7 @@
    * double getDouble(String path);
    * method
    */
-  public void testGetDoubleString() {
+  public void testGetDoubleString() throws IOException {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
 
@@ -1371,7 +1374,7 @@
    * double getDouble(int propertyIndex);
    * method
    */
-  public void testGetDoubleIndex() {
+  public void testGetDoubleIndex() throws IOException {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
     //preconditions
@@ -1394,7 +1397,7 @@
    * double getDouble(Property property);
    * method
    */
-  public void testGetDoubleProperty() {
+  public void testGetDoubleProperty() throws IOException {
     DataObject product = getTestDataObject("2");
     assertNotNull(product);
     //preconditions
@@ -1413,7 +1416,7 @@
    * float getFloat(String path);
    * method
    */
-  public void testGetFloatString() {
+  public void testGetFloatString() throws IOException {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
     //preconditions
@@ -1430,7 +1433,7 @@
    * float getFloat(int propertyIndex);
    * method
    */
-  public void testGetFloatIndex() {
+  public void testGetFloatIndex() throws IOException {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
     //preconditions
@@ -1455,7 +1458,7 @@
    * float getFloat(Property property);
    * method
    */
-  public void testGetFloatProperty() {
+  public void testGetFloatProperty() throws IOException {
   DataObject product = getTestDataObject("2");
     assertNotNull(product);
     //preconditions
@@ -1476,7 +1479,7 @@
    * int getInt(String path);
    * method
    */
-  public void testGetIntString() {
+  public void testGetIntString() throws IOException {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
 
@@ -1491,7 +1494,7 @@
    * int getInt(int propertyIndex);
    * method
    */
-  public void testGetIntIndex() {
+  public void testGetIntIndex() throws IOException {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
 
@@ -1513,7 +1516,7 @@
    * int getInt(Property property);
    * method
    */
-  public void testGetIntProperty() {
+  public void testGetIntProperty() throws IOException {
     DataObject product = getTestDataObject("2");
     assertNotNull(product);
     //preconditions
@@ -1531,7 +1534,7 @@
    * long getInt(String path);
    * method
    */
-  public void testGetLongString() {
+  public void testGetLongString() throws IOException {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
 
@@ -1546,7 +1549,7 @@
    * long getLong(int propertyIndex);
    * method
    */
-  public void testGetLongIndex() {
+  public void testGetLongIndex() throws IOException {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
 
@@ -1568,7 +1571,7 @@
    * long getLong(Property property);
    * method
    */
-  public void testGetLongProperty() {
+  public void testGetLongProperty() throws IOException {
     DataObject product = getTestDataObject("2");
     assertNotNull(product);
     //preconditions
@@ -1586,7 +1589,7 @@
    * short getShort(String path);
    * method
    */
-  public void testGetShortString() {
+  public void testGetShortString()throws IOException  {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
 
@@ -1601,7 +1604,7 @@
    * short getShort(int propertyIndex);
    * method
    */
-  public void testGetShortIndex() {
+  public void testGetShortIndex() throws IOException {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
 
@@ -1623,7 +1626,7 @@
    * short getShort(Property property);
    * method
    */
-  public void testGetShortProperty() {
+  public void testGetShortProperty() throws IOException {
   DataObject product = getTestDataObject("2");
     assertNotNull(product);
     //preconditions
@@ -1641,7 +1644,7 @@
    * bytes[] getBytes(String path);
    * method
    */
-  public void testGetBytesString() {
+  public void testGetBytesString() throws IOException {
   DataObject product = getTestDataObject("1");
     assertNotNull(product);
 
@@ -1663,7 +1666,7 @@
    * bytes[] getBytes(int propertyIndex);
    * method
    */
-  public void testGetBytesIndex() {
+  public void testGetBytesIndex() throws IOException {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
 
@@ -1692,7 +1695,7 @@
    * bytes[] getBytes(Property property);
    * method
    */
-  public void testGetBytesProperty() {
+  public void testGetBytesProperty() throws IOException {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
 
@@ -1717,7 +1720,7 @@
    * BigDecimal getBigDecimal(String path);
    * method
    */
-  public void testGetBigDecimalString() {
+  public void testGetBigDecimalString() throws IOException {
   DataObject product = getTestDataObject("1");
     assertNotNull(product);
 
@@ -1737,7 +1740,7 @@
    * BigDecimal getBigDecimal(int propertyIndex);
    * method
    */
-  public void testGetBigDecimalIndex() {
+  public void testGetBigDecimalIndex() throws IOException {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
 
@@ -1762,7 +1765,7 @@
    * BigDecimal getBigDecimal(Property property);
    * method
    */
-  public void testGetBigDecimalProperty() {
+  public void testGetBigDecimalProperty() throws IOException {
   DataObject product = getTestDataObject("2");
     assertNotNull(product);
     //preconditions
@@ -1784,7 +1787,7 @@
    * BigInteger getBigInteger(String path);
    * method
    */
-  public void testGetBigIntegerString() {
+  public void testGetBigIntegerString()throws IOException  {
   DataObject product = getTestDataObject("1");
     assertNotNull(product);
 
@@ -1804,7 +1807,7 @@
    * BigInteger getBigInteger(int propertyIndex);
    * method
    */
-  public void testGetBigIntegerIndex() {
+  public void testGetBigIntegerIndex()throws IOException  {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
 
@@ -1830,7 +1833,7 @@
    * BigInteger getBigInteger(Property property);
    * method
    */
-  public void testGetBigIntegerProperty() {
+  public void testGetBigIntegerProperty() throws IOException {
   DataObject product = getTestDataObject("2");
     assertNotNull(product);
     //preconditions
@@ -1853,7 +1856,7 @@
    * Date getDate(String path);
    * method
    */
-  public void testGetDateString() {
+  public void testGetDateString()throws IOException  {
   DataObject product = getTestDataObject("1");
   assertNotNull(product);
 
@@ -1872,7 +1875,7 @@
    * Date getDate(int propertyIndex);
    * method
    */
-  public void testGetDateIndex() {
+  public void testGetDateIndex() throws IOException {
     DataObject product = getTestDataObject("1");
     assertNotNull(product);
 
@@ -1897,7 +1900,7 @@
    * Date getDate(Property property);
    * method
    */
-  public void testGetDateProperty() {
+  public void testGetDateProperty() throws IOException {
   DataObject product = getTestDataObject("2");
   assertNotNull(product);
   //preconditions
@@ -1919,7 +1922,7 @@
    * void setBoolean(int propertyIndex, boolean value);
    * method
    */
-  public void testSetBooleanIndex() {
+  public void testSetBooleanIndex() throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject().getDataObject("catalog");
     DataObject product = catalog.getDataObject("product.1");
@@ -1950,7 +1953,7 @@
    * void setBoolean(Property property, boolean value);
    * method
    */
-  public void testSetBooleanProperty() {
+  public void testSetBooleanProperty() throws IOException {
   DataGraph dataGraph = TestHelper.createProductCatalog();
   DataObject catalog = dataGraph.getRootObject().getDataObject("catalog");
   DataObject product = catalog.getDataObject("product.1");
@@ -1976,7 +1979,7 @@
    * void setByte(String path, byte value);
    * method
    */
-  public void testSetByteString() {
+  public void testSetByteString()throws IOException  {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.1");
@@ -1996,7 +1999,7 @@
    * void setByte(int propertyIndex, byte value);
    * method
    */
-  public void testSetByteIndex() {
+  public void testSetByteIndex()throws IOException  {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.1");
@@ -2025,7 +2028,7 @@
    * void setByte(Property property, byte value);
    * method
    */
-  public void testSetByteProperty() {
+  public void testSetByteProperty()throws IOException  {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.2");
@@ -2048,7 +2051,7 @@
    * void setChar(String path, char value);
    * method
    */
-  public void testSetCharString() {
+  public void testSetCharString()throws IOException  {
   DataGraph dataGraph = TestHelper.createProductCatalog();
   DataObject catalog = dataGraph.getRootObject();
   DataObject product = catalog.getDataObject("catalog/product.1");
@@ -2068,7 +2071,7 @@
    * void setChar(int propertyIndex, char value);
    * method
    */
-  public void testSetCharIndex() {
+  public void testSetCharIndex()throws IOException  {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.1");
@@ -2095,7 +2098,7 @@
    * void setChar(Property property, char value);
    * method
    */
-  public void testSetCharProperty() {
+  public void testSetCharProperty()throws IOException  {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.2");
@@ -2120,7 +2123,7 @@
    * void setDouble(String path, double value);
    * method
    */
-  public void testSetDoubleString() {
+  public void testSetDoubleString() throws IOException {
   DataGraph dataGraph = TestHelper.createProductCatalog();
   DataObject catalog = dataGraph.getRootObject();
   DataObject product = catalog.getDataObject("catalog/product.1");
@@ -2141,7 +2144,7 @@
    * void setDouble(int propertyIndex, double value);
    * method
    */
-  public void testSetDoubleIndex() {
+  public void testSetDoubleIndex() throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.1");
@@ -2171,7 +2174,7 @@
    * void setDouble(Property property, double value);
    * method
    */
-  public void testSetDoubleProperty() {
+  public void testSetDoubleProperty()throws IOException  {
   DataGraph dataGraph = TestHelper.createProductCatalog();
   DataObject catalog = dataGraph.getRootObject();
   DataObject product = catalog.getDataObject("catalog/product.2");
@@ -2195,7 +2198,7 @@
    * void setFloat(int propertyIndex, float value);
    * method
    */
-  public void testSetFloatIndex() {
+  public void testSetFloatIndex() throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.1");
@@ -2224,7 +2227,7 @@
    * void setFloat(Property property, float value);
    * method
    */
-  public void testSetFloatProperty() {
+  public void testSetFloatProperty() throws IOException {
   DataGraph dataGraph = TestHelper.createProductCatalog();
   DataObject catalog = dataGraph.getRootObject();
   DataObject product = catalog.getDataObject("catalog/product.2");
@@ -2248,7 +2251,7 @@
    * void setInt(int propertyIndex, int value);
    * method
    */
-  public void testSetIntIndex() {
+  public void testSetIntIndex()throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.1");
@@ -2274,7 +2277,7 @@
    * void setInt(Property property, int value);
    * method
    */
-  public void testSetIntProperty() {
+  public void testSetIntProperty()throws IOException  {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.2");
@@ -2296,7 +2299,7 @@
    * void setLong(int propertyIndex, long value);
    * method
    */
-  public void testSetLongIndex() {
+  public void testSetLongIndex()throws IOException  {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.1");
@@ -2324,7 +2327,7 @@
    * void setLong(Property property, long value);
    * method
    */
-  public void testSetLongProperty() {
+  public void testSetLongProperty()throws IOException  {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.2");
@@ -2348,7 +2351,7 @@
    * void setShort(String path, short value);
    * method
    */
-  public void testSetShortString() {
+  public void testSetShortString() throws IOException {
   DataGraph dataGraph = TestHelper.createProductCatalog();
   DataObject catalog = dataGraph.getRootObject();
   DataObject product = catalog.getDataObject("catalog/product.1");
@@ -2368,7 +2371,7 @@
    * void setShort(int propertyIndex, short value);
    * method
    */
-  public void testSetShortIndex() {
+  public void testSetShortIndex()throws IOException  {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.1");
@@ -2397,7 +2400,7 @@
    * void setShort(Property property, short value);
    * method
    */
-  public void testSetShortProperty() {
+  public void testSetShortProperty()throws IOException  {
   DataGraph dataGraph = TestHelper.createProductCatalog();
   DataObject catalog = dataGraph.getRootObject();
   DataObject product = catalog.getDataObject("catalog/product.2");
@@ -2423,7 +2426,7 @@
    * void setBytes(String path, byte[] value);
    * method
    */
-  public void testSetBytesString() {
+  public void testSetBytesString()throws IOException  {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.1");
@@ -2448,7 +2451,7 @@
    * void setBytes(int propertyIndex, byte[] value);
    * method
    */
-  public void testSetBytesIndex() {
+  public void testSetBytesIndex() throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.1");
@@ -2482,7 +2485,7 @@
    * void setBytes(Property property, byte[] value);
    * method
    */
-  public void testSetBytesProperty() {
+  public void testSetBytesProperty() throws IOException  {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.1");
@@ -2512,7 +2515,7 @@
    * void setBigDecimal(String property, BigDecimal value);
    * method
    */
-  public void testSetBigDecimalString() {
+  public void testSetBigDecimalString() throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.1");
@@ -2534,7 +2537,7 @@
    * void setBigDecimal(int propertyIndex, BigDecimal value);
    * method
    */
-  public void testSetBigDecimalIndex() {
+  public void testSetBigDecimalIndex()throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.1");
@@ -2565,7 +2568,7 @@
    * void setBigDecimal(Property property, BigDecimal value);
    * method
    */
-  public void testSetBigDecimalProperty() {
+  public void testSetBigDecimalProperty()throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.2");
@@ -2594,7 +2597,7 @@
    * void setBigInteger(int propertyIndex, BigInteger value);
    * method
    */
-  public void testSetBigIntegerIndex() {
+  public void testSetBigIntegerIndex()throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.1");
@@ -2624,7 +2627,7 @@
    * void setBigInteger(Property property, BigInteger value);
    * method
    */
-  public void testSetBigIntegerProperty() {
+  public void testSetBigIntegerProperty()throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.2");
@@ -2651,7 +2654,7 @@
    * void setDate(int propertyIndex, Date value);
    * method
    */
-  public void testSetDateIndex() {
+  public void testSetDateIndex()throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject();
     DataObject product = catalog.getDataObject("catalog/product.1");
@@ -2683,7 +2686,7 @@
    * void setDate(Property property, Date value);
    * method
    */
-  public void testSetDateProperty() {
+  public void testSetDateProperty()throws IOException {
   DataGraph dataGraph = TestHelper.createProductCatalog();
   DataObject catalog = dataGraph.getRootObject();
   DataObject product = catalog.getDataObject("catalog/product.2");
@@ -2712,7 +2715,7 @@
    * DataObject createDataObject(int propertyIndex);
    * method
    */
-  public void testCreateDataObjectIndex() {
+  public void testCreateDataObjectIndex()throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject().getDataObject("catalog");
 
@@ -2739,7 +2742,7 @@
    * DataObject createDataObject(Property property);
    * method
    */
-  public void testCreateDataObjectProperty() {
+  public void testCreateDataObjectProperty()throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject().getDataObject("catalog");
 
@@ -2760,7 +2763,7 @@
    * DataObject createDataObject(String propertyName, String namespaceURI, 
String typeName);
    * method
    */
-  public void _invalid_testCreateDataObjectStringType() {
+  public void _invalid_testCreateDataObjectStringType()throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject().getDataObject("catalog");
 
@@ -2775,7 +2778,7 @@
     DataObject derivedType = DataFactory.INSTANCE.create( "commonj.sdo", 
"Type" );
     derivedType.set( "uri", "foo" );
     derivedType.set( "name", "derived" );
-    TypeHelperImpl th = (TypeHelperImpl)TypeHelper.INSTANCE;
+    TypeHelper th = TypeHelper.INSTANCE;
     List baseTypes = new ArrayList();
     baseTypes.add(th.getType("commonj.sdo", "DataObject"));
     derivedType.set( "baseType", baseTypes);
@@ -2807,24 +2810,25 @@
 
   }
 
+  // TODO reintroduce
   /**
    * DataObject class test.
    * Testing creation of open content property with createDataObject
    */
-  public void testCreateDataObjectOpenContentProperty() {
-    DataGraph dataGraph = TestHelper.createProductCatalog();
-    DataObject catalog = dataGraph.getRootObject().getDataObject("catalog");
-
-    TypeHelperImpl th = (TypeHelperImpl)TypeHelper.INSTANCE;
-    assertFalse(th.isOpenContentProperty("", "foo"));
-    DataObject obj = catalog.createDataObject("foo");
-    assertTrue(th.isOpenContentProperty("", "foo"));
-    
-    assertFalse(th.isOpenContentProperty("", "bar"));
-    DataObject obj2 = catalog.createDataObject("bar", "commonj.sdo", 
"DataObject");
-    assertTrue(th.isOpenContentProperty("", "bar"));
-    
-  }
+//  public void testCreateDataObjectOpenContentProperty() {
+//    DataGraph dataGraph = TestHelper.createProductCatalog();
+//    DataObject catalog = dataGraph.getRootObject().getDataObject("catalog");
+//
+//    TypeHelper th = (TypeHelper)TypeHelper.INSTANCE;
+//    assertFalse(th.isOpenContentProperty("", "foo"));
+//    DataObject obj = catalog.createDataObject("foo");
+//    assertTrue(th.isOpenContentProperty("", "foo"));
+//    
+//    assertFalse(th.isOpenContentProperty("", "bar"));
+//    DataObject obj2 = catalog.createDataObject("bar", "commonj.sdo", 
"DataObject");
+//    assertTrue(th.isOpenContentProperty("", "bar"));
+//    
+//  }
 
   /**
    * DataObject class test.
@@ -2832,7 +2836,7 @@
    * DataObject createDataObject(int propertyIndex, String namespaceURI, 
String typeName);
    * method
    */
-  public void testCreateDataObjectIndexType() {
+  public void testCreateDataObjectIndexType()throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject().getDataObject("catalog");
 
@@ -2864,7 +2868,7 @@
    * DataObject createDataObject(Property property, Type type);
    * method
    */
-  public void testCreateDataObjectPropertyType() {
+  public void testCreateDataObjectPropertyType()throws IOException {
     DataGraph dataGraph = TestHelper.createProductCatalog();
     DataObject catalog = dataGraph.getRootObject().getDataObject( "catalog" );
 
@@ -2929,31 +2933,32 @@
     assertTrue( xml.indexOf( "attr99=\"99\"" ) > 0 );
   }
 
-  public void testDeleteGraph() {
-    DataGraph dg = TestHelper.createProductCatalog();
-    ((RWSFDataGraph)dg).delete();
-    try {
-      dg.getRootObject();
-      fail( "should not work" );
-    }
-    catch (IllegalStateException ise) {
-      // expected
-    }
-    try {
-      dg.getType( "commonj.sdo", "String" );
-      fail( "should not work" );
-    }
-    catch (IllegalStateException ise) {
-      // expected
-    }
-    try {
-      dg.createRootObject( "commonj.sdo", "DataObject" );
-      fail( "should not work" );
-    }
-    catch (IllegalStateException ise) {
-      // expected
-    }
-  }
+  // TODO reintroduce
+//  public void testDeleteGraph() {
+//    DataGraph dg = TestHelper.createProductCatalog();
+//    ((RWSFDataGraph)dg).delete();
+//    try {
+//      dg.getRootObject();
+//      fail( "should not work" );
+//    }
+//    catch (IllegalStateException ise) {
+//      // expected
+//    }
+//    try {
+//      dg.getType( "commonj.sdo", "String" );
+//      fail( "should not work" );
+//    }
+//    catch (IllegalStateException ise) {
+//      // expected
+//    }
+//    try {
+//      dg.createRootObject( "commonj.sdo", "DataObject" );
+//      fail( "should not work" );
+//    }
+//    catch (IllegalStateException ise) {
+//      // expected
+//    }
+//  }
 
   public void testSerialize() throws IOException {
     String x1 = "<root><elem>Hello</elem></root>";



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to