Skip to content

Commit 212c97e

Browse files
committed
Correct tests for Java
1 parent 86bc950 commit 212c97e

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/test/java/com/slicingdice/jslicer/SlicingDiceTester.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,13 @@ private void createColumns(final JSONObject columnObject) {
192192
* @param column the column to put timestamp
193193
*/
194194
private void addTimestampToColumnName(final JSONObject column) {
195-
final String oldName = "\"" + column.getString("api-name");
195+
final String oldName = "\"" + column.getString("api-name") + "\"";
196196

197197
final String timestamp = this.getTimestamp();
198198
column.put("name", column.get("name") + timestamp);
199199
column.put("api-name", column.get("api-name") + timestamp);
200200

201-
final String newName = "\"" + column.getString("api-name");
201+
final String newName = "\"" + column.getString("api-name") + "\"";
202202
this.columnTranslation.put(oldName, newName);
203203
}
204204

@@ -367,8 +367,13 @@ private void compareResult(final JSONObject expectedObject, final String queryTy
367367

368368
System.out.println(String.format("\tExpected: \"%1$s\": %2$s", keyStr,
369369
expected.getJSONObject(keyStr).toString()));
370-
System.out.println(String.format("\tResult: \"%1$s\": %2$s", keyStr,
371-
result.getJSONObject(keyStr).toString()));
370+
try {
371+
System.out.println(String.format("\tResult: \"%1$s\": %2$s", keyStr,
372+
result.getJSONObject(keyStr).toString()));
373+
} catch (final Exception e) {
374+
System.out.println(String.format("\tResult: \"%1$s\": %2$s", keyStr,
375+
e.getMessage()));
376+
}
372377
System.out.println("\tStatus: Failed\n");
373378
return;
374379
} else {
@@ -405,7 +410,7 @@ private boolean testSecondTime(final JSONObject expectedObject, final String que
405410
System.out.println("\tStatus: Passed\n");
406411
return true;
407412
}
408-
} catch (ExecutionException | InterruptedException e) {
413+
} catch (final Exception e) {
409414
e.printStackTrace();
410415
}
411416

@@ -499,7 +504,7 @@ private boolean compareJsonValue(final Object valueExpected, final Object valueG
499504
}
500505
return true;
501506
}
502-
} catch (final ClassCastException e) {
507+
} catch (final Exception e) {
503508
return false;
504509
}
505510

0 commit comments

Comments
 (0)