You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ke...@apache.org on 2007/01/08 14:34:59 UTC

svn commit: r494066 [4/6] - in /incubator/tuscany/java/cts: ./ sdo2.1/ sdo2.1/src/ sdo2.1/src/main/ sdo2.1/src/main/java/ sdo2.1/src/main/java/test/ sdo2.1/src/main/java/test/sdo21/ sdo2.1/src/main/java/test/sdo21/framework/ sdo2.1/src/main/java/test/s...

Added: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/scenarios/XSDScenario.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/scenarios/XSDScenario.java?view=auto&rev=494066
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/scenarios/XSDScenario.java (added)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/scenarios/XSDScenario.java Mon Jan  8 05:34:57 2007
@@ -0,0 +1,135 @@
+package test.sdo21.scenarios;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Vector;
+
+import test.sdo21.framework.ExpectedConditionError;
+
+//import org.apache.tuscany.sdo.util.SDOUtil;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.Type;
+import commonj.sdo.helper.DataFactory;
+import commonj.sdo.helper.TypeHelper;
+import commonj.sdo.helper.XSDHelper;
+
+public class XSDScenario 
+{
+    private static final String TEST_MODEL = "/simple.xsd";
+    private static  URL modelURL;
+
+    /**
+     * runTests calls each of the other methods within the XSDScenario class
+     * @throws Exception
+     */
+    public static void runTests() throws Exception
+    {
+    	modelURL = XSDScenario.class.getResource(TEST_MODEL);
+    	testDefineWithLocation();
+    	testDefineWithNoLocation();
+    	testDuplicateDefineWithLocation();
+    	testXSDGeneration_DynamicSDOType();
+    }
+    
+    /**
+     * testDefineWithLocation verifies the performance of XSDHelper.define() when a SchemaLocation is provided
+     * @throws IOException
+     */
+    public static void testDefineWithLocation() throws IOException 
+    {
+        //XSDHelper xsdHelper = SDOUtil.createXSDHelper(SDOUtil.createTypeHelper());
+    	XSDHelper xsdHelper = XSDHelper.INSTANCE;
+        List types = xsdHelper.define(modelURL.openStream(), modelURL.toString());
+        if (2 != types.size())
+        	throw new ExpectedConditionError("XSDHelper.define() did not create the expected number of Types", 
+        			Integer.valueOf(2), Integer.valueOf(types.size()));
+    }
+
+    /**
+     * testDefineWithNoLocation verifies the performance of XSDHelper.define() when a SchemaLocation is not provided
+     */
+    public static void testDefineWithNoLocation() 
+    {
+        //XSDHelper xsdHelper = SDOUtil.createXSDHelper(SDOUtil.createTypeHelper());
+        XSDHelper xsdHelper = XSDHelper.INSTANCE;
+        List types = xsdHelper.define(XSDScenario.class.getResourceAsStream(TEST_MODEL), null);
+        if (2 != types.size())
+        	throw new ExpectedConditionError("XSDHelper.define() did not create the expected number of Types", 
+        			Integer.valueOf(2), Integer.valueOf(types.size()));
+    }
+
+    /**
+     * testDuplicateDefineWithLocation verifies that duplicate Types are not redefined
+     * @throws IOException
+     */
+    public static void testDuplicateDefineWithLocation() throws IOException 
+    {
+        //XSDHelper xsdHelper = SDOUtil.createXSDHelper(SDOUtil.createTypeHelper());
+        XSDHelper xsdHelper = XSDHelper.INSTANCE;
+        List types = xsdHelper.define(modelURL.openStream(), modelURL.toString());
+        if (2 != types.size())
+        	throw new ExpectedConditionError("XSDHelper.define() did not create the expected number of Types", 
+        			Integer.valueOf(2), Integer.valueOf(types.size()));
+
+        List types2 = xsdHelper.define(modelURL.openStream(), modelURL.toString());
+        if (0 != types2.size())
+        	throw new ExpectedConditionError("XSDHelper.define() did not create the expected number of Types", 
+        			Integer.valueOf(0), Integer.valueOf(types2.size()));
+    }
+    
+    /**
+     * testXSDGeneration_DynamicSDOType verifies the performance of XSDHelper.generate  
+     * for dynamic SDOs with no XSD model
+     * @throws IOException
+     */
+    public static void testXSDGeneration_DynamicSDOType() throws IOException 
+    {
+    	boolean exceptionCaught = false;
+    	
+        //test for dynamic SDOs that have no XSD model.  Here the testcase succeeds only if the 
+        //xsd is generated by XSDHelper in which case xsd must not be null
+    	//XSDHelper xsdHelper = SDOUtil.createXSDHelper(SDOUtil.createTypeHelper());
+    	XSDHelper xsdHelper = XSDHelper.INSTANCE;
+        DataObject quoteType = DataFactory.INSTANCE.create("commonj.sdo", "Type");
+        quoteType.set("uri", "http://www.example.com/dynamic");
+        quoteType.set("name", "DynamicQuote");
+        
+        DataObject aProperty = quoteType.createDataObject("property");
+        aProperty.set("name", "symbol");
+        aProperty.set("type", TypeHelper.INSTANCE.getType("commonj.sdo", "String"));
+        
+        aProperty = quoteType.createDataObject("property");
+        aProperty.set("name", "price");
+        aProperty.set("type", TypeHelper.INSTANCE.getType("commonj.sdo", "Decimal"));
+        
+        aProperty = quoteType.createDataObject("property");
+        aProperty.set("name", "volume");
+        aProperty.set("type", TypeHelper.INSTANCE.getType("commonj.sdo", "Double"));
+        
+        TypeHelper.INSTANCE.define(quoteType);
+        
+        Type dynamicQuoteType = 
+            TypeHelper.INSTANCE.getType("http://www.example.com/dynamic", "DynamicQuote");
+        
+        Vector types = new Vector();
+        types.add(dynamicQuoteType);
+        String xsd = null;
+        
+        try
+        {
+            xsd = xsdHelper.generate(types);
+            //System.out.println(xsd);
+        }
+        catch ( IllegalArgumentException e )
+        {
+        	exceptionCaught = true;
+        }
+        if (exceptionCaught || xsd == null)
+        	throw new ExpectedConditionError("XSDHelper.generate() did not complete as expected for dynamic SDOs with no XSD model.");       
+    }
+    
+        
+}

