This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push:
new 7d3f6df7 Fix overflow for `FileUtilsTest` constants (#456)
7d3f6df7 is described below
commit 7d3f6df7fee9e429988cac0697249a1ddbcf0cd2
Author: Marcono1234 <marcono1...@users.noreply.github.com>
AuthorDate: Sun May 7 13:38:42 2023 +0200
Fix overflow for `FileUtilsTest` constants (#456)
The expression `1024 * 1024 * 1024 * 2 - 1` actually overflows twice:
1024 * 1024 * 1024 * 2 = -2147483648
-2147483648 - 1 = 2147483647
While this produces the desired end result (2147483647), it is probably
saner to avoid the overflow in the first place.
---
src/test/java/org/apache/commons/io/FileUtilsTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTest.java
b/src/test/java/org/apache/commons/io/FileUtilsTest.java
index dae19644..cd38f587 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTest.java
@@ -513,7 +513,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
assertEquals("1 GB", FileUtils.byteCountToDisplaySize(1024 * 1024 *
1024));
assertEquals("1 GB", FileUtils.byteCountToDisplaySize(1024 * 1024 *
1025));
assertEquals("2 GB", FileUtils.byteCountToDisplaySize(1024L * 1024 *
1024 * 2));
- assertEquals("1 GB", FileUtils.byteCountToDisplaySize(1024 * 1024 *
1024 * 2 - 1));
+ assertEquals("1 GB", FileUtils.byteCountToDisplaySize(1024L * 1024 *
1024 * 2 - 1));
assertEquals("1 TB", FileUtils.byteCountToDisplaySize(1024L * 1024 *
1024 * 1024));
assertEquals("1 PB", FileUtils.byteCountToDisplaySize(1024L * 1024 *
1024 * 1024 * 1024));
assertEquals("1 EB", FileUtils.byteCountToDisplaySize(1024L * 1024 *
1024 * 1024 * 1024 * 1024));
@@ -538,7 +538,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
assertEquals("1 GB",
FileUtils.byteCountToDisplaySize(Long.valueOf(1024 * 1024 * 1024)));
assertEquals("1 GB",
FileUtils.byteCountToDisplaySize(Long.valueOf(1024 * 1024 * 1025)));
assertEquals("2 GB",
FileUtils.byteCountToDisplaySize(Long.valueOf(1024L * 1024 * 1024 * 2)));
- assertEquals("1 GB",
FileUtils.byteCountToDisplaySize(Long.valueOf(1024 * 1024 * 1024 * 2 - 1)));
+ assertEquals("1 GB",
FileUtils.byteCountToDisplaySize(Long.valueOf(1024L * 1024 * 1024 * 2 - 1)));
assertEquals("1 TB",
FileUtils.byteCountToDisplaySize(Long.valueOf(1024L * 1024 * 1024 * 1024)));
assertEquals("1 PB",
FileUtils.byteCountToDisplaySize(Long.valueOf(1024L * 1024 * 1024 * 1024 *
1024)));
assertEquals("1 EB",
FileUtils.byteCountToDisplaySize(Long.valueOf(1024L * 1024 * 1024 * 1024 * 1024
* 1024)));
