From 923dba1c1bb35790cdfbc8631a802de72afd86d2 Mon Sep 17 00:00:00 2001 From: jomu Date: Sun, 14 Apr 2013 13:40:44 +0000 Subject: [PATCH] fixed unit tests --- .../muehlencord/shared/util/DefaultTest.java | 25 +++++++++++-------- .../shared/util/StringUtilTest.java | 2 +- .../shared/util/file/FileUtilTest.java | 3 +-- .../shared/util/file}/testfile.txt | 0 .../{ => de/muehlencord/shared/util}/test.txt | 0 5 files changed, 16 insertions(+), 14 deletions(-) rename util/src/test/resources/{ => de/muehlencord/shared/util/file}/testfile.txt (100%) rename util/src/test/resources/{ => de/muehlencord/shared/util}/test.txt (100%) diff --git a/util/src/test/java/de/muehlencord/shared/util/DefaultTest.java b/util/src/test/java/de/muehlencord/shared/util/DefaultTest.java index f422761..ca19d84 100644 --- a/util/src/test/java/de/muehlencord/shared/util/DefaultTest.java +++ b/util/src/test/java/de/muehlencord/shared/util/DefaultTest.java @@ -9,25 +9,28 @@ import java.io.InputStream; * @author joern@muehlencord.de */ public class DefaultTest { - - public String readContentFromFile(String name) throws IOException { + + public String readContentFromFile(String name) throws IOException { StringBuilder sb = new StringBuilder(); byte[] buffer = new byte[4096]; - InputStream is = DefaultTest.class.getResourceAsStream(name); - if (is == null) { + + if (DefaultTest.class.getResourceAsStream(name) == null) { throw new IOException("File " + name + " not found"); } - BufferedInputStream bis = new BufferedInputStream(is); - int bytesRead = 0; - while ((bytesRead = bis.read(buffer)) != -1) { - sb.append(new String(buffer, 0, bytesRead)); + try (InputStream is = DefaultTest.class.getResourceAsStream(name); + BufferedInputStream bis = new BufferedInputStream(is);) { + int bytesRead = 0; + while (bytesRead != -1) { + bytesRead = bis.read(buffer); + if (bytesRead != -1) { + sb.append(new String(buffer, 0, bytesRead)); + } + } + bis.close(); } - bis.close(); - is.close(); return sb.toString(); } - } diff --git a/util/src/test/java/de/muehlencord/shared/util/StringUtilTest.java b/util/src/test/java/de/muehlencord/shared/util/StringUtilTest.java index fffd4d8..89e9255 100644 --- a/util/src/test/java/de/muehlencord/shared/util/StringUtilTest.java +++ b/util/src/test/java/de/muehlencord/shared/util/StringUtilTest.java @@ -15,7 +15,7 @@ public class StringUtilTest extends DefaultTest { @Test public void testGetValueBetweenKeywords() throws ParseException, IOException { - String content = readContentFromFile("/test.txt"); + String content = readContentFromFile("test.txt"); String ipAddress = StringUtil.getValueBetweenKeywords(content, "The IP", "has just"); assertEquals ("ipAddress", "222.184.230.118", ipAddress); diff --git a/util/src/test/java/de/muehlencord/shared/util/file/FileUtilTest.java b/util/src/test/java/de/muehlencord/shared/util/file/FileUtilTest.java index 2fda4f0..9da78ed 100644 --- a/util/src/test/java/de/muehlencord/shared/util/file/FileUtilTest.java +++ b/util/src/test/java/de/muehlencord/shared/util/file/FileUtilTest.java @@ -26,8 +26,7 @@ public class FileUtilTest { public void testGetFilesFromDirecotry() throws FileHandlingException, URISyntaxException { System.out.println("testGetFilesFromDirectory"); - - URL url = getClass().getResource("/testfile.txt"); + URL url = getClass().getResource("testfile.txt"); File testFile = new File(url.getFile()); List fileList = FileUtil.getFilesFromDirecotry(testFile.getParent(), ".*.java"); diff --git a/util/src/test/resources/testfile.txt b/util/src/test/resources/de/muehlencord/shared/util/file/testfile.txt similarity index 100% rename from util/src/test/resources/testfile.txt rename to util/src/test/resources/de/muehlencord/shared/util/file/testfile.txt diff --git a/util/src/test/resources/test.txt b/util/src/test/resources/de/muehlencord/shared/util/test.txt similarity index 100% rename from util/src/test/resources/test.txt rename to util/src/test/resources/de/muehlencord/shared/util/test.txt