wonook closed pull request #34: [NEMO-105] Move /tests/common into /common/test URL: https://github.com/apache/incubator-nemo/pull/34
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/compiler/optimizer/src/main/java/edu/snu/nemo/compiler/optimizer/examples/EmptyComponents.java b/common/src/main/java/edu/snu/nemo/common/test/EmptyComponents.java similarity index 98% rename from compiler/optimizer/src/main/java/edu/snu/nemo/compiler/optimizer/examples/EmptyComponents.java rename to common/src/main/java/edu/snu/nemo/common/test/EmptyComponents.java index 7fd0d828..01b488d7 100644 --- a/compiler/optimizer/src/main/java/edu/snu/nemo/compiler/optimizer/examples/EmptyComponents.java +++ b/common/src/main/java/edu/snu/nemo/common/test/EmptyComponents.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.snu.nemo.compiler.optimizer.examples; +package edu.snu.nemo.common.test; import edu.snu.nemo.common.ir.OutputCollector; import edu.snu.nemo.common.ir.Readable; diff --git a/tests/src/test/java/edu/snu/nemo/tests/common/DAGTest.java b/common/src/test/java/edu/snu/nemo/common/DAGTest.java similarity index 99% rename from tests/src/test/java/edu/snu/nemo/tests/common/DAGTest.java rename to common/src/test/java/edu/snu/nemo/common/DAGTest.java index 3352fb81..dffbc895 100644 --- a/tests/src/test/java/edu/snu/nemo/tests/common/DAGTest.java +++ b/common/src/test/java/edu/snu/nemo/common/DAGTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.snu.nemo.tests.common; +package edu.snu.nemo.common; import edu.snu.nemo.common.dag.DAG; import edu.snu.nemo.common.dag.Edge; diff --git a/tests/src/test/java/edu/snu/nemo/tests/common/PairTest.java b/common/src/test/java/edu/snu/nemo/common/PairTest.java similarity index 94% rename from tests/src/test/java/edu/snu/nemo/tests/common/PairTest.java rename to common/src/test/java/edu/snu/nemo/common/PairTest.java index d2b51d6e..4a08e3e8 100644 --- a/tests/src/test/java/edu/snu/nemo/tests/common/PairTest.java +++ b/common/src/test/java/edu/snu/nemo/common/PairTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.snu.nemo.tests.common; +package edu.snu.nemo.common; import edu.snu.nemo.common.Pair; import edu.snu.nemo.common.ir.vertex.IRVertex; -import edu.snu.nemo.compiler.optimizer.examples.EmptyComponents; +import edu.snu.nemo.common.test.EmptyComponents; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/tests/src/test/java/edu/snu/nemo/tests/common/StateMachineTest.java b/common/src/test/java/edu/snu/nemo/common/StateMachineTest.java similarity index 98% rename from tests/src/test/java/edu/snu/nemo/tests/common/StateMachineTest.java rename to common/src/test/java/edu/snu/nemo/common/StateMachineTest.java index b5460217..640d1e39 100644 --- a/tests/src/test/java/edu/snu/nemo/tests/common/StateMachineTest.java +++ b/common/src/test/java/edu/snu/nemo/common/StateMachineTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.snu.nemo.tests.common; +package edu.snu.nemo.common; import edu.snu.nemo.common.StateMachine; import org.junit.Before; diff --git a/tests/src/test/java/edu/snu/nemo/tests/common/ir/LoopVertexTest.java b/common/src/test/java/edu/snu/nemo/common/ir/LoopVertexTest.java similarity index 97% rename from tests/src/test/java/edu/snu/nemo/tests/common/ir/LoopVertexTest.java rename to common/src/test/java/edu/snu/nemo/common/ir/LoopVertexTest.java index 919530dc..2486c196 100644 --- a/tests/src/test/java/edu/snu/nemo/tests/common/ir/LoopVertexTest.java +++ b/common/src/test/java/edu/snu/nemo/common/ir/LoopVertexTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.snu.nemo.tests.common.ir; +package edu.snu.nemo.common.ir; import edu.snu.nemo.common.coder.Coder; import edu.snu.nemo.common.dag.DAG; @@ -24,7 +24,7 @@ import edu.snu.nemo.common.ir.vertex.OperatorVertex; import edu.snu.nemo.common.Pair; import edu.snu.nemo.common.dag.DAGBuilder; -import edu.snu.nemo.compiler.optimizer.examples.EmptyComponents; +import edu.snu.nemo.common.test.EmptyComponents; import org.junit.Before; import org.junit.Test; diff --git a/tests/src/test/java/edu/snu/nemo/tests/common/ir/executionproperty/ExecutionPropertyMapTest.java b/common/src/test/java/edu/snu/nemo/common/ir/executionproperty/ExecutionPropertyMapTest.java similarity index 96% rename from tests/src/test/java/edu/snu/nemo/tests/common/ir/executionproperty/ExecutionPropertyMapTest.java rename to common/src/test/java/edu/snu/nemo/common/ir/executionproperty/ExecutionPropertyMapTest.java index f6f089f2..899c89ec 100644 --- a/tests/src/test/java/edu/snu/nemo/tests/common/ir/executionproperty/ExecutionPropertyMapTest.java +++ b/common/src/test/java/edu/snu/nemo/common/ir/executionproperty/ExecutionPropertyMapTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package edu.snu.nemo.tests.common.ir.executionproperty; +package edu.snu.nemo.common.ir.executionproperty; import edu.snu.nemo.common.coder.Coder; import edu.snu.nemo.common.ir.edge.IREdge; @@ -26,7 +26,7 @@ import edu.snu.nemo.common.ir.vertex.IRVertex; import edu.snu.nemo.common.ir.vertex.OperatorVertex; import edu.snu.nemo.common.ir.vertex.executionproperty.ParallelismProperty; -import edu.snu.nemo.compiler.optimizer.examples.EmptyComponents; +import edu.snu.nemo.common.test.EmptyComponents; import org.junit.Before; import org.junit.Test; diff --git a/compiler/optimizer/src/main/java/edu/snu/nemo/compiler/optimizer/examples/MapReduceDisaggregationOptimization.java b/compiler/optimizer/src/main/java/edu/snu/nemo/compiler/optimizer/examples/MapReduceDisaggregationOptimization.java index 8225df22..012deabc 100644 --- a/compiler/optimizer/src/main/java/edu/snu/nemo/compiler/optimizer/examples/MapReduceDisaggregationOptimization.java +++ b/compiler/optimizer/src/main/java/edu/snu/nemo/compiler/optimizer/examples/MapReduceDisaggregationOptimization.java @@ -21,6 +21,7 @@ import edu.snu.nemo.common.ir.edge.IREdge; import edu.snu.nemo.common.ir.vertex.IRVertex; import edu.snu.nemo.common.ir.vertex.OperatorVertex; +import edu.snu.nemo.common.test.EmptyComponents; import edu.snu.nemo.compiler.optimizer.policy.DisaggregationPolicy; import edu.snu.nemo.compiler.optimizer.CompiletimeOptimizer; diff --git a/runtime/plangenerator/src/main/java/edu/snu/nemo/runtime/plangenerator/TestPlanGenerator.java b/runtime/plangenerator/src/main/java/edu/snu/nemo/runtime/plangenerator/TestPlanGenerator.java index 4888a1fc..3a140259 100644 --- a/runtime/plangenerator/src/main/java/edu/snu/nemo/runtime/plangenerator/TestPlanGenerator.java +++ b/runtime/plangenerator/src/main/java/edu/snu/nemo/runtime/plangenerator/TestPlanGenerator.java @@ -24,8 +24,8 @@ import edu.snu.nemo.common.ir.vertex.executionproperty.ExecutorPlacementProperty; import edu.snu.nemo.common.ir.vertex.executionproperty.ParallelismProperty; import edu.snu.nemo.common.ir.vertex.transform.Transform; +import edu.snu.nemo.common.test.EmptyComponents; import edu.snu.nemo.compiler.optimizer.CompiletimeOptimizer; -import edu.snu.nemo.compiler.optimizer.examples.EmptyComponents; import edu.snu.nemo.compiler.optimizer.policy.BasicPullPolicy; import edu.snu.nemo.compiler.optimizer.policy.BasicPushPolicy; import edu.snu.nemo.compiler.optimizer.policy.Policy; diff --git a/tests/src/test/java/edu/snu/nemo/tests/compiler/backend/nemo/NemoBackendTest.java b/tests/src/test/java/edu/snu/nemo/tests/compiler/backend/nemo/NemoBackendTest.java index cb4b70c9..0bc6ab48 100644 --- a/tests/src/test/java/edu/snu/nemo/tests/compiler/backend/nemo/NemoBackendTest.java +++ b/tests/src/test/java/edu/snu/nemo/tests/compiler/backend/nemo/NemoBackendTest.java @@ -23,7 +23,7 @@ import edu.snu.nemo.compiler.backend.nemo.NemoBackend; import edu.snu.nemo.common.dag.DAGBuilder; import edu.snu.nemo.compiler.optimizer.CompiletimeOptimizer; -import edu.snu.nemo.compiler.optimizer.examples.EmptyComponents; +import edu.snu.nemo.common.test.EmptyComponents; import edu.snu.nemo.compiler.optimizer.policy.PadoPolicy; import edu.snu.nemo.conf.JobConf; import edu.snu.nemo.runtime.common.plan.PhysicalPlan; diff --git a/tests/src/test/java/edu/snu/nemo/tests/compiler/optimizer/pass/compiletime/reshaping/CommonSubexpressionEliminationPassTest.java b/tests/src/test/java/edu/snu/nemo/tests/compiler/optimizer/pass/compiletime/reshaping/CommonSubexpressionEliminationPassTest.java index 28fc29f0..2233235a 100644 --- a/tests/src/test/java/edu/snu/nemo/tests/compiler/optimizer/pass/compiletime/reshaping/CommonSubexpressionEliminationPassTest.java +++ b/tests/src/test/java/edu/snu/nemo/tests/compiler/optimizer/pass/compiletime/reshaping/CommonSubexpressionEliminationPassTest.java @@ -22,7 +22,7 @@ import edu.snu.nemo.common.ir.vertex.IRVertex; import edu.snu.nemo.common.ir.vertex.OperatorVertex; import edu.snu.nemo.common.dag.DAGBuilder; -import edu.snu.nemo.compiler.optimizer.examples.EmptyComponents; +import edu.snu.nemo.common.test.EmptyComponents; import edu.snu.nemo.compiler.optimizer.pass.compiletime.reshaping.CommonSubexpressionEliminationPass; import org.junit.Before; import org.junit.Test; diff --git a/tests/src/test/java/edu/snu/nemo/tests/runtime/common/plan/DAGConverterTest.java b/tests/src/test/java/edu/snu/nemo/tests/runtime/common/plan/DAGConverterTest.java index 677b2e97..6799bb63 100644 --- a/tests/src/test/java/edu/snu/nemo/tests/runtime/common/plan/DAGConverterTest.java +++ b/tests/src/test/java/edu/snu/nemo/tests/runtime/common/plan/DAGConverterTest.java @@ -15,7 +15,6 @@ */ package edu.snu.nemo.tests.runtime.common.plan; -import edu.snu.nemo.common.coder.Coder; import edu.snu.nemo.common.dag.DAG; import edu.snu.nemo.common.dag.DAGBuilder; import edu.snu.nemo.common.ir.edge.IREdge; @@ -30,7 +29,7 @@ import edu.snu.nemo.common.ir.vertex.transform.Transform; import edu.snu.nemo.compiler.frontend.beam.transform.DoTransform; import edu.snu.nemo.compiler.optimizer.CompiletimeOptimizer; -import edu.snu.nemo.compiler.optimizer.examples.EmptyComponents; +import edu.snu.nemo.common.test.EmptyComponents; import edu.snu.nemo.conf.JobConf; import edu.snu.nemo.runtime.common.plan.PhysicalPlanGenerator; import edu.snu.nemo.runtime.common.plan.Stage; diff --git a/tests/src/test/java/edu/snu/nemo/tests/runtime/executor/datatransfer/DataTransferTest.java b/tests/src/test/java/edu/snu/nemo/tests/runtime/executor/datatransfer/DataTransferTest.java index 2a8a224e..ca1a2186 100644 --- a/tests/src/test/java/edu/snu/nemo/tests/runtime/executor/datatransfer/DataTransferTest.java +++ b/tests/src/test/java/edu/snu/nemo/tests/runtime/executor/datatransfer/DataTransferTest.java @@ -22,7 +22,7 @@ import edu.snu.nemo.common.ir.vertex.SourceVertex; import edu.snu.nemo.common.ir.vertex.IRVertex; import edu.snu.nemo.common.ir.vertex.executionproperty.ParallelismProperty; -import edu.snu.nemo.compiler.optimizer.examples.EmptyComponents; +import edu.snu.nemo.common.test.EmptyComponents; import edu.snu.nemo.conf.JobConf; import edu.snu.nemo.common.Pair; import edu.snu.nemo.common.coder.Coder; @@ -38,7 +38,6 @@ import edu.snu.nemo.runtime.common.message.local.LocalMessageEnvironment; import edu.snu.nemo.runtime.common.plan.RuntimeEdge; import edu.snu.nemo.runtime.common.plan.Stage; -import edu.snu.nemo.runtime.common.plan.StageEdge; import edu.snu.nemo.runtime.common.plan.StageEdgeBuilder; import edu.snu.nemo.runtime.executor.Executor; import edu.snu.nemo.runtime.executor.MetricManagerWorker; ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
