Solved nullability in case of single table and multiple inheritance

3 files changed, 40 insertions, 7 deletions

diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/RentalMapAsClassAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/RentalMapAsClassAction.java
index 9040aac51..076b77a05 100644
--- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/RentalMapAsClassAction.java
+++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/RentalMapAsClassAction.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: RentalMapAsClassAction.java,v 1.1 2007/03/29 15:00:32 mtaal Exp $
+ * $Id: RentalMapAsClassAction.java,v 1.2 2007/03/29 22:13:54 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.test.emf.sample;
@@ -24,6 +24,7 @@ import java.util.Properties;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.teneo.PersistenceOptions;
 import org.eclipse.emf.teneo.rental.Currency;
+import org.eclipse.emf.teneo.rental.Manufacturer;
 import org.eclipse.emf.teneo.rental.RentalBicycle;
 import org.eclipse.emf.teneo.rental.RentalBicycleType;
 import org.eclipse.emf.teneo.rental.RentalCar;
@@ -40,7 +41,7 @@ import org.eclipse.emf.teneo.test.stores.TestStore;
  * Tests mapping an eclass as a class.
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  */
 public class RentalMapAsClassAction extends AbstractTestAction {
 	/**
@@ -75,6 +76,9 @@ public class RentalMapAsClassAction extends AbstractTestAction {
 			rcar.setSize(RentalCarSize.FAMILY);
 			rb.setDescription("bicycle");
 			rb.setType(RentalBicycleType.MOUNTAIN_BIKE);
+			Manufacturer m = rf.createManufacturer();
+			m.setCode("gazelle");
+			rb.setManufacturer(m);
 			rcontract.getRentalUnits().add(rcar);
 			rcontract.getRentalUnits().add(rb);
 			rcontract.setCost(4.5f);
@@ -140,7 +144,7 @@ public class RentalMapAsClassAction extends AbstractTestAction {
 		try {
 			Resource res = store.getResource();
 			res.load(Collections.EMPTY_MAP);
-			assertEquals(4, res.getContents().size());
+			assertEquals(5, res.getContents().size());
 		} catch (Exception e) {
 			throw new StoreTestException(e.getMessage(), e);
 		}
diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/RentalResourceReferenceAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/RentalResourceReferenceAction.java
index 854a0a84d..c2b6024c1 100644
--- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/RentalResourceReferenceAction.java
+++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/RentalResourceReferenceAction.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: RentalResourceReferenceAction.java,v 1.1 2007/03/29 15:00:32 mtaal Exp $
+ * $Id: RentalResourceReferenceAction.java,v 1.2 2007/03/29 22:13:54 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.test.emf.sample;
@@ -29,6 +29,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
 import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
+import org.eclipse.emf.teneo.rental.Manufacturer;
 import org.eclipse.emf.teneo.rental.RentalBicycle;
 import org.eclipse.emf.teneo.rental.RentalBicycleType;
 import org.eclipse.emf.teneo.rental.RentalCar;
@@ -45,7 +46,7 @@ import org.eclipse.emf.teneo.test.stores.TestStore;
  * Tests references from an xml to a db resource.
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  */
 public class RentalResourceReferenceAction extends AbstractTestAction {
 	/**
@@ -70,6 +71,9 @@ public class RentalResourceReferenceAction extends AbstractTestAction {
 				rcar.setSize(RentalCarSize.FAMILY);
 				rb.setDescription("bicycle");
 				rb.setType(RentalBicycleType.MOUNTAIN_BIKE);
+				Manufacturer m = rf.createManufacturer();
+				m.setCode("gazelle");
+				rb.setManufacturer(m);
 				rcontract.getRentalUnits().add(rcar);
 				rcontract.getRentalUnits().add(rb);
 				rcontract.setCost(4.5f);
diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/issues/MultipleInheritanceAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/issues/MultipleInheritanceAction.java
index b02077a1f..1635ffe27 100644
--- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/issues/MultipleInheritanceAction.java
+++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/issues/MultipleInheritanceAction.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: MultipleInheritanceAction.java,v 1.5 2007/03/24 11:48:07 mtaal Exp $
+ * $Id: MultipleInheritanceAction.java,v 1.6 2007/03/29 22:13:54 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.test.issues;
@@ -27,6 +27,8 @@ import org.eclipse.emf.teneo.test.stores.TestStore;
 import testinheritance.Child;
 import testinheritance.Child2;
 import testinheritance.NameValuePair;
+import testinheritance.ParentOne;
+import testinheritance.SomeReference;
 import testinheritance.SomeResource;
 import testinheritance.TestinheritanceFactory;
 import testinheritance.TestinheritancePackage;
@@ -35,7 +37,7 @@ import testinheritance.TestinheritancePackage;
  * Tests multiple inheritance.
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
  */
 public class MultipleInheritanceAction extends AbstractTestAction {
 	/**
@@ -95,18 +97,33 @@ public class MultipleInheritanceAction extends AbstractTestAction {
 			throw new StoreTestException("IOException", e);
 		}
 		
+		{
+			store.beginTransaction();
+			ParentOne po = TestinheritanceFactory.eINSTANCE.createParentOne();
+			po.setAnotherProperty(5);
+			store.store(po);
+			store.commitTransaction();
+		}
+		
 		// now test mappedsuperclasses
 		{
 			store.beginTransaction();
 			final Child child = TestinheritanceFactory.eINSTANCE.createChild();
+			final SomeReference sr = TestinheritanceFactory.eINSTANCE.createSomeReference();
+			sr.setName("sr");
+			child.setSomeReference(sr);
 			child.setAge(10);
 			child.setName("myName");
 			child.setTestId(4); // this is the key!
 			store.store(child);
 		}
+		
 		try {
 			store.beginTransaction();
 			final Child child = TestinheritanceFactory.eINSTANCE.createChild();
+			final SomeReference sr = TestinheritanceFactory.eINSTANCE.createSomeReference();
+			sr.setName("sr1");
+			child.setSomeReference(sr);
 			child.setAge(11);
 			child.setName("myName2");
 			child.setTestId(4); // this is the key!
@@ -121,6 +138,10 @@ public class MultipleInheritanceAction extends AbstractTestAction {
 		{
 			store.beginTransaction();
 			final Child2 child = TestinheritanceFactory.eINSTANCE.createChild2();
+			final SomeReference sr = TestinheritanceFactory.eINSTANCE.createSomeReference();
+			sr.setName("sr3");
+			store.store(sr);
+			child.setSomeReference(sr);
 			child.setAge(10);
 			child.setAnotherProperty(40);
 			child.setName("myName");
@@ -131,6 +152,10 @@ public class MultipleInheritanceAction extends AbstractTestAction {
 		{
 			store.beginTransaction();
 			final Child2 child = TestinheritanceFactory.eINSTANCE.createChild2();
+			final SomeReference sr = TestinheritanceFactory.eINSTANCE.createSomeReference();
+			sr.setName("sr2");
+			store.store(sr);
+			child.setSomeReference(sr);
 			child.setAge(11);
 			child.setAnotherProperty(41);
 			child.setName("myName2");