[328790] CDOResource.isLoaded returns false after adding/clearing contents of new resource

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

2 files changed, 91 insertions, 0 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java
index b003a05166..736a570d19 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java
@@ -99,6 +99,7 @@ import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_325603_Test;
 import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_325866_Test;
 import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_326518_Test;
 import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_326743_Test;
+import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_328790_Test;
 import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
 import org.eclipse.emf.cdo.tests.config.impl.ConfigTestSuite;
 
@@ -265,6 +266,7 @@ public abstract class AllConfigs extends ConfigTestSuite
     testClasses.add(Bugzilla_325866_Test.class);
     testClasses.add(Bugzilla_326518_Test.class);
     testClasses.add(Bugzilla_326743_Test.class);
+    testClasses.add(Bugzilla_328790_Test.class);
 
     // TODO testClasses.add(NonCDOResourceTest.class);
     // TODO testClasses.add(GeneratedEcoreTest.class);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java
new file mode 100644
index 0000000000..4435f2d2b2
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java
@@ -0,0 +1,89 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Caspar De Groot - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests.bugzilla;
+
+import org.eclipse.emf.cdo.eresource.CDOResource;
+import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.tests.AbstractCDOTest;
+import org.eclipse.emf.cdo.tests.legacy.model1.Model1Factory;
+import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.util.CommitException;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+
+/**
+ * Bug 328790 - CDOResource.isLoaded returns false after adding/clearing contents of new resource
+ * 
+ * @author Caspar De Groot
+ */
+public class Bugzilla_328790_Test extends AbstractCDOTest
+{
+  public void test_newThenAdd1() throws CommitException
+  {
+    CDOSession session = openSession();
+    ResourceSet resourceSet = new ResourceSetImpl();
+    CDOTransaction tx = session.openTransaction(resourceSet);
+
+    Resource resource = resourceSet.createResource(URI.createURI("cdo://myUri"));
+    EObject object = Model1Factory.eINSTANCE.createAddress();
+    resource.getContents().add(object);
+
+    assertTrue(resource.isLoaded());
+
+    tx.commit();
+
+    assertTrue(resource.isLoaded());
+
+    tx.close();
+    session.close();
+  }
+
+  public void test_newThenAdd2() throws CommitException
+  {
+    CDOSession session = openSession();
+    CDOTransaction tx = session.openTransaction();
+
+    CDOResource resource = tx.createResource("/myUri");
+    EObject object = Model1Factory.eINSTANCE.createAddress();
+    resource.getContents().add(object);
+
+    assertTrue(resource.isLoaded());
+
+    tx.commit();
+
+    assertTrue(resource.isLoaded());
+
+    tx.close();
+    session.close();
+  }
+
+  public void test_newThenClear() throws CommitException
+  {
+    CDOSession session = openSession();
+    CDOTransaction tx = session.openTransaction();
+
+    CDOResource resource = tx.createResource("/myUri");
+    resource.getContents().clear();
+
+    assertTrue(resource.isLoaded());
+
+    tx.commit();
+
+    assertTrue(resource.isLoaded());
+
+    tx.close();
+    session.close();
+  }
+}