Added a missing test, and updated a test for the getBitFingerprint me…

…thod Change-Id: Ia55fc14ab78ae1c66f6d288997a46230652d29a1 Signed-off-by: jonalv <jonathan.alvarsson@gmail.com>
cdk · Aug 2, 2012 · 47e2f1d · 47e2f1d
1 parent 56caf17
commit 47e2f1d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/main/org/openscience/cdk/fingerprint/SignatureFingerprinter.java b/src/main/org/openscience/cdk/fingerprint/SignatureFingerprinter.java
@@ -61,7 +61,7 @@ public SignatureFingerprinter(int depth) {
         this.signatureDepth = depth;
     }
 
-    @TestMethod("testUnsupportedMethod")
+    @TestMethod("testBitFingerprint")
     public IBitFingerprint getBitFingerprint(IAtomContainer atomContainer) throws CDKException {
     		return new IntArrayFingerprint(getRawFingerprint(atomContainer));
     }
@@ -88,6 +88,7 @@ public int getSize() {
     }
 
 	@Override
+	@TestMethod("testCountFingerprint")
 	public ICountFingerprint getCountFingerprint(IAtomContainer container)
 			throws CDKException {
 		return new IntArrayCountFingerprint(getRawFingerprint(container));

diff --git a/src/test/org/openscience/cdk/fingerprint/SignatureFingerprinterTest.java b/src/test/org/openscience/cdk/fingerprint/SignatureFingerprinterTest.java
@@ -59,11 +59,23 @@ public void testFingerprint() throws Exception {
         }
     }
 
-    @Test(expected=UnsupportedOperationException.class)
-    public void testUnsupportedMethod() throws Exception {
+    @Test
+    public void testBitFingerprint() throws Exception {
+    	SignatureFingerprinter fingerprinter = new SignatureFingerprinter(0);
+        SmilesParser sp = new SmilesParser(DefaultChemObjectBuilder.getInstance());
+        IAtomContainer mol = sp.parseSmiles("O(NC)CC");
+        IBitFingerprint bitFP = fingerprinter.getBitFingerprint(mol);
+        Assert.assertNotNull(bitFP);
+        Assert.assertNotSame(0, bitFP.size());
+    }
+
+    @Test
+    public void testCountFingerprint() throws Exception {
     	SignatureFingerprinter fingerprinter = new SignatureFingerprinter(0);
         SmilesParser sp = new SmilesParser(DefaultChemObjectBuilder.getInstance());
         IAtomContainer mol = sp.parseSmiles("O(NC)CC");
-        fingerprinter.getBitFingerprint(mol);
+        ICountFingerprint bitFP = fingerprinter.getCountFingerprint(mol);
+        Assert.assertNotNull(bitFP);
+        Assert.assertNotSame(0, bitFP.size());
     }
 }