You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by we...@apache.org on 2015/07/13 18:34:04 UTC
incubator-reef git commit: [REEF-460]: Remove all generated files on
mvn clean
Repository: incubator-reef
Updated Branches:
refs/heads/master 28e5ec030 -> f632869a5
[REEF-460]: Remove all generated files on mvn clean
This pull request addressed the issue by change test root folder to
`target/REEF_LOCAL_RUNTIME`.
JIRA:
[REEF-460](https://issues.apache.org/jira/browse/REEF-460)
Pull Request:
This closes #293
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/f632869a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/f632869a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/f632869a
Branch: refs/heads/master
Commit: f632869a531591d6a7ea88f02162220fec5a944d
Parents: 28e5ec0
Author: taegeonum <ta...@gmail.com>
Authored: Sun Jul 12 23:22:36 2015 +0900
Committer: Markus Weimer <we...@apache.org>
Committed: Mon Jul 13 09:28:40 2015 -0700
----------------------------------------------------------------------
.../org/apache/reef/examples/hello/HelloHttpTest.java | 1 +
.../reef/runtime/local/driver/ResourceManagerTest.java | 11 ++++++-----
.../java/org/apache/reef/tests/LocalTestEnvironment.java | 1 +
3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/f632869a/lang/java/reef-examples/src/test/java/org/apache/reef/examples/hello/HelloHttpTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-examples/src/test/java/org/apache/reef/examples/hello/HelloHttpTest.java b/lang/java/reef-examples/src/test/java/org/apache/reef/examples/hello/HelloHttpTest.java
index 972a59f..e620e66 100644
--- a/lang/java/reef-examples/src/test/java/org/apache/reef/examples/hello/HelloHttpTest.java
+++ b/lang/java/reef-examples/src/test/java/org/apache/reef/examples/hello/HelloHttpTest.java
@@ -33,6 +33,7 @@ public class HelloHttpTest {
final Configuration runtimeConfiguration = LocalRuntimeConfiguration.CONF
.set(LocalRuntimeConfiguration.MAX_NUMBER_OF_EVALUATORS, 2)
+ .set(LocalRuntimeConfiguration.RUNTIME_ROOT_FOLDER, "target/REEF_LOCAL_RUNTIME")
.build();
final LauncherStatus status = HelloREEFHttp.runHelloReef(runtimeConfiguration, 10 * 1000);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/f632869a/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceManagerTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceManagerTest.java b/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceManagerTest.java
index 3b22a67..e32b18f 100644
--- a/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceManagerTest.java
+++ b/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceManagerTest.java
@@ -29,7 +29,9 @@ import org.apache.reef.runtime.common.files.REEFFileNames;
import org.apache.reef.runtime.common.utils.RemoteManager;
import org.apache.reef.runtime.local.client.parameters.MaxNumberOfEvaluators;
import org.apache.reef.runtime.local.client.parameters.RackNames;
+import org.apache.reef.runtime.local.client.parameters.RootFolder;
import org.apache.reef.tang.Injector;
+import org.apache.reef.tang.JavaConfigurationBuilder;
import org.apache.reef.tang.Tang;
import org.apache.reef.tang.exceptions.InjectionException;
import org.apache.reef.tang.formats.ConfigurationSerializer;
@@ -47,10 +49,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.*;
/**
* Unit test for Resource Manager (and ContainerManager) classes.
@@ -75,7 +74,9 @@ public class ResourceManagerTest {
@SuppressWarnings("unchecked")
@Before
public void setUp() throws InjectionException {
- injector = Tang.Factory.getTang().newInjector();
+ JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder();
+ cb.bindNamedParameter(RootFolder.class, "target/REEF_LOCAL_RUNTIME");
+ injector = Tang.Factory.getTang().newInjector(cb.build());
remoteManager = injector.getInstance(RemoteManager.class);
mockRuntimeResourceStatusHandler = mock(EventHandler.class);
injector.bindVolatileParameter(RuntimeParameters.ResourceStatusHandler.class, mockRuntimeResourceStatusHandler);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/f632869a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/LocalTestEnvironment.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/LocalTestEnvironment.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/LocalTestEnvironment.java
index 8291b57..8825eda 100644
--- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/LocalTestEnvironment.java
+++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/LocalTestEnvironment.java
@@ -45,6 +45,7 @@ public final class LocalTestEnvironment extends TestEnvironmentBase implements T
if (null == rootFolder) {
return LocalRuntimeConfiguration.CONF
.set(LocalRuntimeConfiguration.MAX_NUMBER_OF_EVALUATORS, MAX_NUMBER_OF_EVALUATORS)
+ .set(LocalRuntimeConfiguration.RUNTIME_ROOT_FOLDER, "target/REEF_LOCAL_RUNTIME")
.build();
} else {
return LocalRuntimeConfiguration.CONF