Propchange: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/scenarios/XSDScenario.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/scenarios/XSDScenario.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObjectTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObjectTest.java?view=auto&rev=494066
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObjectTest.java (added)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObjectTest.java Mon Jan  8 05:34:57 2007
@@ -0,0 +1,89 @@
+/**
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package test.sdo21.tests.api;
+
+import commonj.sdo.DataObject;
+import junit.framework.TestCase;
+import test.sdo21.CTSSuite;
+import test.sdo21.framework.TestHelper;
+
+
+public class DataObjectTest extends TestCase
+{
+    private TestHelper testHelper;
+
+    public DataObjectTest(String string) throws Exception {
+        super(string);
+
+        testHelper = CTSSuite.getTestHelper();
+    }
+
+    /**
+     * This test checks that getInstanceProperties returns all properties defined by the
+     * DataObject's type, regardless of whether they are set or not. It also checks that
+     * open content properties only appear in getInstanceProperties if they are set.
+     *
+     * Related sections in the specification are 3.1.1 / 3.1.9 / 3.1.11
+     *
+     * Related JIRA SDO-179
+     *
+     * @throws Exception
+     */
+    public void testGetInstancePropertiesSize() throws Exception {
+
+        // define a type with two properties
+        String typeName = testHelper.createUniqueName();
+        DataObject typeDef = testHelper.createTypeDef( "", typeName, true );
+        testHelper.createPropertyDef( typeDef, "p1", "commonj.sdo#String", false, false );
+        testHelper.createPropertyDef( typeDef, "p2", "commonj.sdo#String", false, false );
+        testHelper.getTypeHelper().define( typeDef );
+
+        // create a DataObject that uses this type
+        DataObject dobj = testHelper.getDataFactory().create( "", typeName );
+
+        // getInstanceProperties() should return p1, p2 even though they are not set
+        //System.out.println(dobj.getInstanceProperties());
+        assertEquals( 2, dobj.getInstanceProperties().size() );
+
+        dobj.set( "p1", "foo" );
+
+        // getInstanceProperties() should still return p1, p2
+        assertEquals( 2, dobj.getInstanceProperties().size() );
+
+        dobj.unset( "p1" );
+
+        // getInstanceProperties() should still return p1, p2
+        assertEquals( 2, dobj.getInstanceProperties().size() );
+
+        // set an on-demand open content property
+        dobj.set( "p3", "foo" );
+
+        // getInstanceProperties() should now return p1, p2, p3
+        assertEquals( 3, dobj.getInstanceProperties().size() );
+
+        // unset the on-demand property
+        dobj.unset( "p3" );
+
+        // the spec says that open content properties only appear in getInstancePropeties if
+        // they are set so we expect the list to be smaller now
+        assertEquals( 2, dobj.getInstanceProperties().size() );
+    }
+
+}

