From 246a60b50b108282f0cb51b52e69482716d30e6a Mon Sep 17 00:00:00 2001 From: David Schlosnagle Date: Thu, 22 Sep 2022 12:49:04 -0400 Subject: [PATCH] Simplify conversions & casts (#388) --- .../humanreadabletypes/HumanReadableByteCount.java | 8 ++++---- .../HumanReadableByteCountTests.java | 11 ++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/human-readable-types/src/main/java/com/palantir/humanreadabletypes/HumanReadableByteCount.java b/human-readable-types/src/main/java/com/palantir/humanreadabletypes/HumanReadableByteCount.java index c593268b..cc110524 100644 --- a/human-readable-types/src/main/java/com/palantir/humanreadabletypes/HumanReadableByteCount.java +++ b/human-readable-types/src/main/java/com/palantir/humanreadabletypes/HumanReadableByteCount.java @@ -302,10 +302,10 @@ public String toString() { public enum ByteUnit { BYTE(1, "bytes"), KiB(1024L, "kibibytes"), - MiB((long) Math.pow((double) 1024L, (double) 2L), "mebibytes"), - GiB((long) Math.pow((double) 1024L, (double) 3L), "gibibytes"), - TiB((long) Math.pow((double) 1024L, (double) 4L), "tebibytes"), - PiB((long) Math.pow((double) 1024L, (double) 5L), "pebibytes"); + MiB((long) Math.pow(1024.0, 2.0), "mebibytes"), + GiB((long) Math.pow(1024.0, 3.0), "gibibytes"), + TiB((long) Math.pow(1024.0, 4.0), "tebibytes"), + PiB((long) Math.pow(1024.0, 5.0), "pebibytes"); private final long multiplier; private final String suffix; diff --git a/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java b/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java index 6c5e004b..bfaa657f 100644 --- a/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java +++ b/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java @@ -44,27 +44,28 @@ public void testParseKibiBytes() { @Test public void testParseMibiBytes() { - assertStringsEqualToBytes((long) (Math.pow(1024.0, 2.0) * 10.0), "10m", "10mb", "10 mibibyte", "10 mibibytes"); + assertStringsEqualToBytes(10L * 1024L * 1024L, "10m", "10mb", "10 mibibyte", "10 " + "mibibytes"); } @Test public void testParseMebiBytes() { - assertStringsEqualToBytes((long) (Math.pow(1024.0, 2.0) * 10.0), "10m", "10mb", "10 mebibyte", "10 mebibytes"); + assertStringsEqualToBytes(10L * 1024L * 1024L, "10m", "10mb", "10 mebibyte", "10 mebibytes"); } @Test public void testParseGibiBytes() { - assertStringsEqualToBytes((long) (Math.pow(1024.0, 3.0) * 10.0), "10g", "10gb", "10 gibibyte", "10 gibibytes"); + assertStringsEqualToBytes(10L * 1024L * 1024L * 1024L, "10g", "10gb", "10 gibibyte", "10 gibibytes"); } @Test public void testParseTebiBytes() { - assertStringsEqualToBytes((long) (Math.pow(1024.0, 4.0) * 10.0), "10t", "10tb", "10 tebibyte", "10 tebibytes"); + assertStringsEqualToBytes(10L * 1024L * 1024L * 1024L * 1024L, "10t", "10tb", "10 tebibyte", "10 tebibytes"); } @Test public void testParsePebiBytes() { - assertStringsEqualToBytes((long) (Math.pow(1024.0, 5.0) * 10.0), "10p", "10pb", "10 pebibyte", "10 pebibytes"); + assertStringsEqualToBytes( + 10L * 1024L * 1024L * 1024L * 1024L * 1024L, "10p", "10pb", "10 pebibyte", "10 " + "pebibytes"); } @Test