Handled MarkedElements in tests and don't mark if the element is null.

cdk · Oct 11, 2015 · bf96e0e · bf96e0e
1 parent 9ec0cb8
commit bf96e0e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/display/renderbasic/src/main/java/org/openscience/cdk/renderer/elements/MarkedElement.java b/display/renderbasic/src/main/java/org/openscience/cdk/renderer/elements/MarkedElement.java
@@ -164,7 +164,8 @@ public static MarkedElement markupMol(IRenderingElement elem, IAtomContainer mol
      * @return the marked element
      */
     public static MarkedElement markupAtom(IRenderingElement elem, IAtom atom) {
-        assert elem != null;
+        if (elem == null)
+            return null;
         MarkedElement tagElem = markupChemObj(elem, atom);
         tagElem.aggClass("atom");
         return tagElem;

diff --git a/display/renderbasic/src/test/java/org/openscience/cdk/renderer/ElementUtility.java b/display/renderbasic/src/test/java/org/openscience/cdk/renderer/ElementUtility.java
@@ -28,9 +28,11 @@
 
 import org.openscience.cdk.renderer.RendererModel;
 import org.openscience.cdk.renderer.elements.AtomSymbolElement;
+import org.openscience.cdk.renderer.elements.Bounds;
 import org.openscience.cdk.renderer.elements.ElementGroup;
 import org.openscience.cdk.renderer.elements.IRenderingElement;
 import org.openscience.cdk.renderer.elements.LineElement;
+import org.openscience.cdk.renderer.elements.MarkedElement;
 import org.openscience.cdk.renderer.elements.OvalElement;
 import org.openscience.cdk.renderer.font.IFontManager;
 import org.openscience.cdk.renderer.visitor.IDrawVisitor;
@@ -67,6 +69,10 @@ public void visit(IRenderingElement element) {
                 this.elements.add(element);
             }
             ((ElementGroup) element).visitChildren(this);
+        } else if (element instanceof MarkedElement) {
+            visit(((MarkedElement) element).element());
+        } else if (element instanceof Bounds) {
+            visit(((Bounds) element).root());
         } else {
             this.elements.add(element);
         }

diff --git a/...erbasic/src/test/java/org/openscience/cdk/renderer/generators/BasicAtomGeneratorTest.java b/...erbasic/src/test/java/org/openscience/cdk/renderer/generators/BasicAtomGeneratorTest.java
@@ -37,6 +37,7 @@
 import org.openscience.cdk.renderer.color.IAtomColorer;
 import org.openscience.cdk.renderer.elements.AtomSymbolElement;
 import org.openscience.cdk.renderer.elements.IRenderingElement;
+import org.openscience.cdk.renderer.elements.MarkedElement;
 import org.openscience.cdk.renderer.elements.OvalElement;
 import org.openscience.cdk.renderer.elements.RectangleElement;
 import org.openscience.cdk.renderer.generators.BasicAtomGenerator.AtomColor;
@@ -58,6 +59,12 @@ public class BasicAtomGeneratorTest extends AbstractGeneratorTest {
 
     private BasicAtomGenerator generator;
 
+    static IRenderingElement unbox(IRenderingElement element) {
+        if (element instanceof MarkedElement)
+            return ((MarkedElement) element).element();
+        return element;
+    }
+
     @Override
     public Rectangle getCustomCanvas() {
         return null;
@@ -229,7 +236,7 @@ public void getAtomColorTest() {
 
         List<IRenderingElement> elements = getAllSimpleElements(generator, singleAtom);
         Assert.assertEquals(1, elements.size());
-        AtomSymbolElement element = ((AtomSymbolElement) elements.get(0));
+        AtomSymbolElement element = ((AtomSymbolElement) unbox(elements.get(0)));
         Assert.assertEquals(testColor, element.color);
     }
 
@@ -267,7 +274,7 @@ public Color getAtomColor(IAtom atom, Color defaultColor) {
         List<IRenderingElement> elements = getAllSimpleElements(generator, cnop);
         Assert.assertEquals(4, elements.size());
         for (IRenderingElement element : elements) {
-            AtomSymbolElement symbolElement = (AtomSymbolElement) element;
+            AtomSymbolElement symbolElement = (AtomSymbolElement) unbox(element);
             String symbol = symbolElement.text;
             Assert.assertTrue(colorMap.containsKey(symbol));
             Assert.assertEquals(colorMap.get(symbol), symbolElement.color);
@@ -281,7 +288,7 @@ public void colorByTypeTest() {
         List<IRenderingElement> elements = getAllSimpleElements(generator, snop);
         Color defaultColor = model.getDefault(AtomColor.class);
         for (IRenderingElement element : elements) {
-            AtomSymbolElement symbolElement = (AtomSymbolElement) element;
+            AtomSymbolElement symbolElement = (AtomSymbolElement) unbox(element);
             Assert.assertEquals(defaultColor, symbolElement.color);
         }
     }

diff --git a/...erbasic/src/test/java/org/openscience/cdk/renderer/generators/BasicBondGeneratorTest.java b/...erbasic/src/test/java/org/openscience/cdk/renderer/generators/BasicBondGeneratorTest.java
@@ -11,6 +11,7 @@
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.renderer.elements.IRenderingElement;
 import org.openscience.cdk.renderer.elements.LineElement;
+import org.openscience.cdk.renderer.elements.MarkedElement;
 
 /**
  * Test the {@link BasicBondGenerator}.
@@ -22,6 +23,12 @@ public class BasicBondGeneratorTest extends AbstractGeneratorTest {
 
     private BasicBondGenerator generator;
 
+    static IRenderingElement unbox(IRenderingElement element) {
+        if (element instanceof MarkedElement)
+            return ((MarkedElement) element).element();
+        return element;
+    }
+
     @Override
     public Rectangle getCustomCanvas() {
         return null;