Propchange: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObjectTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObjectTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/scenarios/DynamicTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/scenarios/DynamicTestCase.java?view=auto&rev=494066
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/scenarios/DynamicTestCase.java (added)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/scenarios/DynamicTestCase.java Mon Jan  8 05:34:57 2007
@@ -0,0 +1,257 @@
+/**
+ *
+ *  Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package test.sdo21.tests.scenarios;
+
+import java.io.IOException;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.DataFactory;
+import test.sdo21.framework.ExpectedConditionError;
+import test.sdo21.framework.ExpectedExceptionError;
+import test.sdo21.framework.ReturnValueError;
+import test.sdo21.scenarios.*;
+
+public class DynamicTestCase extends TestCase {
+	private DataObject testDO;
+
+	/**
+	 * Test the SDO scenarios using a dynamically created model and data. Each
+	 * testCase calls a test case from the ScenarioLibrary.
+	 * 
+	 * @throws ClassNotFoundException
+	 * @throws EqualityConditionException
+	 * @throws IOException
+	 * @throws EqualityConditionException
+	 */
+	public void testSerializeDeserialize() throws IOException,
+			ExpectedConditionError, ClassNotFoundException {
+		try {
+			XMLScenario.testSerializeDeserialize(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testCopyEqualityShallow() {
+		try {
+			CopyEqualityScenario.testCopyEqualityShallow(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testCopyEqualityDeep() {
+		try {
+			CopyEqualityScenario.testCopyEqualityDeep(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testTypeAPI() {
+		try {
+			TypeScenario.testTypeAPI(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testContainmentIntegrity() {
+		try {
+			ContainmentScenario.testContainmentIntegrity(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testContainmentCycle() {
+		try {
+			ContainmentScenario.testContainmentCycle(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testPropertyAPI() throws Exception {
+		try {
+			PropertyScenario.testPropertyAPI(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	/*public void testDataGraphAPI() throws Exception {
+		try {
+			DataGraphScenario.testDataGraphAPI(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}*/
+/*
+	public void testChangeSummaryAPI() throws Exception {
+		try {
+			ScenarioLibrary.testChangeSummaryAPI(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+*/
+	public void testDataFactoryAPI() {
+		try {
+			DataFactoryScenario.testDataFactoryAPI(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testActiveUpdating() {
+		try {
+			ActiveUpdatingScenario.testActiveUpdating(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testRecursiveDeletion() {
+		try {
+			DeleteScenario.testRecursiveDeletion(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testTypeHelperAPI() {
+		try {
+			TypeHelperScenario.testTypeHelperAPI(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testSequenceAPI() {
+		try {
+			SequenceScenario.testSequenceAPI(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testDateConversion() throws Exception {
+		try {
+			DateConversionScenario.testDateConversions();
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testTypeConversion() throws Exception {
+		try {
+			TypeConversionScenario.testTypeConversions(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	protected void setUp() {
+		TypeCreateUtility.createDynamically();
+		this.testDO = DataFactory.INSTANCE.create(
+				FVTUtil.TEST_NAMESPACE, "APITest");
+		FVTUtil.populateFields(this.testDO);
+	}
+}

Propchange: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/scenarios/DynamicTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/scenarios/DynamicTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/scenarios/DynamicWithStaticResourceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/scenarios/DynamicWithStaticResourceTestCase.java?view=auto&rev=494066
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/scenarios/DynamicWithStaticResourceTestCase.java (added)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/scenarios/DynamicWithStaticResourceTestCase.java Mon Jan  8 05:34:57 2007
@@ -0,0 +1,281 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package test.sdo21.tests.scenarios;
+
+import java.io.IOException;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+import test.sdo21.framework.ExpectedConditionError;
+import test.sdo21.framework.ExpectedExceptionError;
+import test.sdo21.framework.ReturnValueError;
+import test.sdo21.scenarios.ActiveUpdatingScenario;
+import test.sdo21.scenarios.ContainmentScenario;
+import test.sdo21.scenarios.CopyEqualityScenario;
+import test.sdo21.scenarios.DataFactoryScenario;
+import test.sdo21.scenarios.DataGraphScenario;
+import test.sdo21.scenarios.DateConversionScenario;
+import test.sdo21.scenarios.DeleteScenario;
+import test.sdo21.scenarios.FVTUtil;
+import test.sdo21.scenarios.PropertyScenario;
+import test.sdo21.scenarios.SequenceScenario;
+import test.sdo21.scenarios.TypeConversionScenario;
+import test.sdo21.scenarios.TypeCreateUtility;
+import test.sdo21.scenarios.TypeHelperScenario;
+import test.sdo21.scenarios.TypeScenario;
+import test.sdo21.scenarios.XMLScenario;
+import test.sdo21.scenarios.XSDScenario;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.DataFactory;
+
+public class DynamicWithStaticResourceTestCase extends TestCase 
+{
+	private DataObject testDO;
+
+	/**
+	 * Test the SDO scenarios using a dynamically created model and data. Each
+	 * testCase calls a test case from the ScenarioLibrary.
+	 * 
+	 * @throws EqualityConditionException
+	 */
+	public void testSerializeDeserialize() throws IOException,
+			ExpectedConditionError, ClassNotFoundException {
+		try {
+			XMLScenario.testSerializeDeserialize(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testCopyEqualityShallow() {
+		try {
+			CopyEqualityScenario.testCopyEqualityShallow(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testCopyEqualityDeep() {
+		try {
+			CopyEqualityScenario.testCopyEqualityDeep(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testTypeAPI() {
+		try {
+			TypeScenario.testTypeAPI(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testContainmentIntegrity() {
+		try {
+			ContainmentScenario.testContainmentIntegrity(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testContainmentCycle() {
+		try {
+			ContainmentScenario.testContainmentCycle(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testPropertyAPI() throws Exception {
+		try {
+			PropertyScenario.testPropertyAPI(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	/*public void testDataGraphAPI() throws Exception {
+		try {
+			DataGraphScenario.testDataGraphAPI(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}*/
+
+	/*
+	 * public void testChangeSummaryAPI() throws Exception { try {
+	 * ScenarioLibrary.testChangeSummaryAPI(this.testDO); } catch (Error e) { if
+	 * (e instanceof ExpectedConditionError || e instanceof
+	 * ExpectedExceptionError || e instanceof ReturnValueError) throw new
+	 * AssertionFailedError(e.getMessage()); else throw e; } }
+	 */
+	public void testDataFactoryAPI() {
+		try {
+			DataFactoryScenario.testDataFactoryAPI(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testActiveUpdating() {
+		try {
+			ActiveUpdatingScenario.testActiveUpdating(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testRecursiveDeletion() {
+		try {
+			DeleteScenario.testRecursiveDeletion(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testTypeHelperAPI() {
+		try {
+			TypeHelperScenario.testTypeHelperAPI(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testSequenceAPI() {
+		try {
+			SequenceScenario.testSequenceAPI(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testDateConversion() throws Exception {
+		try {
+			DateConversionScenario.testDateConversions();
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	public void testTypeConversion() throws Exception {
+		try {
+			TypeConversionScenario.testTypeConversions(this.testDO);
+		} catch (Error e) {
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+	
+	public void testXSDScenarios() throws Exception 
+	{
+		try 
+		{
+			XSDScenario.runTests();
+		} catch (Error e) 
+		{
+			if (e instanceof ExpectedConditionError
+					|| e instanceof ExpectedExceptionError
+					|| e instanceof ReturnValueError)
+				throw new AssertionFailedError(e.getMessage());
+			else
+				throw e;
+		}
+	}
+
+	protected void setUp() throws Exception {
+		TypeCreateUtility.createDynamicWithStaticResources();
+		this.testDO = DataFactory.INSTANCE.create(FVTUtil.TEST_NAMESPACE,
+				FVTUtil.TEST_TYPE);
+		FVTUtil.populateFields(this.testDO);
+	}
+}

Propchange: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/scenarios/DynamicWithStaticResourceTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/scenarios/DynamicWithStaticResourceTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org