Repository: wicket Updated Branches: refs/heads/master 0f64e1f9e -> 8f63eeee3
WICKET-6580 use standard units KB,MB,GB,TB Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8f63eeee Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8f63eeee Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8f63eeee Branch: refs/heads/master Commit: 8f63eeee3256abee2914aad7bdf57f2624a23cbf Parents: 0f64e1f Author: Sven Meier <[email protected]> Authored: Wed Aug 29 17:36:52 2018 +0200 Committer: Sven Meier <[email protected]> Committed: Wed Aug 29 17:37:06 2018 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/util/lang/Bytes.java | 8 ++++---- .../org/apache/wicket/util/lang/BytesTest.java | 10 +++++----- .../org/apache/wicket/util/size/BytesTest.java | 20 ++++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/8f63eeee/wicket-util/src/main/java/org/apache/wicket/util/lang/Bytes.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/lang/Bytes.java b/wicket-util/src/main/java/org/apache/wicket/util/lang/Bytes.java index 04cdc7d..87476e4 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/lang/Bytes.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/lang/Bytes.java @@ -386,22 +386,22 @@ public final class Bytes extends LongValue { if (terabytes() >= 1.0) { - return unitString(terabytes(), "T", locale); + return unitString(terabytes(), "TB", locale); } if (gigabytes() >= 1.0) { - return unitString(gigabytes(), "G", locale); + return unitString(gigabytes(), "GB", locale); } if (megabytes() >= 1.0) { - return unitString(megabytes(), "M", locale); + return unitString(megabytes(), "MB", locale); } if (kilobytes() >= 1.0) { - return unitString(kilobytes(), "K", locale); + return unitString(kilobytes(), "KB", locale); } return Long.toString(value) + " bytes"; http://git-wip-us.apache.org/repos/asf/wicket/blob/8f63eeee/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java index ec2c5c0..bfa6b93 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/lang/BytesTest.java @@ -148,11 +148,11 @@ public class BytesTest extends Assert public void testToString() { assertEquals("1 bytes", Bytes.bytes(1).toString()); - assertEquals("1K", Bytes.bytes(1024).toString()); - assertEquals("1M", Bytes.bytes(1024 * 1024L).toString()); - assertEquals("1G", Bytes.bytes(1024 * 1024 * 1024L).toString()); - assertEquals("1T", Bytes.bytes(1024 * 1024 * 1024 * 1024L).toString()); - assertEquals("1.5K", Bytes.bytes(1024 * 1.5).toString()); + assertEquals("1KB", Bytes.bytes(1024).toString()); + assertEquals("1MB", Bytes.bytes(1024 * 1024L).toString()); + assertEquals("1GB", Bytes.bytes(1024 * 1024 * 1024L).toString()); + assertEquals("1TB", Bytes.bytes(1024 * 1024 * 1024 * 1024L).toString()); + assertEquals("1.5KB", Bytes.bytes(1024 * 1.5).toString()); assertEquals("1 bytes", Bytes.bytes(1).toString(Locale.GERMAN)); } http://git-wip-us.apache.org/repos/asf/wicket/blob/8f63eeee/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java index f0fc62f..3f74671 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/size/BytesTest.java @@ -65,7 +65,7 @@ public final class BytesTest extends Assert { assertTrue(Bytes.bytes(1024).equals(Bytes.kilobytes(1))); assertTrue(Bytes.bytes(1024 * 1024).equals(Bytes.megabytes(1))); - assertTrue("1G".equals(Bytes.gigabytes(1).toString())); + assertTrue("1GB".equals(Bytes.gigabytes(1).toString())); final Bytes b = Bytes.kilobytes(7.3); @@ -84,8 +84,8 @@ public final class BytesTest extends Assert public void stringOperationsDotLocale() throws StringValueConversionException { Locale.setDefault(Locale.UK); - assertTrue("1G".equals(Bytes.gigabytes(1).toString())); - assertTrue(Bytes.valueOf("15.5K").bytes() == ((15 * 1024) + 512)); + assertTrue("1GB".equals(Bytes.gigabytes(1).toString())); + assertTrue(Bytes.valueOf("15.5KB").bytes() == ((15 * 1024) + 512)); final Bytes b = Bytes.kilobytes(7.3); @@ -100,8 +100,8 @@ public final class BytesTest extends Assert public void stringOperationsCommaLocale() throws StringValueConversionException { Locale.setDefault(Locale.GERMANY); - assertTrue("1G".equals(Bytes.gigabytes(1).toString())); - assertTrue(Bytes.valueOf("15,5K").bytes() == ((15 * 1024) + 512)); + assertTrue("1GB".equals(Bytes.gigabytes(1).toString())); + assertTrue(Bytes.valueOf("15,5KB").bytes() == ((15 * 1024) + 512)); final Bytes b = Bytes.kilobytes(7.3); @@ -115,14 +115,14 @@ public final class BytesTest extends Assert @Test public void allOperationsExplicitLocale() throws StringValueConversionException { - assertTrue("1G".equals(Bytes.gigabytes(1).toString())); - assertTrue("1,5G".equals(Bytes.gigabytes(1.5).toString(Locale.GERMAN))); - assertTrue("1.5G".equals(Bytes.gigabytes(1.5).toString(Locale.US))); + assertTrue("1GB".equals(Bytes.gigabytes(1).toString())); + assertTrue("1,5GB".equals(Bytes.gigabytes(1.5).toString(Locale.GERMAN))); + assertTrue("1.5GB".equals(Bytes.gigabytes(1.5).toString(Locale.US))); final Bytes b = Bytes.kilobytes(7.3); assertEquals(b, Bytes.valueOf(b.toString(Locale.GERMAN), Locale.GERMAN)); - assertTrue(Bytes.valueOf("15,5K", Locale.GERMAN).bytes() == ((15 * 1024) + 512)); - assertTrue(Bytes.valueOf("15.5K", Locale.US).bytes() == ((15 * 1024) + 512)); + assertTrue(Bytes.valueOf("15,5KB", Locale.GERMAN).bytes() == ((15 * 1024) + 512)); + assertTrue(Bytes.valueOf("15.5KB", Locale.US).bytes() == ((15 * 1024) + 512)); } }
