Update
git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_genomix@3101 123451ca-8445-de46-9d55-352943316053
diff --git a/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobGen/JobGenerator.java b/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobGen/JobGenerator.java
index 7399a3b..52e9f38 100644
--- a/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobGen/JobGenerator.java
+++ b/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobGen/JobGenerator.java
@@ -15,7 +15,6 @@
import edu.uci.ics.pregelix.LoadGraphVertex;
import edu.uci.ics.pregelix.MergeGraphVertex;
import edu.uci.ics.pregelix.LoadGraphVertex.SimpleLoadGraphVertexOutputFormat;
-import edu.uci.ics.pregelix.TestLoadGraphVertex;
import edu.uci.ics.pregelix.TextLoadGraphInputFormat;
import edu.uci.ics.pregelix.api.job.PregelixJob;
@@ -64,6 +63,7 @@
public static void main(String[] args) throws IOException {
// TODO Auto-generated method stub
genBinaryLoadGraph();
+ //genSequenceLoadGraph();
//genBasicBinaryLoadGraph();
}
diff --git a/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobRun/RunJobTestSuite.java b/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobRun/RunJobTestSuite.java
index 1649e79..090c57a 100644
--- a/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobRun/RunJobTestSuite.java
+++ b/genomix/genomix-pregelix/src/test/java/edu/uci/ics/pregelix/JobRun/RunJobTestSuite.java
@@ -40,7 +40,7 @@
private static final String PATH_TO_ONLY = "src/test/resources/only.txt";
private static final String FILE_EXTENSION_OF_RESULTS = "result";
- private static final String DATA_PATH = "data/webmap/sequenceFileMergeTest";//sequenceFileMergeTest
+ private static final String DATA_PATH = "data/webmap/sequenceShortFileMergeTest";//sequenceFileMergeTest
private static final String HDFS_PATH = "/webmap/";
private static final String HYRACKS_APP_NAME = "pregelix";
diff --git a/genomix/genomix-pregelix/src/test/resources/expected/BinaryLoadGraph.result b/genomix/genomix-pregelix/src/test/resources/expected/BinaryLoadGraph.result
index 2a98362..676e5c8 100644
--- a/genomix/genomix-pregelix/src/test/resources/expected/BinaryLoadGraph.result
+++ b/genomix/genomix-pregelix/src/test/resources/expected/BinaryLoadGraph.result
@@ -1,9 +1,8 @@
-Vertex(id=24,value=100, edges=())
-Vertex(id=30,value=-128, edges=())
-Vertex(id=34,value=-128, edges=())
-Vertex(id=48,value=2, edges=())
-Vertex(id=6c,value=65, edges=())
-Vertex(id=88,value=2, edges=())
-Vertex(id=9b 00,value=24, edges=())
-Vertex(id=b0,value=40, edges=())
-Vertex(id=cc,value=67, edges=())
+Vertex(id=24,value=1, edges=())
+Vertex(id=38,value=34, edges=())
+Vertex(id=4c,value=68, edges=())
+Vertex(id=70,value=72, edges=())
+Vertex(id=90,value=24, edges=())
+Vertex(id=9c,value=-127, edges=())
+Vertex(id=cc,value=32, edges=())
+Vertex(id=e4,value=24, edges=())