1 files changed, 9 insertions, 25 deletions

diff --git a/tests/src/cgeo/geocaching/test/WhitespaceTest.java b/tests/src/cgeo/geocaching/test/WhitespaceTest.java
index d2d21dc..a78f2fa 100644
--- a/tests/src/cgeo/geocaching/test/WhitespaceTest.java
+++ b/tests/src/cgeo/geocaching/test/WhitespaceTest.java
@@ -1,17 +1,11 @@
 package cgeo.geocaching.test;
 
 
-import cgeo.geocaching.Settings;
 import cgeo.geocaching.utils.BaseUtils;
+import cgeo.geocaching.utils.Log;
 
 import org.apache.commons.lang3.StringUtils;
 
-import android.test.AndroidTestCase;
-import android.util.Log;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -20,25 +14,15 @@ import java.util.regex.Pattern;
  * It does not test semantical correctness.
  *
  */
-public class WhitespaceTest extends AndroidTestCase {
+public class WhitespaceTest extends AbstractResourceInstrumentationTestCase {
 
     private final static int EXPECTED_SIZE = 122907;
     private String data;
 
     @Override
     protected void setUp() throws Exception {
-        final StringBuilder buffer = new StringBuilder(4096);
-        final InputStream is = this.getClass().getResourceAsStream("/cgeo/geocaching/test/mock/GC2CJPF.html");
-        final BufferedReader br = new BufferedReader(new InputStreamReader(is), 4096);
-
-        String line = null;
-
-        while ((line = br.readLine()) != null) {
-            buffer.append(line).append('\n');
-        }
-        data = buffer.toString();
-
-        br.close();
+        super.setUp();
+        data = getFileContent(R.raw.gc2cjpf_html);
     }
 
     /**
@@ -79,7 +63,7 @@ public class WhitespaceTest extends AndroidTestCase {
         String result = matcher.replaceAll(" ").trim();
         final long end = System.currentTimeMillis();
         assertEquals(EXPECTED_SIZE - 1, result.length());
-        Log.d(Settings.tag, (end - start) + " ms regex");
+        Log.d((end - start) + " ms regex");
     }
 
     public void testReplaceAll() {
@@ -87,7 +71,7 @@ public class WhitespaceTest extends AndroidTestCase {
         String result = data.replaceAll("\\s+", " ");
         final long end = System.currentTimeMillis();
         assertEquals(EXPECTED_SIZE + 1, result.length());
-        Log.d(Settings.tag, (end - start) + " ms replaceAll");
+        Log.d((end - start) + " ms replaceAll");
     }
 
     public void testActualImplementation() {
@@ -96,7 +80,7 @@ public class WhitespaceTest extends AndroidTestCase {
         result = BaseUtils.replaceWhitespace(data);
         final long end = System.currentTimeMillis();
         assertEquals(EXPECTED_SIZE, result.length());
-        Log.d(Settings.tag, (end - start) + " ms actual implementation");
+        Log.d((end - start) + " ms actual implementation");
     }
 
     public void testManually() {
@@ -105,7 +89,7 @@ public class WhitespaceTest extends AndroidTestCase {
         result = replaceWhitespaceManually(data);
         final long end = System.currentTimeMillis();
         assertEquals(EXPECTED_SIZE, result.length());
-        Log.d(Settings.tag, (end - start) + " ms manually");
+        Log.d((end - start) + " ms manually");
     }
 
     public void testStringUtils() {
@@ -114,6 +98,6 @@ public class WhitespaceTest extends AndroidTestCase {
         result = replaceWhitespaceStringUtils(data);
         final long end = System.currentTimeMillis();
         assertEquals(EXPECTED_SIZE - 1, result.length());
-        Log.d(Settings.tag, (end - start) + " ms StringUtils");
+        Log.d((end - start) + " ms StringUtils");
     }
 }
\ No newline at end of file