You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by fr...@apache.org on 2006/03/02 17:18:48 UTC

svn commit: r382435 - in /incubator/tuscany/java/sdo/impl/src: main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java test/resources/datatype.xsd

Author: frankb
Date: Thu Mar  2 08:18:47 2006
New Revision: 382435

URL: http://svn.apache.org/viewcvs?rev=382435&view=rev
Log:
Fix for TUSCANY-48.

Added:
    incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java
    incubator/tuscany/java/sdo/impl/src/test/resources/datatype.xsd
Modified:
    incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java?rev=382435&r1=382434&r2=382435&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java Thu Mar  2 08:18:47 2006
@@ -19,12 +19,12 @@
 import java.util.Collections;
 import java.util.List;
 
-//import org.apache.tuscany.sdo.SDOPackage;
-
 import org.apache.tuscany.sdo.util.DataObjectUtil;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EDataTypeImpl;
+import org.eclipse.emf.ecore.util.ExtendedMetaData;
 
 import commonj.sdo.Property;
 import commonj.sdo.Type;
@@ -143,7 +143,15 @@
    */
   public List getBaseTypes()
   {
-    return Collections.EMPTY_LIST;
+    EDataType dataType = ExtendedMetaData.INSTANCE.getBaseType(this);
+    if (dataType == null)
+    {
+      return Collections.EMPTY_LIST;
+    }
+    else
+    {
+      return Collections.singletonList(dataType);
+    }
   }
 
   /**

Added: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java?rev=382435&view=auto
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java (added)
+++ incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java Thu Mar  2 08:18:47 2006
@@ -0,0 +1,65 @@
+/**
+ *
+ *  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 org.apache.tuscany.sdo.test;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import commonj.sdo.Type;
+import commonj.sdo.helper.TypeHelper;
+import commonj.sdo.helper.XSDHelper;
+
+
+public class DataTypeBaseTypeTestCase extends TestCase {
+    private final String TEST_MODEL = "/datatype.xsd";
+    private final String TEST_NAMESPACE = "http://www.example.com/datatype";
+
+    public void testSimpleSDOType() throws IOException
+    {
+      Type type = TypeHelper.INSTANCE.getType(TEST_NAMESPACE, "SimpleSDOType");
+      List baseTypes = type.getBaseTypes();
+      assertTrue(baseTypes.size() == 1);
+    }
+    
+    public void testSimpleSDOTypeInstanceClass() throws IOException
+    {
+      Type type = TypeHelper.INSTANCE.getType(TEST_NAMESPACE, "SimpleSDOTypeInstanceClass");
+      List baseTypes = type.getBaseTypes();
+      assertTrue(baseTypes.size() == 0);
+    }
+    
+    public void testSimpleSDOTypeExtendedInstanceClass() throws IOException
+    {
+      Type type = TypeHelper.INSTANCE.getType(TEST_NAMESPACE, "SimpleSDOTypeExtendedInstanceClass");
+      List baseTypes = type.getBaseTypes();
+      assertTrue(baseTypes.size() == 1);
+    }
+
+    public void setUp() throws Exception
+    {
+      URL url = getClass().getResource(TEST_MODEL);
+      InputStream inputStream = url.openStream();
+      XSDHelper.INSTANCE.define(inputStream, url.toString());
+      inputStream.close();   
+    }
+
+}

Added: incubator/tuscany/java/sdo/impl/src/test/resources/datatype.xsd
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/test/resources/datatype.xsd?rev=382435&view=auto
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/resources/datatype.xsd (added)
+++ incubator/tuscany/java/sdo/impl/src/test/resources/datatype.xsd Thu Mar  2 08:18:47 2006
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:datatype="http://www.example.com/datatype" xmlns:sdoJava="commonj.sdo/java" targetNamespace="http://www.example.com/datatype"> 
+
+	<xsd:simpleType name="SimpleSDOType">
+		<xsd:restriction base="xsd:string"/>
+	</xsd:simpleType>
+	
+	<xsd:simpleType name="SimpleSDOTypeInstanceClass" sdoJava:instanceClass="java.lang.Integer">
+		<xsd:restriction base="xsd:string"/>
+	</xsd:simpleType>
+	
+	<xsd:simpleType name="SimpleSDOTypeExtendedInstanceClass" sdoJava:extendedInstanceClass="java.lang.String">
+		<xsd:restriction base="xsd:string"/>
+	</xsd:simpleType>
+
+</xsd:schema>