[commons-imaging] branch master updated: Change ImagingTestConstants from an interface to a class.

[gg...@apache.org]

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-imaging.git


The following commit(s) were added to refs/heads/master by this push:
     new dee0061  Change ImagingTestConstants from an interface to a class.
dee0061 is described below

commit dee0061e877debc6171c291a4929cb774c19e514
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Mar 31 09:48:10 2019 -0400

    Change ImagingTestConstants from an interface to a class.
---
 .../java/org/apache/commons/imaging/ImagingGuessFormatTest.java    | 2 +-
 src/test/java/org/apache/commons/imaging/ImagingTest.java          | 7 +++----
 src/test/java/org/apache/commons/imaging/ImagingTestConstants.java | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java b/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
index ac0118a..f9eb788 100644
--- a/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
+++ b/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
@@ -80,7 +80,7 @@ public class ImagingGuessFormatTest extends ImagingTest {
     @Test
     public void testGuessFormat() throws Exception {
         final String imagePath = FilenameUtils.separatorsToSystem(pathToFile);
-        final File imageFile = new File(TEST_IMAGE_FOLDER, imagePath);
+        final File imageFile = new File(ImagingTestConstants.TEST_IMAGE_FOLDER, imagePath);
 
         final ImageFormat guessedFormat = Imaging.guessFormat(imageFile);
         assertEquals(expectedFormat, guessedFormat);
diff --git a/src/test/java/org/apache/commons/imaging/ImagingTest.java b/src/test/java/org/apache/commons/imaging/ImagingTest.java
index a66fafc..0f6ad8e 100644
--- a/src/test/java/org/apache/commons/imaging/ImagingTest.java
+++ b/src/test/java/org/apache/commons/imaging/ImagingTest.java
@@ -29,8 +29,7 @@ import org.apache.commons.imaging.test.util.FileSystemTraversal;
 import org.junit.Rule;
 import org.junit.rules.TemporaryFolder;
 
-public abstract class ImagingTest implements
-        ImagingTestConstants {
+public abstract class ImagingTest {
 
     @Rule
     public TemporaryFolder folder = new TemporaryFolder();
@@ -42,7 +41,7 @@ public abstract class ImagingTest implements
 
     protected boolean isPhilHarveyTestImage(final File file) {
         return file.getAbsolutePath().startsWith(
-                PHIL_HARVEY_TEST_IMAGE_FOLDER.getAbsolutePath());
+                ImagingTestConstants.PHIL_HARVEY_TEST_IMAGE_FOLDER.getAbsolutePath());
     }
 
     public interface ImageFilter {
@@ -85,7 +84,7 @@ public abstract class ImagingTest implements
     private static final List<File> ALL_IMAGES = new ArrayList<>();
 
     static {
-        File imagesFolder = TEST_IMAGE_FOLDER;
+        File imagesFolder = ImagingTestConstants.TEST_IMAGE_FOLDER;
 
         imagesFolder = imagesFolder.getAbsoluteFile();
 
diff --git a/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java b/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java
index d28ceb1..b342725 100644
--- a/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java
+++ b/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java
@@ -21,7 +21,7 @@ import java.io.File;
 
 import org.apache.commons.io.FilenameUtils;
 
-public interface ImagingTestConstants {
+public class ImagingTestConstants {
 
     static final File PHIL_HARVEY_TEST_IMAGE_FOLDER = new File(
             FilenameUtils.separatorsToSystem(