Correct more test with bad atom symbols and symbol visibility due to …

…hcount.
johnmay · Oct 16, 2016 · c887ff3 · c887ff3
1 parent 3c5d224
commit c887ff3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/display/render/src/test/java/org/openscience/cdk/renderer/SymbolVisibilityTest.java b/display/render/src/test/java/org/openscience/cdk/renderer/SymbolVisibilityTest.java
@@ -77,6 +77,8 @@ public void iupacMethylPreferred() {
     public void iupacMethylAcceptable() {
         IAtom a1 = new Atom("C");
         IAtom a2 = new Atom("C");
+        a1.setImplicitHydrogenCount(null);
+        a1.setImplicitHydrogenCount(null);
         IBond bond = new Bond(a1, a2);
         a1.setPoint2d(new Point2d(0, 0));
         a2.setPoint2d(new Point2d(0, 0));

diff --git a/display/render/src/test/java/org/openscience/cdk/renderer/color/CDK2DAtomColorsTest.java b/display/render/src/test/java/org/openscience/cdk/renderer/color/CDK2DAtomColorsTest.java
@@ -27,6 +27,7 @@
 import org.junit.Test;
 import org.openscience.cdk.Atom;
 import org.openscience.cdk.CDKTestCase;
+import org.openscience.cdk.PseudoAtom;
 import org.openscience.cdk.interfaces.IAtom;
 
 /**
@@ -51,7 +52,7 @@ public void testGetDefaultAtomColor() {
         CDK2DAtomColors colors = new CDK2DAtomColors();
 
         Assert.assertNotNull(colors);
-        IAtom imaginary = new Atom("Ix");
+        IAtom imaginary = new PseudoAtom("Ix");
         Assert.assertEquals(new Color(0, 0, 0), colors.getAtomColor(imaginary, Color.BLACK));
     }
 }
diff --git a/display/render/src/test/java/org/openscience/cdk/renderer/color/CDKAtomColorsTest.java b/display/render/src/test/java/org/openscience/cdk/renderer/color/CDKAtomColorsTest.java
@@ -28,6 +28,7 @@
 import org.junit.Test;
 import org.openscience.cdk.Atom;
 import org.openscience.cdk.CDKTestCase;
+import org.openscience.cdk.PseudoAtom;
 import org.openscience.cdk.interfaces.IAtom;
 
 /**
@@ -52,7 +53,7 @@ public void testGetDefaultAtomColor() {
         CDKAtomColors colors = new CDKAtomColors();
 
         Assert.assertNotNull(colors);
-        IAtom imaginary = new Atom("Ix");
+        IAtom imaginary = new PseudoAtom("Ix");
         Assert.assertEquals(Color.ORANGE, colors.getAtomColor(imaginary, Color.ORANGE));
     }
 }
diff --git a/display/render/src/test/java/org/openscience/cdk/renderer/color/CPKAtomColorsTest.java b/display/render/src/test/java/org/openscience/cdk/renderer/color/CPKAtomColorsTest.java
@@ -28,6 +28,7 @@
 import org.junit.Test;
 import org.openscience.cdk.Atom;
 import org.openscience.cdk.CDKTestCase;
+import org.openscience.cdk.PseudoAtom;
 import org.openscience.cdk.interfaces.IAtom;
 
 /**
@@ -48,7 +49,7 @@ public void testGetDefaultAtomColor() {
         CPKAtomColors colors = new CPKAtomColors();
 
         Assert.assertNotNull(colors);
-        IAtom imaginary = new Atom("Ix");
+        IAtom imaginary = new PseudoAtom("Ix");
         Assert.assertEquals(Color.ORANGE, colors.getAtomColor(imaginary, Color.ORANGE));
     }
 }
diff --git a/...ender/src/test/java/org/openscience/cdk/renderer/color/PartialAtomicChargeColorsTest.java b/...ender/src/test/java/org/openscience/cdk/renderer/color/PartialAtomicChargeColorsTest.java
@@ -27,6 +27,7 @@
 import org.junit.Test;
 import org.openscience.cdk.Atom;
 import org.openscience.cdk.CDKTestCase;
+import org.openscience.cdk.PseudoAtom;
 import org.openscience.cdk.interfaces.IAtom;
 
 /**
@@ -51,7 +52,7 @@ public void testGetDefaultAtomColor() {
         PartialAtomicChargeColors colors = new PartialAtomicChargeColors();
 
         Assert.assertNotNull(colors);
-        IAtom imaginary = new Atom("Ix");
+        IAtom imaginary = new PseudoAtom("Ix");
         Assert.assertEquals(Color.ORANGE, colors.getAtomColor(imaginary, Color.ORANGE));
     }
 }
diff --git a/display/render/src/test/java/org/openscience/cdk/renderer/color/RasmolColorsTest.java b/display/render/src/test/java/org/openscience/cdk/renderer/color/RasmolColorsTest.java
@@ -27,6 +27,7 @@
 
 import org.openscience.cdk.Atom;
 import org.openscience.cdk.CDKTestCase;
+import org.openscience.cdk.PseudoAtom;
 import org.openscience.cdk.interfaces.IAtom;
 
 /**
@@ -51,7 +52,7 @@ public void testGetDefaultAtomColor() {
         RasmolColors colors = new RasmolColors();
 
         Assert.assertNotNull(colors);
-        IAtom imaginary = new Atom("Ix");
+        IAtom imaginary = new PseudoAtom("Ix");
         Assert.assertEquals(Color.ORANGE, colors.getAtomColor(imaginary, Color.ORANGE));
     }