From f343ce2ae1124cd8563772836301932e221a20ee Mon Sep 17 00:00:00 2001
From: Kenji Nagahashi <kenji@archive.org>
Date: Tue, 26 Aug 2014 10:56:35 -0700
Subject: [PATCH] suppress JUnit 4 dependency through hbase-client. rewrite
 WbmPersistLoadProcessorTest for JUnit 3.   (also disable a test that depends
 on production CDX server)

---
 contrib/pom.xml                               |  4 +++
 .../wbm/WbmPersistLoadProcessorTest.java      | 27 +++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/contrib/pom.xml b/contrib/pom.xml
index 9ecbdffd..41d36ae0 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -23,6 +23,10 @@
 					<artifactId>jets3t</artifactId>
 					<groupId>net.java.dev.jets3t</groupId>
 				</exclusion>
+				<exclusion>
+					<artifactId>junit</artifactId>
+					<groupId>junit</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
diff --git a/contrib/src/test/java/org/archive/modules/recrawl/wbm/WbmPersistLoadProcessorTest.java b/contrib/src/test/java/org/archive/modules/recrawl/wbm/WbmPersistLoadProcessorTest.java
index 36d6b900..88d1c0cf 100644
--- a/contrib/src/test/java/org/archive/modules/recrawl/wbm/WbmPersistLoadProcessorTest.java
+++ b/contrib/src/test/java/org/archive/modules/recrawl/wbm/WbmPersistLoadProcessorTest.java
@@ -1,9 +1,5 @@
 package org.archive.modules.recrawl.wbm;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -17,6 +13,8 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 
+import junit.framework.TestCase;
+
 import org.apache.http.HttpResponse;
 import org.apache.http.ProtocolVersion;
 import org.apache.http.client.HttpClient;
@@ -34,13 +32,11 @@ import org.archive.net.UURIFactory;
 import org.archive.util.Base32;
 import org.archive.util.DateUtils;
 import org.easymock.EasyMock;
-import org.junit.Test;
 
 import com.google.common.util.concurrent.ExecutionList;
 
 /**
  * unit test for {@link WbmPersistLoadProcessor}.
- * depends on WBM index query API. 
  * 
  * TODO:
  * <ul>
@@ -50,8 +46,8 @@ import com.google.common.util.concurrent.ExecutionList;
  * @author kenji
  *
  */
-public class WbmPersistLoadProcessorTest {
-  @Test
+public class WbmPersistLoadProcessorTest extends TestCase {
+
   public void testBuildURL() throws Exception {
     WbmPersistLoadProcessor t = new WbmPersistLoadProcessor();
     t.setQueryURL("http://web.archive.org/cdx/search/cdx?url=$u&startDate=$s&limit=1");
@@ -97,8 +93,11 @@ public class WbmPersistLoadProcessorTest {
       return md.digest(text.getBytes());
   }
 
-  @Test
-  public void testInnerProcessResultSingleShotWithMock() throws Exception {
+  /**
+   * this test is disabled because it talks to production CDX server.
+   * @throws Exception
+   */
+  public void _testInnerProcessResultSingleShotWithMock() throws Exception {
     // because AbstractHttpClient marks most execute(...) methods final, it is very tiresome to implement
     // a stub by implementing HttpClient interface. So I use EasyMock.
     HttpClient client = EasyMock.createMock(HttpClient.class);
@@ -158,7 +157,6 @@ public class WbmPersistLoadProcessorTest {
     fhp.process(curi);
   }
   
-  @Test
   public void testInnerProcessResultSingleShotWithRealServer() throws Exception {
     WbmPersistLoadProcessor t = new WbmPersistLoadProcessor();
     //CrawlURI curi = new CrawlURI(UURIFactory.getInstance("http://archive.org/"));
@@ -195,11 +193,10 @@ public class WbmPersistLoadProcessorTest {
   
   /**
    * test for performance.
-   * not annotated as test case. run this through main().
+   * not named as test case. run this through main().
    * @throws Exception
    */
-  //@Test
-  public void testInnerProcessResultMany() throws Exception {
+  public void measureInnerProcessResultMany() throws Exception {
     final WbmPersistLoadProcessor t = new WbmPersistLoadProcessor();
     InputStream is = getClass().getResourceAsStream("/test-url-list.txt");
     BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -219,6 +216,6 @@ public class WbmPersistLoadProcessorTest {
   }
   
   public static void main() throws Exception {
-    (new WbmPersistLoadProcessorTest()).testInnerProcessResultMany();
+    (new WbmPersistLoadProcessorTest()).measureInnerProcessResultMany();
   }
 }