diff --git a/src/main/java/org/jenkinsci/plugins/benchmark/condensed/BooleanCondensed.java b/src/main/java/org/jenkinsci/plugins/benchmark/condensed/BooleanCondensed.java index 821e3dd..66ee103 100644 --- a/src/main/java/org/jenkinsci/plugins/benchmark/condensed/BooleanCondensed.java +++ b/src/main/java/org/jenkinsci/plugins/benchmark/condensed/BooleanCondensed.java @@ -86,7 +86,7 @@ public String getHTMLCondensed(Integer key, ContentDetected detected, char decim content.append(key.toString()); content.append(""); if (detected.isNumeralDetected()) { - content.append("----"); + content.append(""); } content.append(Integer.toString(this.passed)); content.append(""); diff --git a/src/main/java/org/jenkinsci/plugins/benchmark/condensed/StringCondensed.java b/src/main/java/org/jenkinsci/plugins/benchmark/condensed/StringCondensed.java index 391d07c..112694c 100644 --- a/src/main/java/org/jenkinsci/plugins/benchmark/condensed/StringCondensed.java +++ b/src/main/java/org/jenkinsci/plugins/benchmark/condensed/StringCondensed.java @@ -88,7 +88,7 @@ public String getHTMLCondensed(Integer key, ContentDetected detected, char decim content.append(key.toString()); content.append(""); if (detected.isNumeralDetected()) { - content.append("----"); + content.append(""); } content.append(Integer.toString(this.passed)); content.append(""); diff --git a/src/main/java/org/jenkinsci/plugins/benchmark/parsers/MapperBase.java b/src/main/java/org/jenkinsci/plugins/benchmark/parsers/MapperBase.java index 50aa6b7..820ac99 100644 --- a/src/main/java/org/jenkinsci/plugins/benchmark/parsers/MapperBase.java +++ b/src/main/java/org/jenkinsci/plugins/benchmark/parsers/MapperBase.java @@ -225,7 +225,7 @@ public void mergeWith(MapperBase mapper) throws ValidationException { } } if (!detectedParam) { - results.put(baseParam.getKey(), baseParam.getValue()); + parameters.put(baseParam.getKey(), baseParam.getValue()); } } for (Map.Entry baseFile : mapper.getFiles().entrySet()) { diff --git a/src/main/java/org/jenkinsci/plugins/benchmark/results/BooleanValue.java b/src/main/java/org/jenkinsci/plugins/benchmark/results/BooleanValue.java index 6d7d73c..e006b9a 100644 --- a/src/main/java/org/jenkinsci/plugins/benchmark/results/BooleanValue.java +++ b/src/main/java/org/jenkinsci/plugins/benchmark/results/BooleanValue.java @@ -157,7 +157,7 @@ public String getValueAsLocaleString(int build, char decimalSeparator) { if (value == null) { return ""; } else { - return value.toString(); + return "__boolean__"; } } diff --git a/src/main/java/org/jenkinsci/plugins/benchmark/results/TestValue.java b/src/main/java/org/jenkinsci/plugins/benchmark/results/TestValue.java index 20505a9..a2d17b3 100644 --- a/src/main/java/org/jenkinsci/plugins/benchmark/results/TestValue.java +++ b/src/main/java/org/jenkinsci/plugins/benchmark/results/TestValue.java @@ -991,17 +991,17 @@ public String getHTMLResult(Integer key, ContentDetected detected, TreeSet= builds.first(); build--) { String value = this.getValueAsLocaleString(build, decimalSeparator); if (value.isEmpty()) { - content.append("-"); + content.append(""); } else { Boolean failedState = this.getFailedState(build); if (failedState == null){ content.append(""); - content.append(value); + if (!value.equals("__boolean__")) content.append(value); } else { content.append(""); - content.append(value); + content.append("\">"); + if (!value.equals("__boolean__")) content.append(value); if (failedState){ listNFailed.set(index, listNFailed.get(index) + 1); } else { diff --git a/src/main/resources/org/jenkinsci/plugins/benchmark/core/BenchmarkProjectAction/index.jelly b/src/main/resources/org/jenkinsci/plugins/benchmark/core/BenchmarkProjectAction/index.jelly index 4e1a514..db34eae 100644 --- a/src/main/resources/org/jenkinsci/plugins/benchmark/core/BenchmarkProjectAction/index.jelly +++ b/src/main/resources/org/jenkinsci/plugins/benchmark/core/BenchmarkProjectAction/index.jelly @@ -253,20 +253,24 @@ } .hover td:first-child { background-color:#ededed; + text-align: left; } .hover td:nth-child(2) { background-color:#ededed; + text-align: left; } .hover td:nth-child(3) { background-color:#ededed; + text-align: left; } .hover td:nth-child(4) { background-color:#ededed; + text-align: left; } #api_link {