Corner case detected in testing - don't parse a charge symbol on it's…

… own as valid.
cdk · Sep 12, 2015 · 775910d · 775910d
1 parent 1d978ee
commit 775910d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...sic/src/main/java/org/openscience/cdk/renderer/generators/standard/AbbreviationLabel.java b/...sic/src/main/java/org/openscience/cdk/renderer/generators/standard/AbbreviationLabel.java
@@ -189,8 +189,8 @@ static boolean parse(String label, List<String> tokens) {
                     i++;
                 }
             }
-            // a charge token
-            else if (i == st) {
+            // a charge token, only if it's after some other parts
+            else if (i == st && st > 0) {
                 c = normDash(label.charAt(i));
                 if (c == '-' || c == '+') {
                     i++;

diff --git a/...src/test/java/org/openscience/cdk/renderer/generators/standard/AbbreviationLabelTest.java b/...src/test/java/org/openscience/cdk/renderer/generators/standard/AbbreviationLabelTest.java
@@ -157,4 +157,14 @@ public void formatOPO3H2() {
         assertThat(texts.get(3).text, is("2"));
         assertThat(texts.get(3).style, is(-1));
     }
+
+    @Test
+    public void parseChargeOnly() {
+        assertFalse(AbbreviationLabel.parse("+", new ArrayList<String>()));
+    }
+
+    @Test
+    public void parseNumberOnly() {
+        assertFalse(AbbreviationLabel.parse("1", new ArrayList<String>()));
+    }
 }