Repository: maven Updated Branches: refs/heads/master 8d16c2256 -> 0a5351340
Work around a rounding bug existed upto Java 7 See http://stackoverflow.com/q/22797964/696632 and Oracle's bugfix announcement: http://www.oracle.com/technetwork/java/javase/8-compatibility-guide-2156366.html Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0a535134 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0a535134 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0a535134 Branch: refs/heads/master Commit: 0a5351340df0df48c4c1d95c021bdf3f4f278ee6 Parents: 8d16c22 Author: Michael Osipov <micha...@apache.org> Authored: Wed Feb 24 23:27:33 2016 +0100 Committer: Michael Osipov <micha...@apache.org> Committed: Wed Feb 24 23:28:46 2016 +0100 ---------------------------------------------------------------------- .../maven/cli/transfer/FileSizeFormatTest.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/0a535134/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java index ff81e93..44bc1b3 100644 --- a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java @@ -21,6 +21,8 @@ package org.apache.maven.cli.transfer; import java.util.Locale; +import org.apache.commons.lang3.JavaVersion; +import org.apache.commons.lang3.SystemUtils; import org.apache.maven.cli.transfer.AbstractMavenTransferListener.FileSizeFormat; import org.apache.maven.cli.transfer.AbstractMavenTransferListener.FileSizeFormat.ScaleUnit; @@ -134,7 +136,10 @@ public class FileSizeFormatTest { long _50_bytes = 50L; assertEquals( "50 B", format.format( _50_bytes ) ); assertEquals( "50 B", format.format( _50_bytes, ScaleUnit.BYTE ) ); - assertEquals( "0.1 kB", format.format( _50_bytes, ScaleUnit.KILOBYTE ) ); + if ( SystemUtils.isJavaVersionAtLeast( JavaVersion.JAVA_1_8 ) ) + { + assertEquals( "0.1 kB", format.format( _50_bytes, ScaleUnit.KILOBYTE ) ); + } assertEquals( "0 MB", format.format( _50_bytes, ScaleUnit.MEGABYTE ) ); assertEquals( "0 GB", format.format( _50_bytes, ScaleUnit.GIGABYTE ) ); @@ -163,7 +168,10 @@ public class FileSizeFormatTest { assertEquals( "50 kB", format.format( _50_kilobytes ) ); assertEquals( "50000 B", format.format( _50_kilobytes, ScaleUnit.BYTE ) ); assertEquals( "50 kB", format.format( _50_kilobytes, ScaleUnit.KILOBYTE ) ); - assertEquals( "0.1 MB", format.format( _50_kilobytes, ScaleUnit.MEGABYTE ) ); + if ( SystemUtils.isJavaVersionAtLeast( JavaVersion.JAVA_1_8 ) ) + { + assertEquals( "0.1 MB", format.format( _50_kilobytes, ScaleUnit.MEGABYTE ) ); + } assertEquals( "0 GB", format.format( _50_kilobytes, ScaleUnit.GIGABYTE ) ); long _999_kilobytes = 999L * 1000L; @@ -192,7 +200,10 @@ public class FileSizeFormatTest { assertEquals( "50000000 B", format.format( _50_megabytes, ScaleUnit.BYTE ) ); assertEquals( "50000 kB", format.format( _50_megabytes, ScaleUnit.KILOBYTE ) ); assertEquals( "50 MB", format.format( _50_megabytes, ScaleUnit.MEGABYTE ) ); - assertEquals( "0.1 GB", format.format( _50_megabytes, ScaleUnit.GIGABYTE ) ); + if ( SystemUtils.isJavaVersionAtLeast( JavaVersion.JAVA_1_8 ) ) + { + assertEquals( "0.1 GB", format.format( _50_megabytes, ScaleUnit.GIGABYTE ) ); + } long _999_megabytes = 999L * 1000L * 1000L; assertEquals( "999 MB", format.format( _999_megabytes ) );
