Skip to content

Ensure HdivReader understands both date formats (w/o date) #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davewichers merged 1 commit into from
Mar 3, 2020
Merged

Ensure HdivReader understands both date formats (w/o date) #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions src/main/java/org/owasp/benchmark/score/parsers/HdivReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -65,21 +66,29 @@ else if (line.contains("Product version:")) {

private String calculateTime(final String firstLine, final String lastLine) {
try {
String start = firstLine.split(" ")[0];
String stop = lastLine.split(" ")[0];
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss,SSS");
Date startTime = sdf.parse(start);
Date stopTime = sdf.parse(stop);
long startMillis = startTime.getTime();
long stopMillis = stopTime.getTime();
return (stopMillis - startMillis) / 1000 + " seconds";
try {
return calculateTime(firstLine, lastLine, 0);
} catch (ParseException e) {
return calculateTime(firstLine, lastLine, 1);
}
}
catch (Exception e) {
e.printStackTrace();
}
return null;
}

private String calculateTime(final String firstLine, final String lastLine, final int timeColumn) throws ParseException {
String start = firstLine.split(" ")[timeColumn];
String stop = lastLine.split(" ")[timeColumn];
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss,SSS");
Date startTime = sdf.parse(start);
Date stopTime = sdf.parse(stop);
long startMillis = startTime.getTime();
long stopMillis = stopTime.getTime();
return (stopMillis - startMillis) / 1000 + " seconds";
}

private void process(final TestResults tr, String testNumber, final List<String> chunk) throws Exception {
for (String line : chunk) {
TestCaseResult tcr = new TestCaseResult();
Expand Down