svn commit: r965532 - in /nutch/branches/nutchbase/src/test/org/apache/nutch/crawl: CrawlDBTestUtil.java TestGenerator.java

[jn...@apache.org]

Author: jnioche
Date: Mon Jul 19 15:27:10 2010
New Revision: 965532

URL: http://svn.apache.org/viewvc?rev=965532&view=rev
Log:
removed dependency on Hbase in tests

Modified:
    nutch/branches/nutchbase/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java
    nutch/branches/nutchbase/src/test/org/apache/nutch/crawl/TestGenerator.java

Modified: nutch/branches/nutchbase/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchbase/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java?rev=965532&r1=965531&r2=965532&view=diff
==============================================================================
--- nutch/branches/nutchbase/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java (original)
+++ nutch/branches/nutchbase/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java Mon Jul 19 15:27:10 2010
@@ -26,8 +26,6 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Text;
-import org.apache.nutch.storage.WebPage;
 
 public class CrawlDBTestUtil {
 
@@ -82,8 +80,8 @@ public class CrawlDBTestUtil {
   public static Configuration createConfiguration() {
     Configuration conf = new Configuration();
     conf.addResource("nutch-default.xml");
+    conf.addResource("nutch-site.xml");
     conf.addResource("crawl-tests.xml");
-    conf.addResource("hbase-site.xml");
     return conf;
   }
 

Modified: nutch/branches/nutchbase/src/test/org/apache/nutch/crawl/TestGenerator.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchbase/src/test/org/apache/nutch/crawl/TestGenerator.java?rev=965532&r1=965531&r2=965532&view=diff
==============================================================================
--- nutch/branches/nutchbase/src/test/org/apache/nutch/crawl/TestGenerator.java (original)
+++ nutch/branches/nutchbase/src/test/org/apache/nutch/crawl/TestGenerator.java Mon Jul 19 15:27:10 2010
@@ -29,9 +29,9 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.nutch.storage.Mark;
 import org.apache.nutch.storage.WebPage;
 import org.apache.nutch.util.TableUtil;
-import org.gora.hbase.store.HBaseStore;
 import org.gora.query.Query;
 import org.gora.query.Result;
+import org.gora.sql.store.SqlStore;
 import org.gora.store.DataStore;
 import org.gora.store.DataStoreFactory;
 
@@ -58,7 +58,7 @@ public class TestGenerator extends TestC
     conf = CrawlDBTestUtil.createConfiguration();
     DataStoreFactory.properties.setProperty("gora.sqlstore.jdbc.driver","org.hsqldb.jdbcDriver");
     DataStoreFactory.properties.setProperty("gora.gora.sqlstore.jdbc.url","jdbc:hsqldb:hsql://localhost/nutchtest");
-    webPageStore = DataStoreFactory.getDataStore(HBaseStore.class,
+    webPageStore = DataStoreFactory.getDataStore(SqlStore.class,
         String.class, WebPage.class);
   }
 
@@ -176,7 +176,7 @@ public class TestGenerator extends TestC
    *
    * @throws Exception
    */
-  public void toastGenerateHostIPLimit() throws Exception {
+  public void testGenerateHostIPLimit() throws Exception {
     ArrayList<URLWebPage> list = new ArrayList<URLWebPage>();
 
     list.add(createURLWebPage("http://www.example.com/index.html", 1, 1));