Make test fail after timeout, if it does fail then the user has mixed locale and no obvious workaround ATM. Fail is better then hanging.

johnmay · johnmay · commit 29e5c3a330d5 · 2019-02-17T12:05:34.000Z
diff --git a/storage/inchi/src/main/java/org/openscience/cdk/inchi/JniInChIInputAdapter.java b/storage/inchi/src/main/java/org/openscience/cdk/inchi/JniInChIInputAdapter.java
@@ -61,13 +61,17 @@ private static boolean isTimeoutOptions(String op) {
             pos++;
         while (pos < len && Character.isDigit(op.charAt(pos)))
             pos++;
-        if (pos < len && op.charAt(pos) == '.')
+        if (pos < len && (op.charAt(pos) == '.' || op.charAt(pos) == ','))
             pos++;
         while (pos < len && Character.isDigit(op.charAt(pos)))
             pos++;
         return pos == len;
     }
 
+    private static boolean isSubSecondTimeout(String op) {
+        return op.indexOf('.') >= 0 || op.indexOf(',') >= 0;
+    }
+
     private static String checkOptions(final String ops) throws JniInchiException {
         if (ops == null) {
             throw new IllegalArgumentException("Null options");
@@ -92,7 +96,8 @@ private static String checkOptions(final String ops) throws JniInchiException {
                     sbOptions.append(" ");
                 }
             } else if (isTimeoutOptions(op)) {
-                if (op.contains(".") || op.contains(",")) { // only reformat if we actually have a decimal
+                // only reformat if we actually have a decimal
+                if (isSubSecondTimeout(op)) {
                     // because the JNI-InChI library is expecting an platform number, format it as such
 	                Double time = Double.parseDouble(op.substring(1));
 	                DecimalFormat format = new DecimalFormat("#.##");
@@ -132,7 +137,6 @@ else if ("KET".equals(op)) {
         return sbOptions.toString();
     }
 
-
     private static String checkOptions(List<INCHI_OPTION> ops) throws JniInchiException {
         if (ops == null) {
             throw new IllegalArgumentException("Null options");
diff --git a/storage/inchi/src/test/java/org/openscience/cdk/inchi/InChIGeneratorTest.java b/storage/inchi/src/test/java/org/openscience/cdk/inchi/InChIGeneratorTest.java
@@ -896,7 +896,11 @@ public void s_penta_2_3_diene_expl_h() throws Exception {
         }
     }
 
-    @Test
+    // if this test hits the timeout it's likely the users Locale is mixed, the
+    // InChI library was loaded in one mode and java is in another, the issue
+    // is InChI takes timeout in seconds and fractional seconds will be either
+    // 0.1 or 0,1 depending on locale.
+    @Test(timeout = 500)
     public void timeout() throws Exception {
         IChemObjectBuilder bldr = SilentChemObjectBuilder.getInstance();
         SmilesParser smipar = new SmilesParser(bldr);

Original file line number	Diff line number	Diff line change
`@@ -896,7 +896,11 @@ public void s_penta_2_3_diene_expl_h() throws Exception {`
`896`	`896`	`}`
`897`	`897`	`}`
`898`	`898`
`899`		`- @Test`
	`899`	`+ // if this test hits the timeout it's likely the users Locale is mixed, the`
	`900`	`+ // InChI library was loaded in one mode and java is in another, the issue`
	`901`	`+ // is InChI takes timeout in seconds and fractional seconds will be either`
	`902`	`+ // 0.1 or 0,1 depending on locale.`
	`903`	`+ @Test(timeout = 500)`
`900`	`904`	`public void timeout() throws Exception {`
`901`	`905`	`IChemObjectBuilder bldr = SilentChemObjectBuilder.getInstance();`
`902`	`906`	`SmilesParser smipar = new SmilesParser(bldr);`