Fix test cases.

johnmay · johnmay · commit 0c4ed4a3bfb5 · 2020-01-08T12:20:26.000Z
diff --git a/display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardAtomGenerator.java b/display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardAtomGenerator.java
@@ -489,7 +489,7 @@ TextOutline positionChargeLabel(int hydrogens,
         // are in the way - in which case we place it relative to the
         // hydrogen
         Rectangle2D referenceBounds = element.getBounds();
-        if (hydrogens > 0 && position != Below)
+        if (hydrogens > 0 && (position == Left || position == Right))
             referenceBounds = hydrogen.getBounds();
         if (position == Left)
             return charge.translate((referenceBounds.getMinX() - padding) - chargeBounds.getMaxX(),
diff --git a/display/renderbasic/src/test/java/org/openscience/cdk/renderer/generators/standard/StandardAtomGeneratorTest.java b/display/renderbasic/src/test/java/org/openscience/cdk/renderer/generators/standard/StandardAtomGeneratorTest.java
@@ -159,7 +159,7 @@ public void positionOfChargeWhenHydrogensAreLeft() {
         Rectangle2D chargeBounds = positioned.getBounds();
 
         assertThat(chargeBounds.getMinX(), greaterThan(elementBounds.getMinX()));
-        assertThat(chargeBounds.getCenterY(), closeTo(elementBounds.getMinY(), 0.01));
+        assertThat(chargeBounds.getCenterY(), closeTo(localHydrogen.getBounds().getMinY(), 0.01));
     }
 
     @Test
@@ -186,8 +186,9 @@ public void positionOfChargeWhenTwoHydrogensAreAbove() {
         Rectangle2D hydrogenBounds = localHydrogen.getBounds();
         Rectangle2D chargeBounds = positioned.getBounds();
 
-        assertThat(chargeBounds.getMinX(), greaterThan(hydrogenBounds.getMinX()));
-        assertThat(chargeBounds.getCenterY(), closeTo(hydrogenBounds.getMinY(), 0.01));
+        Rectangle2D elementBounds = element.getBounds();
+        assertThat(chargeBounds.getMinX(), greaterThan(elementBounds.getMinX()));
+        assertThat(chargeBounds.getCenterY(), closeTo(elementBounds.getMinY(), 0.01));
     }
 
     @Test
