[251537] [DB] Enhanced ComplexTest test cases fail

https://bugs.eclipse.org/bugs/show_bug.cgi?id=251537

5 files changed, 23 insertions, 24 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.ecore b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.ecore
index 69ebecd8c4..1dcef91980 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.ecore
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.ecore
@@ -32,7 +32,7 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="RefMultiNonContained">
     <eStructuralFeatures xsi:type="ecore:EReference" name="elements" upperBound="-1"
-        eType="#//MultiNonContainedElement" containment="true" eOpposite="#//MultiNonContainedElement/parent"/>
+        eType="#//MultiNonContainedElement" eOpposite="#//MultiNonContainedElement/parent"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="MultiNonContainedElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java
index c86361429e..be4b3c722c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: MultiNonContainedElement.java,v 1.3 2008-09-18 12:56:50 estepper Exp $
+ * $Id: MultiNonContainedElement.java,v 1.4 2008-10-27 13:36:18 smcduff Exp $
  */
 package org.eclipse.emf.cdo.tests.model4;
 
@@ -52,7 +52,7 @@ public interface MultiNonContainedElement extends EObject
   void setName(String value);
 
   /**
-   * Returns the value of the '<em><b>Parent</b></em>' container reference. It is bidirectional and its opposite is '
+   * Returns the value of the '<em><b>Parent</b></em>' reference. It is bidirectional and its opposite is '
    * {@link org.eclipse.emf.cdo.tests.model4.RefMultiNonContained#getElements <em>Elements</em>}'. <!-- begin-user-doc
    * -->
    * <p>
@@ -61,21 +61,21 @@ public interface MultiNonContainedElement extends EObject
    * </p>
    * <!-- end-user-doc -->
    * 
-   * @return the value of the '<em>Parent</em>' container reference.
+   * @return the value of the '<em>Parent</em>' reference.
    * @see #setParent(RefMultiNonContained)
    * @see org.eclipse.emf.cdo.tests.model4.model4Package#getMultiNonContainedElement_Parent()
    * @see org.eclipse.emf.cdo.tests.model4.RefMultiNonContained#getElements
-   * @model opposite="elements" transient="false"
+   * @model opposite="elements"
    * @generated
    */
   RefMultiNonContained getParent();
 
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement#getParent <em>Parent</em>}'
-   * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @param value
-   *          the new value of the '<em>Parent</em>' container reference.
+   *          the new value of the '<em>Parent</em>' reference.
    * @see #getParent()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java
index 60bab8a039..805921961d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: RefMultiNonContained.java,v 1.3 2008-09-18 12:56:50 estepper Exp $
+ * $Id: RefMultiNonContained.java,v 1.4 2008-10-27 13:36:18 smcduff Exp $
  */
 package org.eclipse.emf.cdo.tests.model4;
 
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.EObject;
 public interface RefMultiNonContained extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Elements</b></em>' containment reference list. The list contents are of type
+   * Returns the value of the '<em><b>Elements</b></em>' reference list. The list contents are of type
    * {@link org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement}. It is bidirectional and its opposite is '
    * {@link org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement#getParent <em>Parent</em>}'. <!-- begin-user-doc
    * -->
@@ -36,10 +36,10 @@ public interface RefMultiNonContained extends EObject
    * </p>
    * <!-- end-user-doc -->
    * 
-   * @return the value of the '<em>Elements</em>' containment reference list.
+   * @return the value of the '<em>Elements</em>' reference list.
    * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefMultiNonContained_Elements()
    * @see org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement#getParent
-   * @model opposite="parent" containment="true"
+   * @model opposite="parent"
    * @generated
    */
   EList<MultiNonContainedElement> getElements();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java
index 14c39d1f76..5e87b014a1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: model4PackageImpl.java,v 1.5 2008-10-09 09:56:42 smcduff Exp $
+ * $Id: model4PackageImpl.java,v 1.6 2008-10-27 13:36:19 smcduff Exp $
  */
 package org.eclipse.emf.cdo.tests.model4.impl;
 
@@ -1213,7 +1213,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getRefMultiNonContained_Elements(), getMultiNonContainedElement(),
         getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(multiNonContainedElementEClass, MultiNonContainedElement.class, "MultiNonContainedElement",
@@ -1223,7 +1223,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
         !IS_DERIVED, IS_ORDERED);
     initEReference(getMultiNonContainedElement_Parent(), getRefMultiNonContained(), getRefMultiNonContained_Elements(),
         "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(refSingleContainedNPLEClass, RefSingleContainedNPL.class, "RefSingleContainedNPL", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java
index 224ff76a28..62aa1c81ae 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: model4Package.java,v 1.4 2008-10-09 09:56:43 smcduff Exp $
+ * $Id: model4Package.java,v 1.5 2008-10-27 13:36:18 smcduff Exp $
  */
 package org.eclipse.emf.cdo.tests.model4;
 
@@ -256,8 +256,7 @@ public interface model4Package extends EPackage
   int REF_MULTI_NON_CONTAINED = 6;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
+   * The feature id for the '<em><b>Elements</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
    * @ordered
@@ -292,7 +291,7 @@ public interface model4Package extends EPackage
   int MULTI_NON_CONTAINED_ELEMENT__NAME = 0;
 
   /**
-   * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Parent</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
    * @ordered
@@ -1208,11 +1207,11 @@ public interface model4Package extends EPackage
   EClass getRefMultiNonContained();
 
   /**
-   * Returns the meta object for the containment reference list '
+   * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.tests.model4.RefMultiNonContained#getElements <em>Elements</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
    * 
-   * @return the meta object for the containment reference list '<em>Elements</em>'.
+   * @return the meta object for the reference list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model4.RefMultiNonContained#getElements()
    * @see #getRefMultiNonContained()
    * @generated
@@ -1242,11 +1241,11 @@ public interface model4Package extends EPackage
   EAttribute getMultiNonContainedElement_Name();
 
   /**
-   * Returns the meta object for the container reference '
+   * Returns the meta object for the reference '
    * {@link org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement#getParent <em>Parent</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
    * 
-   * @return the meta object for the container reference '<em>Parent</em>'.
+   * @return the meta object for the reference '<em>Parent</em>'.
    * @see org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement#getParent()
    * @see #getMultiNonContainedElement()
    * @generated
@@ -1897,8 +1896,8 @@ public interface model4Package extends EPackage
     EAttribute MULTI_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getMultiNonContainedElement_Name();
 
     /**
-     * The meta object literal for the '<em><b>Parent</b></em>' container reference feature. <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The meta object literal for the '<em><b>Parent</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
      * 
      * @generated
      */