[incubator-nemo] branch reshaping updated: fix tests

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

johnyangk pushed a commit to branch reshaping
in repository https://gitbox.apache.org/repos/asf/incubator-nemo.git


The following commit(s) were added to refs/heads/reshaping by this push:
     new 4ee3346  fix tests
4ee3346 is described below

commit 4ee334692e32df32c2054b1408e180addfa253ae
Author: John Yang <jo...@apache.org>
AuthorDate: Tue Jan 22 18:20:09 2019 +0900

    fix tests
---
 .../java/org/apache/nemo/compiler/CompilerTestUtil.java     |  2 --
 .../pass/compiletime/composite/SkewCompositePassTest.java   | 13 ++++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/compiler/test/src/main/java/org/apache/nemo/compiler/CompilerTestUtil.java b/compiler/test/src/main/java/org/apache/nemo/compiler/CompilerTestUtil.java
index 1d76325..54f022d 100644
--- a/compiler/test/src/main/java/org/apache/nemo/compiler/CompilerTestUtil.java
+++ b/compiler/test/src/main/java/org/apache/nemo/compiler/CompilerTestUtil.java
@@ -21,8 +21,6 @@ package org.apache.nemo.compiler;
 import org.apache.nemo.common.ir.IRDAG;
 import org.apache.nemo.common.test.ArgBuilder;
 import org.apache.nemo.conf.JobConf;
-import org.apache.nemo.common.ir.edge.IREdge;
-import org.apache.nemo.common.ir.vertex.IRVertex;
 import org.apache.nemo.client.JobLauncher;
 import org.apache.nemo.common.dag.DAG;
 import org.apache.reef.tang.Configuration;
diff --git a/compiler/test/src/test/java/org/apache/nemo/compiler/optimizer/pass/compiletime/composite/SkewCompositePassTest.java b/compiler/test/src/test/java/org/apache/nemo/compiler/optimizer/pass/compiletime/composite/SkewCompositePassTest.java
index b3d3309..d1ce9bf 100644
--- a/compiler/test/src/test/java/org/apache/nemo/compiler/optimizer/pass/compiletime/composite/SkewCompositePassTest.java
+++ b/compiler/test/src/test/java/org/apache/nemo/compiler/optimizer/pass/compiletime/composite/SkewCompositePassTest.java
@@ -80,24 +80,23 @@ public class SkewCompositePassTest {
   /**
    * Test for {@link SkewCompositePass} with MR workload.
    * It should have inserted vertex with {@link MessageBarrierTransform}
-   * and vertex with {@link MessageAggregateTransform}
-   * before each shuffle edge with no additional output tags.
+   * and vertex with {@link MessageAggregateTransform} for each shuffle edge.
    * @throws Exception exception on the way.
    */
   @Test
   public void testDataSkewPass() throws Exception {
     mrDAG = CompilerTestUtil.compileWordCountDAG();
     final Integer originalVerticesNum = mrDAG.getVertices().size();
-    final Long numOfShuffleEdgesWithOutAdditionalOutputTag =
+
+    final Long numOfShuffleEdges =
       mrDAG.getVertices().stream().filter(irVertex ->
         mrDAG.getIncomingEdgesOf(irVertex).stream().anyMatch(irEdge ->
           CommunicationPatternProperty.Value.Shuffle
-            .equals(irEdge.getPropertyValue(CommunicationPatternProperty.class).get())
-            && !irEdge.getPropertyValue(AdditionalOutputTagProperty.class).isPresent()))
+            .equals(irEdge.getPropertyValue(CommunicationPatternProperty.class).get())))
       .count();
+
     final IRDAG processedDAG = new SkewCompositePass().optimize(mrDAG);
-    assertEquals(originalVerticesNum + numOfShuffleEdgesWithOutAdditionalOutputTag * 2,
-      processedDAG.getVertices().size());
+    assertEquals(originalVerticesNum + numOfShuffleEdges * 2, processedDAG.getVertices().size());
 
     processedDAG.filterVertices(v -> v instanceof OperatorVertex
       && ((OperatorVertex) v).getTransform() instanceof MessageBarrierTransform)