Author: aching
Date: Tue Oct 23 01:11:37 2012
New Revision: 1401137
URL: http://svn.apache.org/viewvc?rev=1401137&view=rev
Log:
GIRAPH-384: Remove duplicate BspCase in giraph-formats-contrib (and
fix GIRAPH-382 breaking the build). (aching)
Removed:
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/BspCase.java
Modified:
giraph/trunk/CHANGELOG
giraph/trunk/giraph-formats-contrib/pom.xml
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/TestAccumuloVertexFormat.java
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/TestHBaseRootMarkerVertextFormat.java
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hcatalog/TestHiveUtils.java
Modified: giraph/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1401137&r1=1401136&r2=1401137&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Tue Oct 23 01:11:37 2012
@@ -1,6 +1,9 @@
Giraph Change Log
Release 0.2.0 - unreleased
+ GIRAPH-384: Remove duplicate BspCase in giraph-formats-contrib (and
+ fix GIRAPH-382 breaking the build). (aching)
+
GIRAPH-382: ZooKeeperExt should handle ConnectionLossException by
retrying. (aching)
Modified: giraph/trunk/giraph-formats-contrib/pom.xml
URL:
http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/pom.xml?rev=1401137&r1=1401136&r2=1401137&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/pom.xml (original)
+++ giraph/trunk/giraph-formats-contrib/pom.xml Tue Oct 23 01:11:37 2012
@@ -152,6 +152,12 @@ under the License.
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.giraph</groupId>
+ <artifactId>giraph</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ <type>test-jar</type>
+ </dependency>
<!-- provided dependencies -->
<dependency>
Modified:
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/TestAccumuloVertexFormat.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/TestAccumuloVertexFormat.java?rev=1401137&r1=1401136&r2=1401137&view=diff
==============================================================================
---
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/TestAccumuloVertexFormat.java
(original)
+++
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/TestAccumuloVertexFormat.java
Tue Oct 23 01:11:37 2012
@@ -18,8 +18,6 @@
package org.apache.giraph.io.accumulo;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Scanner;
@@ -48,6 +46,11 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.HashSet;
import java.util.Map;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/*
Test class for Accumulo vertex input/output formats.
@@ -64,27 +67,21 @@ public class TestAccumuloVertexFormat ex
private final Logger log =
Logger.getLogger(TestAccumuloVertexFormat.class);
+
/**
* Create the test case
- *
- * @param testName name of the test case
*/
- public TestAccumuloVertexFormat(String testName) {
- super(testName);
+ public TestAccumuloVertexFormat() {
+ super(TestAccumuloVertexFormat.class.getName());
}
- /**
- * @return the suite of tests being tested
- */
- public static Test suite() {
- return new TestSuite(TestAccumuloVertexFormat.class);
- }
/*
Write a simple parent-child directed graph to Accumulo.
Run a job which reads the values
into subclasses that extend AccumuloVertex I/O formats.
Check the output after the job.
*/
+ @Test
public void testAccumuloInputOutput() throws Exception {
if (System.getProperty("prop.mapred.job.tracker") != null) {
if(log.isInfoEnabled())
Modified:
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/TestHBaseRootMarkerVertextFormat.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/TestHBaseRootMarkerVertextFormat.java?rev=1401137&r1=1401136&r2=1401137&view=diff
==============================================================================
---
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/TestHBaseRootMarkerVertextFormat.java
(original)
+++
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/TestHBaseRootMarkerVertextFormat.java
Tue Oct 23 01:11:37 2012
@@ -18,8 +18,7 @@
package org.apache.giraph.io.hbase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+
import org.apache.giraph.BspCase;
import org.apache.giraph.GiraphConfiguration;
import org.apache.giraph.io.hbase.edgemarker.TableEdgeInputFormat;
@@ -46,7 +45,12 @@ import org.apache.log4j.Logger;
import java.io.File;
import java.io.IOException;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/*
Test case for HBase reading/writing vertices from an HBase instance.
*/
@@ -65,17 +69,11 @@ public class TestHBaseRootMarkerVertextF
private final String QUALIFER = "children";
private final String OUTPUT_FIELD = "parent";
- public TestHBaseRootMarkerVertextFormat(String testName) {
- super(testName);
- }
- /**
- * @return the suite of tests being tested
- */
- public static Test suite() {
- return new TestSuite(TestHBaseRootMarkerVertextFormat.class);
-
+ public TestHBaseRootMarkerVertextFormat() {
+ super(TestHBaseRootMarkerVertextFormat.class.getName());
}
+ @Test
public void testHBaseInputOutput() throws Exception{
if (System.getProperty("prop.mapred.job.tracker") != null) {
@@ -169,7 +167,6 @@ public class TestHBaseRootMarkerVertextF
}
}
-
/*
Test compute method that sends each edge a notification of its parents.
The test set only has a 1-1 parent-to-child ratio for this unit test.
Modified:
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hcatalog/TestHiveUtils.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hcatalog/TestHiveUtils.java?rev=1401137&r1=1401136&r2=1401137&view=diff
==============================================================================
---
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hcatalog/TestHiveUtils.java
(original)
+++
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hcatalog/TestHiveUtils.java
Tue Oct 23 01:11:37 2012
@@ -21,8 +21,10 @@ package org.apache.giraph.io.hcatalog;
import junit.framework.TestCase;
import java.util.Map;
+import org.junit.Test;
public class TestHiveUtils extends TestCase {
+ @Test
public void testParsePartition() {
String partitionStr = "feature1=2012-10-09, feature2=a1+b2,
feature3=ff-gg";
Map<String, String> partition =
HiveUtils.parsePartitionValues(partitionStr);
