sdfsf

apache · Jul 13, 2023 · 83059b3 · 83059b3
1 parent 5e2ddbf
commit 83059b3
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
@@ -46,7 +46,7 @@
   </prerequisites>
 
   <properties>
-    <doxiaVersion>2.0.0-M6</doxiaVersion>
+    <doxiaVersion>2.0.0-M7</doxiaVersion>
     <aetherVersion>1.0.0.v20140518</aetherVersion>
   </properties>
 
@@ -89,12 +89,12 @@
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>4.0.0-M6</version>
+      <version>4.0.0-M7</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
-      <version>4.0.0-M8</version>
+      <version>4.0.0-M9</version>
     </dependency>
     <dependency>
       <groupId>org.fusesource.jansi</groupId>

diff --git a/...plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportRenderer.java b/...plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportRenderer.java
@@ -19,6 +19,8 @@
 package org.apache.maven.plugins.surefire.report;
 
 import java.io.File;
+import java.text.MessageFormat;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -591,4 +593,20 @@ private String javascriptToggleDisplayCode() {
                 + " }" + Markup.EOL
                 + " }";
     }
+
+    public static void main(String[] args) {
+        MessageFormat format = null;
+
+        format = new MessageFormat("{0,choice,0#0%|0.0<{0,number,0.0%}|1#{0,number,0%}}", Locale.ENGLISH);
+
+        for (Float f : Arrays.asList(0f, 0.005f, 0.05f, 0.5f, 0.999f, 1f, 1.01f))
+            System.out.println(format.format(new Object[] {f}));
+        System.out.println("===");
+        format = new MessageFormat(
+                "{0,choice,0#0|0.0<{0,number,0.000}|1.0#{0,number,0.0}|1000#{0,number,0}} s", Locale.ITALY);
+
+        for (Float f : Arrays.asList(
+                0f, 0.05f, 0.999f, 1f, 1.5f, 99.9f, 100f, 100.2f, 500.3f, 999.9f, 1000f, 1000.3f, 1010.4f, 10000f))
+            System.out.println(format.format(new Object[] {f}));
+    }
 }
diff --git a/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml b/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml
@@ -57,7 +57,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>4.0.0-M8</version>
+                <version>4.0.0-M9</version>
             </plugin>
         </plugins>
     </build>