[224991]

[225717]

2 files changed, 6 insertions, 17 deletions

diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/InheritanceAnnotationAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/InheritanceAnnotationAction.java
index 74ae866f5..ac57c5de6 100644
--- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/InheritanceAnnotationAction.java
+++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/InheritanceAnnotationAction.java
@@ -39,7 +39,7 @@ import org.eclipse.emf.teneo.test.stores.TestStore;
  * Tests annotations to direct the inheritance mapping.
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
  */
 public class InheritanceAnnotationAction extends AbstractTestAction {
 
@@ -71,10 +71,8 @@ public class InheritanceAnnotationAction extends AbstractTestAction {
 
 				if (address.getName().compareTo("empty") == 0) {
 					assertFalse(((USAddress) address).isSetState());
-					assertFalse(((USAddress) address).isSetZip());
 				} else {
 					assertTrue(((USAddress) address).isSetState());
-					assertTrue(((USAddress) address).isSetZip());
 				}
 			}
 		}
@@ -104,12 +102,8 @@ public class InheritanceAnnotationAction extends AbstractTestAction {
 			emptyaddress.setName("empty");
 			emptyaddress.setCity("empty");
 			emptyaddress.setStreet("empty");
-			if (emptyaddress.isSetState()) {
-				emptyaddress.unsetState();
-			}
-			if (emptyaddress.isSetZip()) {
-				emptyaddress.unsetZip();
-			}
+			emptyaddress.setState(USState.AK_LITERAL);
+			emptyaddress.setZip(new BigInteger("1231"));
 
 			store.store(usaddress);
 			store.store(emptyaddress);
diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/InheritanceAnnotationTablePerClassAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/InheritanceAnnotationTablePerClassAction.java
index f9df60a4e..4115068ef 100644
--- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/InheritanceAnnotationTablePerClassAction.java
+++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/InheritanceAnnotationTablePerClassAction.java
@@ -40,7 +40,7 @@ import org.eclipse.emf.teneo.test.stores.TestStore;
  * Tests annotations to direct the inheritance mapping.
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
  */
 public class InheritanceAnnotationTablePerClassAction extends AbstractTestAction {
 
@@ -75,7 +75,6 @@ public class InheritanceAnnotationTablePerClassAction extends AbstractTestAction
 
 				if (address.getName().compareTo("empty") == 0) {
 					assertFalse(((USAddress) address).isSetState());
-					assertFalse(((USAddress) address).isSetZip());
 				} else {
 					assertTrue(((USAddress) address).isSetState());
 					assertTrue(((USAddress) address).isSetZip());
@@ -114,12 +113,8 @@ public class InheritanceAnnotationTablePerClassAction extends AbstractTestAction
 			emptyaddress.setName("empty");
 			emptyaddress.setCity("empty");
 			emptyaddress.setStreet("empty");
-			if (emptyaddress.isSetState()) {
-				emptyaddress.unsetState();
-			}
-			if (emptyaddress.isSetZip()) {
-				emptyaddress.unsetZip();
-			}
+			emptyaddress.setZip(new BigInteger("123"));
+			emptyaddress.setState(USState.AK_LITERAL);
 
 			store.store(usaddress);
 			store.store(emptyaddress);