Skip to content

Commit

Permalink
improve timeline html tooltip
Browse files Browse the repository at this point in the history
  • Loading branch information
ptrthomas committed Sep 16, 2019
1 parent 362ba2f commit 4f82ec0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
9 changes: 8 additions & 1 deletion karate-core/src/main/java/com/intuit/karate/core/Engine.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@
import org.w3c.dom.Node;
import com.intuit.karate.StepActions;
import cucumber.api.java.en.When;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap;

Expand Down Expand Up @@ -441,6 +444,7 @@ public static File saveTimelineHtml(String targetDir, Results results, String fi
List<ScenarioResult> scenarioResults = results.getScenarioResults();
List<Map> items = new ArrayList(scenarioResults.size());
int id = 1;
DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss.SSS");
for (ScenarioResult sr : scenarioResults) {
String threadName = sr.getThreadName();
Integer groupId = groupsMap.get(threadName);
Expand All @@ -458,11 +462,14 @@ public static File saveTimelineHtml(String targetDir, Results results, String fi
item.put("content", content);
item.put("start", sr.getStartTime());
item.put("end", sr.getEndTime());
String startTime = dateFormat.format(new Date(sr.getStartTime()));
String endTime = dateFormat.format(new Date(sr.getEndTime()));
content = content + " " + startTime + "-" + endTime;
String scenarioTitle = StringUtils.trimToEmpty(s.getName());
if (!scenarioTitle.isEmpty()) {
content = content + " " + scenarioTitle;
}
item.put("title", content + " " + sr.getStartTime() + "-" + sr.getEndTime());
item.put("title", content);
}
List<Map> groups = new ArrayList(groupsMap.size());
groupsMap.forEach((k, v) -> {
Expand Down
2 changes: 1 addition & 1 deletion karate-docker/karate-chrome/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ set -x -e
REPO_DIR=$PWD/target/repository
mvn -f ../../pom.xml clean install -DskipTests -P pre-release -Dmaven.repo.local=$REPO_DIR
mvn -f ../../karate-netty/pom.xml install -DskipTests -P fatjar -Dmaven.repo.local=$REPO_DIR
mvn -f ../../karate-example/pom.xml test-compile exec:java -Dexec.mainClass=common.Main -Dexec.classpathScope=test -Dmaven.repo.local=$REPO_DIR
mvn -f ../../karate-example/pom.xml dependency:resolve test-compile exec:java -Dexec.mainClass=common.Main -Dexec.classpathScope=test -Dmaven.repo.local=$REPO_DIR
cp ../../karate-netty/target/karate-1.0.0.jar target/karate.jar
docker build -t karate-chrome .

0 comments on commit 4f82ec0

Please sign in to comment.