Moved test from the specific class to the abstract tests, as the beha…

…vior should be the same for NNMoleculeSet and DebugMoleculeSet too Signed-off-by: Rajarshi Guha <rajarshi.guha@gmail.com>
egonw · Apr 7, 2010 · 068fb3b · 068fb3b
1 parent 3be2367
commit 068fb3b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/src/test/org/openscience/cdk/MoleculeSetTest.java b/src/test/org/openscience/cdk/MoleculeSetTest.java
@@ -20,14 +20,9 @@
  */
 package org.openscience.cdk;
 
-import junit.framework.Assert;
-
 import org.junit.BeforeClass;
-import org.junit.Test;
 import org.openscience.cdk.interfaces.AbstractMoleculeSetTest;
 import org.openscience.cdk.interfaces.IChemObject;
-import org.openscience.cdk.interfaces.IMolecule;
-import org.openscience.cdk.interfaces.IMoleculeSet;
 import org.openscience.cdk.interfaces.ITestObjectBuilder;
 
 /**
@@ -46,16 +41,5 @@ public IChemObject newTestObject() {
             }
         });
     }
-
-    @Test public void testClone() throws CloneNotSupportedException{
-        IMoleculeSet moleculeSet = DefaultChemObjectBuilder.getInstance()
-            .newMoleculeSet();
-        IMolecule mol = moleculeSet.getBuilder().newMolecule();
-        moleculeSet.addAtomContainer(mol);
-        //we test that the molecule added is actually in the moleculeSet
-        Assert.assertSame(mol, moleculeSet.getAtomContainer(0));
-        moleculeSet.clone();
-        //after the clone, the molecule added should still be in the moleculeSet
-        Assert.assertSame(mol, moleculeSet.getAtomContainer(0));
-    }
+
 }
diff --git a/src/test/org/openscience/cdk/interfaces/AbstractMoleculeSetTest.java b/src/test/org/openscience/cdk/interfaces/AbstractMoleculeSetTest.java
@@ -170,7 +170,18 @@ public abstract class AbstractMoleculeSetTest extends AbstractAtomContainerSetTe
         Assert.assertTrue(clone instanceof IMoleculeSet);
 	Assert.assertNotSame(som, clone);
     }
-
+
+    @Test public void testCloneButKeepOriginalIntact() throws CloneNotSupportedException{
+        IMoleculeSet moleculeSet = (IMoleculeSet)newChemObject();
+        IMolecule mol = moleculeSet.getBuilder().newMolecule();
+        moleculeSet.addAtomContainer(mol);
+        //we test that the molecule added is actually in the moleculeSet
+        Assert.assertSame(mol, moleculeSet.getAtomContainer(0));
+        moleculeSet.clone();
+        //after the clone, the molecule added should still be in the moleculeSet
+        Assert.assertSame(mol, moleculeSet.getAtomContainer(0));
+    }
+
     @Test public void testCloneDuplication() throws Exception {
         IMoleculeSet moleculeSet = (IMoleculeSet)newChemObject();
         moleculeSet.addMolecule(moleculeSet.getBuilder().newMolecule());