From 58c1ad6cb8dd10516579caa6398b5b01df7a3e52 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Tue, 10 Jun 2014 16:30:48 -0500
Subject: [PATCH] Refactor shared load() method to BaseTest

---
 tool/test/org/antlr/v4/test/BaseTest.java     | 27 +++++++++++++++++++
 .../test/org/antlr/v4/test/TestLexerExec.java | 27 -------------------
 .../org/antlr/v4/test/TestPerformance.java    | 27 -------------------
 3 files changed, 27 insertions(+), 54 deletions(-)

diff --git a/tool/test/org/antlr/v4/test/BaseTest.java b/tool/test/org/antlr/v4/test/BaseTest.java
index 50d6afe35..850d9a040 100644
--- a/tool/test/org/antlr/v4/test/BaseTest.java
+++ b/tool/test/org/antlr/v4/test/BaseTest.java
@@ -335,6 +335,33 @@ public abstract class BaseTest {
 		return null;
 	}
 
+	protected String load(String fileName, @Nullable String encoding)
+		throws IOException
+	{
+		if ( fileName==null ) {
+			return null;
+		}
+
+		String fullFileName = getClass().getPackage().getName().replace('.', '/') + '/' + fileName;
+		int size = 65000;
+		InputStreamReader isr;
+		InputStream fis = getClass().getClassLoader().getResourceAsStream(fullFileName);
+		if ( encoding!=null ) {
+			isr = new InputStreamReader(fis, encoding);
+		}
+		else {
+			isr = new InputStreamReader(fis);
+		}
+		try {
+			char[] data = new char[size];
+			int n = isr.read(data);
+			return new String(data, 0, n);
+		}
+		finally {
+			isr.close();
+		}
+	}
+
 	/** Wow! much faster than compiling outside of VM. Finicky though.
 	 *  Had rules called r and modulo. Wouldn't compile til I changed to 'a'.
 	 */
diff --git a/tool/test/org/antlr/v4/test/TestLexerExec.java b/tool/test/org/antlr/v4/test/TestLexerExec.java
index 5dccd3433..32aee67ba 100644
--- a/tool/test/org/antlr/v4/test/TestLexerExec.java
+++ b/tool/test/org/antlr/v4/test/TestLexerExec.java
@@ -657,31 +657,4 @@ public class TestLexerExec extends BaseTest {
 			"[@1,5:4='<EOF>',<-1>,1:5]\n";
 		assertEquals(expecting, found);
 	}
-
-	protected String load(String fileName, @Nullable String encoding)
-		throws IOException
-	{
-		if ( fileName==null ) {
-			return null;
-		}
-
-		String fullFileName = getClass().getPackage().getName().replace('.', '/') + '/' + fileName;
-		int size = 65000;
-		InputStreamReader isr;
-		InputStream fis = getClass().getClassLoader().getResourceAsStream(fullFileName);
-		if ( encoding!=null ) {
-			isr = new InputStreamReader(fis, encoding);
-		}
-		else {
-			isr = new InputStreamReader(fis);
-		}
-		try {
-			char[] data = new char[size];
-			int n = isr.read(data);
-			return new String(data, 0, n);
-		}
-		finally {
-			isr.close();
-		}
-	}
 }
diff --git a/tool/test/org/antlr/v4/test/TestPerformance.java b/tool/test/org/antlr/v4/test/TestPerformance.java
index 4e1cf1671..e24e1487b 100644
--- a/tool/test/org/antlr/v4/test/TestPerformance.java
+++ b/tool/test/org/antlr/v4/test/TestPerformance.java
@@ -1134,33 +1134,6 @@ public class TestPerformance extends BaseTest {
         assertTrue(success);
     }
 
-    protected String load(String fileName, @Nullable String encoding)
-        throws IOException
-    {
-        if ( fileName==null ) {
-            return null;
-        }
-
-        String fullFileName = getClass().getPackage().getName().replace('.', '/') + '/' + fileName;
-        int size = 65000;
-        InputStreamReader isr;
-        InputStream fis = getClass().getClassLoader().getResourceAsStream(fullFileName);
-        if ( encoding!=null ) {
-            isr = new InputStreamReader(fis, encoding);
-        }
-        else {
-            isr = new InputStreamReader(fis);
-        }
-        try {
-            char[] data = new char[size];
-            int n = isr.read(data);
-            return new String(data, 0, n);
-        }
-        finally {
-            isr.close();
-        }
-    }
-
 	private static void updateChecksum(Checksum checksum, int value) {
 		checksum.update((value) & 0xFF);
 		checksum.update((value >>> 8) & 0xFF);