| commit | 380cf23bbbd7cfeacc563b9b327d6cefa2613385 | [log] [tgz] |
|---|---|---|
| author | Henrik Rentz-Reichert <hrr@protos.de> | Fri Aug 19 09:29:20 2016 +0200 |
| committer | Henrik Rentz-Reichert <hrr@protos.de> | Fri Aug 19 09:29:20 2016 +0200 |
| tree | fe9e8a2c771cd3fe6bba517baef1c19319f01c13 | |
| parent | bc7300dad3bb0446e11d7ca691486c9cf1e3ce5e [diff] |
Fixed crash with empty file in etUnit Change-Id: I1e0ffab4e2a429c747953e849013f81d2aa3ae68
diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java index 704524c..aba3de1 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java
@@ -337,6 +337,12 @@ TestsuiteType currentSuite = null; String line = bufRead.readLine(); ++count; + if (line==null) { + System.err.println("Error: file "+report+", is empty - no etunit file"); + bufRead.close(); + input.close(); + return null; + } if (!line.equals("etUnit report")) { System.err.println("Error: file "+report+", line "+line+" is missing header line - no etunit file"); bufRead.close();
diff --git a/tests/org.eclipse.etrice.etunit.converter.tests/reports/report6.etu b/tests/org.eclipse.etrice.etunit.converter.tests/reports/report6.etu new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/org.eclipse.etrice.etunit.converter.tests/reports/report6.etu
diff --git a/tests/org.eclipse.etrice.etunit.converter.tests/src/org/eclipse/etrice/etunit/converter/ConverterTest.java b/tests/org.eclipse.etrice.etunit.converter.tests/src/org/eclipse/etrice/etunit/converter/ConverterTest.java index 51f18a8..48aa82a 100644 --- a/tests/org.eclipse.etrice.etunit.converter.tests/src/org/eclipse/etrice/etunit/converter/ConverterTest.java +++ b/tests/org.eclipse.etrice.etunit.converter.tests/src/org/eclipse/etrice/etunit/converter/ConverterTest.java
@@ -93,4 +93,13 @@ String[] arguments = new String[args.size()]; EtUnitReportConverter.main(args.toArray(arguments)); } + + @Test + public void testEmptyFile() { + ArrayList<String> args = new ArrayList<String>(); + args.add(basePath+"report6.etu"); + + String[] arguments = new String[args.size()]; + EtUnitReportConverter.main(args.toArray(arguments)); + } }