Strongly typed the comparator, removing no longer valid tests

Signed-off-by: Rajarshi Guha <rajarshi.guha@gmail.com>
cdk · Oct 23, 2010 · ee22b7f · ee22b7f
1 parent 8f0ac06
commit ee22b7f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 37 deletions.
diff --git a/src/main/org/openscience/cdk/tools/manipulator/AtomContainerComparator.java b/src/main/org/openscience/cdk/tools/manipulator/AtomContainerComparator.java
@@ -57,7 +57,7 @@
  * @cdk.githash
  */
 @TestClass("org.openscience.cdk.tools.manipulator.AtomContainerComparatorTest")
-public class AtomContainerComparator implements Comparator {
+public class AtomContainerComparator implements Comparator<IAtomContainer> {
 
   /** Configure LoggingTool */
   private ILoggingTool logger =
@@ -87,7 +87,7 @@ public AtomContainerComparator() {
    *         to, or greater than the second.
    */
     @TestMethod("testCompare_Object_Object")
-  public int compare(Object o1, Object o2) {
+  public int compare(IAtomContainer o1, IAtomContainer o2) {
     // Check for nulls
     if (o1 == null && o2 == null)
       return 0;

diff --git a/src/test/org/openscience/cdk/tools/manipulator/AtomContainerComparatorTest.java b/src/test/org/openscience/cdk/tools/manipulator/AtomContainerComparatorTest.java
@@ -77,41 +77,6 @@ public void testCompare_IAtomContainer_Null() {
 		Assert.assertEquals("cycloPentane <-> null", 1, comparator.compare(cycloPentane, null));
     }
 
-    @Test
-    public void testCompare_IAtomContainer_Object() {
-		// Create some IAtomContainers
-		IChemObjectBuilder builder = DefaultChemObjectBuilder.getInstance();
-		IRing cycloPentane = builder.newInstance(IRing.class,5, "C");
-
-		// Instantiate the comparator
-		Comparator comparator = new AtomContainerComparator();
-
-		Object object = new Object();
-		Assert.assertEquals("cycloPentane <-> object", 1, comparator.compare(cycloPentane, object));
-    }
-
-    @Test
-    public void testCompare_Object_Object() {
-		// Instantiate the comparator
-		Comparator comparator = new AtomContainerComparator();
-
-		Object object = new Object();
-		Assert.assertEquals("object <-> object", 0, comparator.compare(object, object));
-    }
-
-    @Test
-    public void testCompare_Object_IAtomContainer() {
-		// Create some IAtomContainers
-		IChemObjectBuilder builder = DefaultChemObjectBuilder.getInstance();
-		IRing cycloPentane = builder.newInstance(IRing.class,5, "C");
-
-		// Instantiate the comparator
-		Comparator comparator = new AtomContainerComparator();
-
-		Object object = new Object();
-		Assert.assertEquals("object <-> cycloPentane", -1, comparator.compare(object, cycloPentane));
-    }
-
 	@Test
     public void testCompare_RingSize() {
 		// Create some IAtomContainers