Move new class and test it explicitly

Gary Gregory · Gary Gregory · commit 83ac402ffefb · 2022-07-26T10:34:09.000-04:00
As opposed to testing it by running other code.
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -80,6 +80,7 @@
 import org.apache.commons.io.filefilter.SuffixFileFilter;
 import org.apache.commons.io.filefilter.TrueFileFilter;
 import org.apache.commons.io.function.IOConsumer;
+import org.apache.commons.io.function.Uncheck;
 
 /**
  * General file manipulation utilities.
diff --git a/src/main/java/org/apache/commons/io/file/FilesUncheck.java b/src/main/java/org/apache/commons/io/file/FilesUncheck.java
@@ -44,7 +44,7 @@
 import java.util.Set;
 import java.util.stream.Stream;
 
-import org.apache.commons.io.Uncheck;
+import org.apache.commons.io.function.Uncheck;
 
 /**
  * Delegates to {@link Files} to uncheck calls by throwing {@link UncheckedIOException} instead of {@link IOException}.
diff --git a/src/main/java/org/apache/commons/io/file/PathUtils.java b/src/main/java/org/apache/commons/io/file/PathUtils.java
@@ -71,11 +71,11 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.Uncheck;
 import org.apache.commons.io.file.Counters.PathCounters;
 import org.apache.commons.io.file.attribute.FileTimes;
 import org.apache.commons.io.filefilter.IOFileFilter;
 import org.apache.commons.io.function.IOFunction;
+import org.apache.commons.io.function.Uncheck;
 
 /**
  * NIO Path utilities.
diff --git a/src/main/java/org/apache/commons/io/function/IOPredicate.java b/src/main/java/org/apache/commons/io/function/IOPredicate.java
@@ -22,8 +22,6 @@
 import java.util.Objects;
 import java.util.function.Predicate;
 
-import org.apache.commons.io.Uncheck;
-
 /**
  * Like {@link Predicate} but throws {@link IOException}.
  *
diff --git a/src/main/java/org/apache/commons/io/function/Uncheck.java b/src/main/java/org/apache/commons/io/function/Uncheck.java
@@ -15,22 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.io;
+package org.apache.commons.io.function;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
 
-import org.apache.commons.io.function.IOBiConsumer;
-import org.apache.commons.io.function.IOBiFunction;
-import org.apache.commons.io.function.IOConsumer;
-import org.apache.commons.io.function.IOFunction;
-import org.apache.commons.io.function.IOPredicate;
-import org.apache.commons.io.function.IOQuadFunction;
-import org.apache.commons.io.function.IORunnable;
-import org.apache.commons.io.function.IOSupplier;
-import org.apache.commons.io.function.IOTriConsumer;
-import org.apache.commons.io.function.IOTriFunction;
-
 /**
  * Unchecks calls by throwing {@link UncheckedIOException} instead of {@link IOException}.
  *
diff --git a/src/main/java/org/apache/commons/io/input/UncheckedBufferedReader.java b/src/main/java/org/apache/commons/io/input/UncheckedBufferedReader.java
@@ -23,7 +23,7 @@
 import java.io.UncheckedIOException;
 import java.nio.CharBuffer;
 
-import org.apache.commons.io.Uncheck;
+import org.apache.commons.io.function.Uncheck;
 
 /**
  * A {@link BufferedReader} that throws {@link UncheckedIOException} instead of {@link IOException}.
diff --git a/src/main/java/org/apache/commons/io/input/UncheckedFilterInputStream.java b/src/main/java/org/apache/commons/io/input/UncheckedFilterInputStream.java
@@ -24,7 +24,7 @@
 import java.io.InputStream;
 import java.io.UncheckedIOException;
 
-import org.apache.commons.io.Uncheck;
+import org.apache.commons.io.function.Uncheck;
 
 /**
  * A {@link BufferedReader} that throws {@link UncheckedIOException} instead of {@link IOException}.
diff --git a/src/main/java/org/apache/commons/io/input/UncheckedFilterReader.java b/src/main/java/org/apache/commons/io/input/UncheckedFilterReader.java
@@ -23,7 +23,7 @@
 import java.io.UncheckedIOException;
 import java.nio.CharBuffer;
 
-import org.apache.commons.io.Uncheck;
+import org.apache.commons.io.function.Uncheck;
 
 /**
  * A {@link FilterReader} that throws {@link UncheckedIOException} instead of {@link IOException}.
diff --git a/src/main/java/org/apache/commons/io/output/UncheckedAppendableImpl.java b/src/main/java/org/apache/commons/io/output/UncheckedAppendableImpl.java
@@ -21,7 +21,7 @@
 import java.io.UncheckedIOException;
 import java.util.Objects;
 
-import org.apache.commons.io.Uncheck;
+import org.apache.commons.io.function.Uncheck;
 
 /**
  * An {@link Appendable} implementation that throws {@link UncheckedIOException} instead of {@link IOException}.
diff --git a/src/main/java/org/apache/commons/io/output/UncheckedFilterOutputStream.java b/src/main/java/org/apache/commons/io/output/UncheckedFilterOutputStream.java
@@ -22,7 +22,7 @@
 import java.io.OutputStream;
 import java.io.UncheckedIOException;
 
-import org.apache.commons.io.Uncheck;
+import org.apache.commons.io.function.Uncheck;
 
 /**
  * A {@link FilterOutputStream} that throws {@link UncheckedIOException} instead of {@link UncheckedIOException}.
diff --git a/src/main/java/org/apache/commons/io/output/UncheckedFilterWriter.java b/src/main/java/org/apache/commons/io/output/UncheckedFilterWriter.java
@@ -22,7 +22,7 @@
 import java.io.UncheckedIOException;
 import java.io.Writer;
 
-import org.apache.commons.io.Uncheck;
+import org.apache.commons.io.function.Uncheck;
 
 /**
  * A {@link FilterWriter} that throws {@link UncheckedIOException} instead of {@link IOException}.
diff --git a/src/test/java/org/apache/commons/io/UncheckedIOExceptionsTest.java b/src/test/java/org/apache/commons/io/UncheckedIOExceptionsTest.java
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 
+import org.apache.commons.io.function.Uncheck;
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/src/test/java/org/apache/commons/io/UncheckedIOTest.java b/src/test/java/org/apache/commons/io/UncheckedIOTest.java
@@ -27,6 +27,7 @@
 import org.apache.commons.io.function.IORunnable;
 import org.apache.commons.io.function.IOSupplier;
 import org.apache.commons.io.function.IOTriFunction;
+import org.apache.commons.io.function.Uncheck;
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/src/test/java/org/apache/commons/io/file/FilesUncheckTest.java b/src/test/java/org/apache/commons/io/file/FilesUncheckTest.java
@@ -52,7 +52,7 @@
 import java.util.Set;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.Uncheck;
+import org.apache.commons.io.function.Uncheck;
 import org.apache.commons.io.input.NullInputStream;
 import org.apache.commons.io.output.NullOutputStream;
 import org.apache.commons.lang3.ArrayUtils;
diff --git a/src/test/java/org/apache/commons/io/function/IOConsumerTest.java b/src/test/java/org/apache/commons/io/function/IOConsumerTest.java
@@ -27,7 +27,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.Uncheck;
 import org.apache.commons.io.file.PathUtils;
 import org.apache.commons.io.test.ThrowOnCloseReader;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/apache/commons/io/function/TestConstants.java b/src/test/java/org/apache/commons/io/function/TestConstants.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.io.function;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.util.function.Predicate;
+
+/**
+ * Test fixtures for this package.
+ */
+class TestConstants {
+
+    static IOConsumer<Object> THROWING_IO_CONSUMER = t -> {
+        throw new IOException("Failure");
+    };
+
+    static IOFunction<Object, Object> THROWING_IO_FUNCTION = t -> {
+        throw new IOException("Failure");
+    };
+
+    static IOBiFunction<Object, Object, Object> THROWING_IO_BI_FUNCTION = (t, u) -> {
+        throw new IOException("Failure");
+    };
+
+    static IOTriFunction<Object, Object, Object, Object> THROWING_IO_TRI_FUNCTION = (t, u, v) -> {
+        throw new IOException("Failure");
+    };
+
+    static IOQuadFunction<Object, Object, Object, Object, Object> THROWING_IO_QUAD_FUNCTION = (t, u, v, w) -> {
+        throw new IOException("Failure");
+    };
+
+    static IOSupplier<Object> THROWING_IO_SUPPLIER = () -> {
+        throw new IOException("Failure");
+    };
+
+    static IORunnable THROWING_IO_RUNNABLE = () -> {
+        throw new IOException("Failure");
+    };
+
+    static IOBiConsumer<Object, Object> THROWING_IO_BI_CONSUMER = (t, u) -> {
+        throw new IOException("Failure");
+    };
+
+    static IOTriConsumer<Object, Object, Object> THROWING_IO_TRI_CONSUMER = (t, u, v) -> {
+        throw new IOException("Failure");
+    };
+
+    static IOPredicate<Object> THROWING_IO_PREDICATE = t -> {
+        throw new IOException("Failure");
+    };
+
+    static Predicate<Object> THROWING_PREDICATE = t -> {
+        throw new UncheckedIOException(new IOException("Failure"));
+    };
+
+}
diff --git a/src/test/java/org/apache/commons/io/function/UncheckTest.java b/src/test/java/org/apache/commons/io/function/UncheckTest.java

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@`
`22`	`22`	`import java.util.Objects;`
`23`	`23`	`import java.util.function.Predicate;`
`24`	`24`
`25`		`-import org.apache.commons.io.Uncheck;`
`26`		`-`
`27`	`25`	`/**`
`28`	`26`	`* Like {@link Predicate} but throws {@link IOException}.`
`29`	`27`	`*`