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/22 18:04:28 UTC

svn commit: r498701 - in /incubator/tuscany/java/sdo/impl/src: main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java

Author: kelvingoodson
Date: Mon Jan 22 09:04:28 2007
New Revision: 498701

URL: http://svn.apache.org/viewvc?view=rev&rev=498701
Log:
TUSCANY-1055 applied patch + a test case.  Note that this JIRA has raised the issue contained in TUSCANY-1074

Modified:
    incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java
    incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java?view=diff&rev=498701&r1=498700&r2=498701
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java Mon Jan 22 09:04:28 2007
@@ -55,7 +55,7 @@
   
   public DataObject create(Type type)
   {
-    if (type instanceof EClass)
+    if ((type instanceof EClass) && !type.isAbstract())
     {
       EClass eClass = (EClass)type;
       return (DataObject)EcoreUtil.create(eClass);

Modified: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java?view=diff&rev=498701&r1=498700&r2=498701
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java Mon Jan 22 09:04:28 2007
@@ -65,6 +65,16 @@
         testObject = rootObject.getDataObject("personElement");
         System.out.println("personElement dataobject: " + testObject);
     }
+    
+    public void testAbstractTypeFails() {
+    	try {
+    		DataObject abstractObj = dataFactory.create("commonj.sdo","DataObject");
+    		assertTrue("Should not succeed", false);
+    	}
+    	catch ( IllegalArgumentException e) {
+			// expected result
+		}
+    }
 
     protected void setUp() throws Exception {
         HelperContext hc = SDOUtil.createHelperContext();



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