http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootInterface.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootInterface.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootInterface.java index 4662437..43937d1 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootInterface.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootInterface.java @@ -26,6 +26,6 @@ public interface RootInterface { /** * @return true, if the object graph has been instantiated correctly, false otherwise. */ - public boolean isValid(); + boolean isValid(); }
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RoundTripTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RoundTripTest.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RoundTripTest.java index 275ec0a..23d338e 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RoundTripTest.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RoundTripTest.java @@ -33,7 +33,8 @@ public abstract class RoundTripTest { public abstract Configuration roundTrip(final Configuration configuration) throws Exception; - public abstract Configuration roundTrip(final Configuration configuration, final ClassHierarchy classHierarchy) throws Exception; + public abstract Configuration roundTrip(final Configuration configuration, final ClassHierarchy classHierarchy) + throws Exception; @Test public void testRoundTrip() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplOne.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplOne.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplOne.java index 7462302..8bef85c 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplOne.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplOne.java @@ -39,12 +39,18 @@ final class SetInterfaceImplOne implements SetInterface { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SetInterfaceImplOne that = (SetInterfaceImplOne) o; - if (magicNumber != that.magicNumber) return false; + if (magicNumber != that.magicNumber) { + return false; + } return true; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplTwo.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplTwo.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplTwo.java index daa01ec..fb0c14e 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplTwo.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetInterfaceImplTwo.java @@ -36,12 +36,18 @@ final class SetInterfaceImplTwo implements SetInterface { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SetInterfaceImplTwo that = (SetInterfaceImplTwo) o; - if (Double.compare(that.magicNumber, magicNumber) != 0) return false; + if (Double.compare(that.magicNumber, magicNumber) != 0) { + return false; + } return true; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfBaseTypes.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfBaseTypes.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfBaseTypes.java index 26c4d31..fa405c0 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfBaseTypes.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfBaseTypes.java @@ -47,14 +47,24 @@ final class SetOfBaseTypes { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SetOfBaseTypes that = (SetOfBaseTypes) o; - if (!doubles.equals(that.doubles)) return false; - if (!integers.equals(that.integers)) return false; - if (!strings.equals(that.strings)) return false; + if (!doubles.equals(that.doubles)) { + return false; + } + if (!integers.equals(that.integers)) { + return false; + } + if (!strings.equals(that.strings)) { + return false; + } return true; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfImplementations.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfImplementations.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfImplementations.java index da985bf..75b067f 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfImplementations.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/SetOfImplementations.java @@ -34,12 +34,18 @@ final class SetOfImplementations { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SetOfImplementations that = (SetOfImplementations) o; - if (!theInstances.equals(that.theInstances)) return false; + if (!theInstances.equals(that.theInstances)) { + return false; + } return true; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/TestConfiguration.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/TestConfiguration.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/TestConfiguration.java index 3f4fa96..c230920 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/TestConfiguration.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/TestConfiguration.java @@ -40,11 +40,11 @@ public class TestConfiguration extends ConfigurationModuleBuilder { public static final int NAMED_PARAMETER_INTEGER_VALUE = 42; public static final double NAMED_PARAMETER_DOUBLE_VALUE = 42.0; // Pre-defined lists used in injection - private static final List<Class<? extends ListInterface>> injectedImplList = Arrays.asList(ListInterfaceImplOne.class, - ListInterfaceImplTwo.class); - private static final List<String> injectedIntegerList = Arrays.asList("1", "2", "3"); - private static final List<String> injectedDoubleList = Arrays.asList("1", "2", "3"); - private static final List<String> injectedStringList = Arrays.asList("1", "2", "3"); + private static final List<Class<? extends ListInterface>> INJECTED_IMPL_LIST = + Arrays.asList(ListInterfaceImplOne.class, ListInterfaceImplTwo.class); + private static final List<String> INJECTED_INTEGER_LIST = Arrays.asList("1", "2", "3"); + private static final List<String> INJECTED_DOUBLE_LIST = Arrays.asList("1", "2", "3"); + private static final List<String> INJECTED_STRING_LIST = Arrays.asList("1", "2", "3"); public static final ConfigurationModule CONF = new TestConfiguration() .bindImplementation(RootInterface.class, RootImplementation.class) @@ -55,7 +55,7 @@ public class TestConfiguration extends ConfigurationModuleBuilder { .bindSetEntry(SetOfInstances.class, SetInterfaceImplOne.class) .bindSetEntry(SetOfInstances.class, SetInterfaceImplTwo.class) // Adds list implementations - .bindList(ListOfInstances.class, injectedImplList) + .bindList(ListOfInstances.class, INJECTED_IMPL_LIST) .bindNamedParameter(RequiredString.class, REQUIRED_STRING) .bindNamedParameter(OptionalString.class, OPTIONAL_STRING) // Sets of base types @@ -69,9 +69,9 @@ public class TestConfiguration extends ConfigurationModuleBuilder { .bindSetEntry(SetOfBaseTypes.Strings.class, "2") .bindSetEntry(SetOfBaseTypes.Strings.class, "3") // Lists of base types - .bindList(ListOfBaseTypes.Integers.class, injectedIntegerList) - .bindList(ListOfBaseTypes.Doubles.class, injectedDoubleList) - .bindList(ListOfBaseTypes.Strings.class, injectedStringList) + .bindList(ListOfBaseTypes.Integers.class, INJECTED_INTEGER_LIST) + .bindList(ListOfBaseTypes.Doubles.class, INJECTED_DOUBLE_LIST) + .bindList(ListOfBaseTypes.Strings.class, INJECTED_STRING_LIST) .build(); @NamedParameter() http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/TestConfigurationWithoutList.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/TestConfigurationWithoutList.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/TestConfigurationWithoutList.java index 48be067..8728548 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/TestConfigurationWithoutList.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/TestConfigurationWithoutList.java @@ -28,7 +28,7 @@ import org.apache.reef.tang.formats.RequiredParameter; import java.util.Set; /** - * All the configuration parameters and options for the test without list + * All the configuration parameters and options for the test without list. */ public class TestConfigurationWithoutList extends ConfigurationModuleBuilder { public static final String REQUIRED_STRING_VALUE = "Required String Value"; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/UnitClass.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/UnitClass.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/UnitClass.java index 58eb162..1c65a00 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/UnitClass.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/UnitClass.java @@ -23,7 +23,7 @@ import org.apache.reef.tang.annotations.Unit; import javax.inject.Inject; /** - * A test user for the @Unit annotation + * A test user for the @Unit annotation. */ @Unit final class UnitClass { @@ -45,13 +45,21 @@ final class UnitClass { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } UnitClass unitClass = (UnitClass) o; - if (intValue != unitClass.intValue) return false; - if (stringValue != null ? !stringValue.equals(unitClass.stringValue) : unitClass.stringValue != null) return false; + if (intValue != unitClass.intValue) { + return false; + } + if (stringValue != null ? !stringValue.equals(unitClass.stringValue) : unitClass.stringValue != null) { + return false; + } return true; } @@ -73,12 +81,18 @@ final class UnitClass { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } IntegerHandler that = (IntegerHandler) o; - if (foo != that.foo) return false; + if (foo != that.foo) { + return false; + } return true; } @@ -99,12 +113,18 @@ final class UnitClass { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } StringHandler that = (StringHandler) o; - if (bar != that.bar) return false; + if (bar != that.bar) { + return false; + } return true; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/AllTestsSuite.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/AllTestsSuite.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/AllTestsSuite.java index 2d12697..8f58134 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/AllTestsSuite.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/AllTestsSuite.java @@ -51,6 +51,6 @@ import org.junit.runners.Suite; EvaluatorFailureTest.class, ExamplesTestSuite.class, ConfigurationProviderTest.class -}) + }) public final class AllTestsSuite { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/FailureTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/FailureTest.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/FailureTest.java index 638edad..ca22502 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/FailureTest.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/FailureTest.java @@ -47,7 +47,8 @@ public class FailureTest { public void testFailureRestart() throws InjectionException { final Configuration runtimeConfiguration = this.testEnvironment.getRuntimeConfiguration(); - final LauncherStatus status = FailureREEF.runFailureReef(runtimeConfiguration, this.testEnvironment.getTestTimeout()); + final LauncherStatus status = + FailureREEF.runFailureReef(runtimeConfiguration, this.testEnvironment.getTestTimeout()); Assert.assertTrue("FailureReef failed: " + status, status.isSuccess()); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/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 2a0af1c..5311b5e 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 @@ -33,19 +33,19 @@ import org.apache.reef.tang.Tang; public final class LocalTestEnvironment extends TestEnvironmentBase implements TestEnvironment { /** - * The upper limit on the number of Evaluators that the local resourcemanager will hand out concurrently + * The upper limit on the number of Evaluators that the local resourcemanager will hand out concurrently. */ public static final int MAX_NUMBER_OF_EVALUATORS = 4; // Used to make sure the tests call the methods in the right order. private boolean ready = false; @Override - public synchronized final void setUp() { + public synchronized void setUp() { this.ready = true; } @Override - public synchronized final Configuration getRuntimeConfiguration() { + public synchronized Configuration getRuntimeConfiguration() { assert (this.ready); final String rootFolder = System.getProperty("org.apache.reef.runtime.local.folder"); final JavaConfigurationBuilder jcb = Tang.Factory.getTang().newConfigurationBuilder(); @@ -65,7 +65,7 @@ public final class LocalTestEnvironment extends TestEnvironmentBase implements T } @Override - public synchronized final void tearDown() { + public synchronized void tearDown() { assert (this.ready); this.ready = false; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/MesosTestEnvironment.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/MesosTestEnvironment.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/MesosTestEnvironment.java index 4d5346f..7f7d4f2 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/MesosTestEnvironment.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/MesosTestEnvironment.java @@ -19,7 +19,6 @@ package org.apache.reef.tests; import org.apache.reef.runtime.mesos.client.MesosClientConfiguration; -import org.apache.reef.runtime.yarn.client.YarnClientConfiguration; import org.apache.reef.tang.Configuration; import org.apache.reef.tang.exceptions.BindException; @@ -32,12 +31,12 @@ public final class MesosTestEnvironment extends TestEnvironmentBase implements T private boolean ready = false; @Override - public synchronized final void setUp() { + public synchronized void setUp() { this.ready = true; } @Override - public synchronized final Configuration getRuntimeConfiguration() { + public synchronized Configuration getRuntimeConfiguration() { assert (this.ready); try { if (System.getenv("REEF_TEST_MESOS_MASTER_IP").equals("")) { @@ -54,7 +53,7 @@ public final class MesosTestEnvironment extends TestEnvironmentBase implements T } @Override - public synchronized final void tearDown() { + public synchronized void tearDown() { assert (this.ready); this.ready = false; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/ProbabilisticTests.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/ProbabilisticTests.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/ProbabilisticTests.java index 419943a..011493f 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/ProbabilisticTests.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/ProbabilisticTests.java @@ -28,6 +28,6 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ TaskCountingTest.class -}) + }) public final class ProbabilisticTests { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/TestEnvironmentBase.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/TestEnvironmentBase.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/TestEnvironmentBase.java index 2f4b903..fc7540d 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/TestEnvironmentBase.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/TestEnvironmentBase.java @@ -24,7 +24,7 @@ import org.apache.reef.tang.Configuration; import org.apache.reef.tang.exceptions.InjectionException; /** - * Abstract base class for TestEnvironments + * Abstract base class for TestEnvironments. */ public abstract class TestEnvironmentBase implements TestEnvironment { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/TestEnvironmentFactory.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/TestEnvironmentFactory.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/TestEnvironmentFactory.java index 9714921..ab1454b 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/TestEnvironmentFactory.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/TestEnvironmentFactory.java @@ -26,7 +26,7 @@ import java.util.logging.Logger; */ public final class TestEnvironmentFactory { - private final static Logger LOG = Logger.getLogger(TestEnvironmentFactory.class.getName()); + private static final Logger LOG = Logger.getLogger(TestEnvironmentFactory.class.getName()); /** * If $REEF_TEST_YARN environment variable is not set or is set to false, @@ -51,4 +51,10 @@ public final class TestEnvironmentFactory { return new LocalTestEnvironment(); } } + + /** + * Empty private constructor to prohibit instantiation of utility class. + */ + private TestEnvironmentFactory() { + } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/TestUtils.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/TestUtils.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/TestUtils.java index e45ef24..ed51ca7 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/TestUtils.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/TestUtils.java @@ -60,4 +60,10 @@ public final class TestUtils { } return false; } + + /** + * Empty private constructor to prohibit instantiation of utility class. + */ + private TestUtils() { + } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/YarnTestEnvironment.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/YarnTestEnvironment.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/YarnTestEnvironment.java index cae1578..f598c41 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/YarnTestEnvironment.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/YarnTestEnvironment.java @@ -31,12 +31,12 @@ public final class YarnTestEnvironment extends TestEnvironmentBase implements Te private boolean ready = false; @Override - public synchronized final void setUp() { + public synchronized void setUp() { this.ready = true; } @Override - public synchronized final Configuration getRuntimeConfiguration() { + public synchronized Configuration getRuntimeConfiguration() { assert (this.ready); try { return YarnClientConfiguration.CONF.build(); @@ -46,7 +46,7 @@ public final class YarnTestEnvironment extends TestEnvironmentBase implements Te } @Override - public synchronized final void tearDown() { + public synchronized void tearDown() { assert (this.ready); this.ready = false; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/close_eval/package-info.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/close_eval/package-info.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/close_eval/package-info.java new file mode 100644 index 0000000..29f8cbf --- /dev/null +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/close_eval/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +/** + * TODO: Document. + */ +package org.apache.reef.tests.close_eval; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/ConfigurationProviderTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/ConfigurationProviderTest.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/ConfigurationProviderTest.java index 6482456..f03ebe3 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/ConfigurationProviderTest.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/ConfigurationProviderTest.java @@ -33,7 +33,7 @@ import org.junit.Before; import org.junit.Test; /** - * Tests the ConfigurationProvider mechanism + * Tests the ConfigurationProvider mechanism. */ public final class ConfigurationProviderTest { private final TestEnvironment testEnvironment = TestEnvironmentFactory.getNewTestEnvironment(); @@ -43,7 +43,7 @@ public final class ConfigurationProviderTest { * * @return the runtime configuration. */ - private final Configuration getRuntimeConfiguration() { + private Configuration getRuntimeConfiguration() { return Tang.Factory.getTang() .newConfigurationBuilder(testEnvironment.getRuntimeConfiguration()) .bindSetEntry(DriverConfigurationProviders.class, TestDriverConfigurationProvider.class) @@ -55,12 +55,14 @@ public final class ConfigurationProviderTest { * * @return the Driver configuration. */ - private final Configuration getDriverConfiguration() { + private Configuration getDriverConfiguration() { return DriverConfiguration.CONF .set(DriverConfiguration.DRIVER_IDENTIFIER, "ConfigurationProviderTest") - .set(DriverConfiguration.GLOBAL_LIBRARIES, EnvironmentUtils.getClassLocation(ConfigurationProviderTestDriver.class)) + .set(DriverConfiguration.GLOBAL_LIBRARIES, + EnvironmentUtils.getClassLocation(ConfigurationProviderTestDriver.class)) .set(DriverConfiguration.ON_DRIVER_STARTED, ConfigurationProviderTestDriver.StartHandler.class) - .set(DriverConfiguration.ON_EVALUATOR_ALLOCATED, ConfigurationProviderTestDriver.EvaluatorAllocatedHandler.class) + .set(DriverConfiguration.ON_EVALUATOR_ALLOCATED, + ConfigurationProviderTestDriver.EvaluatorAllocatedHandler.class) .build(); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/DriverAndEvaluatorParameter.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/DriverAndEvaluatorParameter.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/DriverAndEvaluatorParameter.java index a07ff03..2e17d88 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/DriverAndEvaluatorParameter.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/DriverAndEvaluatorParameter.java @@ -28,4 +28,9 @@ import org.apache.reef.tang.annotations.NamedParameter; public final class DriverAndEvaluatorParameter implements Name<String> { public static final String TEST_VALUE = "This is a parameter to be bound in the Driver and Evaluator config"; + /** + * Empty private constructor to prohibit instantiation of utility class. + */ + private DriverAndEvaluatorParameter() { + } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/DriverParameter.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/DriverParameter.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/DriverParameter.java index 49fba61..6710807 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/DriverParameter.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/DriverParameter.java @@ -25,6 +25,12 @@ import org.apache.reef.tang.annotations.NamedParameter; * This is a parameter only to be bound in the Driver config. */ @NamedParameter -public class DriverParameter implements Name<String> { +public final class DriverParameter implements Name<String> { public static final String TEST_VALUE = "This is a parameter only to be bound in the Driver config."; + + /** + * Empty private constructor to prohibit instantiation of utility class. + */ + private DriverParameter() { + } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/EvaluatorParameter.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/EvaluatorParameter.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/EvaluatorParameter.java index 56cfb56..e1ab06b 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/EvaluatorParameter.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/EvaluatorParameter.java @@ -25,6 +25,12 @@ import org.apache.reef.tang.annotations.NamedParameter; * This is a parameter only to be bound in the Evaluator config. */ @NamedParameter -public class EvaluatorParameter implements Name<String> { +public final class EvaluatorParameter implements Name<String> { public static final String TEST_VALUE = "This is a parameter only to be bound in the Evaluator config"; + + /** + * Empty private constructor to prohibit instantiation of utility class. + */ + private EvaluatorParameter() { + } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/package-info.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/package-info.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/package-info.java index 1b33411..621bebb 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/package-info.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/configurationproviders/parameters/package-info.java @@ -17,6 +17,6 @@ * under the License. */ /** - * Parameters used in ConfigurationProviderTest + * Parameters used in ConfigurationProviderTest. */ -package org.apache.reef.tests.configurationproviders.parameters; \ No newline at end of file +package org.apache.reef.tests.configurationproviders.parameters; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/driver/package-info.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/driver/package-info.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/driver/package-info.java new file mode 100644 index 0000000..4e7b889 --- /dev/null +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/driver/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +/** + * TODO: Document. + */ +package org.apache.reef.tests.driver; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorexit/EvaluatorExitTestTask.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorexit/EvaluatorExitTestTask.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorexit/EvaluatorExitTestTask.java index 1e4c195..7d4a78f 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorexit/EvaluatorExitTestTask.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorexit/EvaluatorExitTestTask.java @@ -23,7 +23,7 @@ import org.apache.reef.task.Task; import javax.inject.Inject; /** - * Merely calls System.exit() + * Merely calls System.exit(). */ final class EvaluatorExitTestTask implements Task { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorfailure/EvaluatorFailureTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorfailure/EvaluatorFailureTest.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorfailure/EvaluatorFailureTest.java index 2d746d5..41f6817 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorfailure/EvaluatorFailureTest.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorfailure/EvaluatorFailureTest.java @@ -57,10 +57,12 @@ public class EvaluatorFailureTest { final Configuration runtimeConfiguration = this.testEnvironment.getRuntimeConfiguration(); final Configuration driverConfiguration = DriverConfiguration.CONF - .set(DriverConfiguration.GLOBAL_LIBRARIES, EnvironmentUtils.getClassLocation(EvaluatorFailureDuringAlarmDriver.class)) + .set(DriverConfiguration.GLOBAL_LIBRARIES, + EnvironmentUtils.getClassLocation(EvaluatorFailureDuringAlarmDriver.class)) .set(DriverConfiguration.DRIVER_IDENTIFIER, "TEST_EvaluatorFailureTest") .set(DriverConfiguration.ON_DRIVER_STARTED, OnDriverStartedAllocateOne.class) - .set(DriverConfiguration.ON_EVALUATOR_ALLOCATED, EvaluatorFailureDuringAlarmDriver.EvaluatorAllocatedHandler.class) + .set(DriverConfiguration.ON_EVALUATOR_ALLOCATED, + EvaluatorFailureDuringAlarmDriver.EvaluatorAllocatedHandler.class) .set(DriverConfiguration.ON_EVALUATOR_FAILED, EvaluatorFailureDuringAlarmDriver.EvaluatorFailureHandler.class) .set(DriverConfiguration.ON_CONTEXT_FAILED, EvaluatorFailureDuringAlarmDriver.ContextFailureHandler.class) .set(DriverConfiguration.ON_TASK_FAILED, EvaluatorFailureDuringAlarmDriver.TaskFailureHandler.class) @@ -70,6 +72,7 @@ public class EvaluatorFailureTest { final LauncherStatus status = DriverLauncher.getLauncher(runtimeConfiguration) .run(driverConfiguration, this.testEnvironment.getTestTimeout()); - Assert.assertTrue("EvaluatorFailureTest.testEvaluatorFailureByAlarmHandler() state = " + status, status.isSuccess()); + Assert.assertTrue("EvaluatorFailureTest.testEvaluatorFailureByAlarmHandler() state = " + status, + status.isSuccess()); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorreuse/package-info.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorreuse/package-info.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorreuse/package-info.java new file mode 100644 index 0000000..6c5ec4a --- /dev/null +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorreuse/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +/** + * TODO: Document. + */ +package org.apache.reef.tests.evaluatorreuse; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorsize/EvaluatorSizeTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorsize/EvaluatorSizeTest.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorsize/EvaluatorSizeTest.java index 89501cd..2230552 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorsize/EvaluatorSizeTest.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorsize/EvaluatorSizeTest.java @@ -34,7 +34,7 @@ import org.junit.Before; import org.junit.Test; /** - * Tests whether Evaluator allocations requested with a given amount of memory are (over-)fullfilled. + * Tests whether Evaluator allocations requested with a given amount of memory are (over-)fulfilled. */ public class EvaluatorSizeTest { private final TestEnvironment testEnvironment = TestEnvironmentFactory.getNewTestEnvironment(); @@ -60,7 +60,8 @@ public class EvaluatorSizeTest { .set(DriverConfiguration.GLOBAL_LIBRARIES, EnvironmentUtils.getClassLocation(this.getClass())) .set(DriverConfiguration.DRIVER_IDENTIFIER, "TEST_EvaluatorSizeTest-" + megaBytes) .set(DriverConfiguration.ON_DRIVER_STARTED, EvaluatorSizeTestDriver.StartHandler.class) - .set(DriverConfiguration.ON_EVALUATOR_ALLOCATED, EvaluatorSizeTestDriver.EvaluatorAllocatedHandler.class).build(); + .set(DriverConfiguration.ON_EVALUATOR_ALLOCATED, + EvaluatorSizeTestDriver.EvaluatorAllocatedHandler.class).build(); final Configuration mergedDriverConfiguration = Tang.Factory.getTang() .newConfigurationBuilder(driverConfiguration, testConfiguration).build(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorsize/EvaluatorSizeTestDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorsize/EvaluatorSizeTestDriver.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorsize/EvaluatorSizeTestDriver.java index 60bbdee..6a57132 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorsize/EvaluatorSizeTestDriver.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorsize/EvaluatorSizeTestDriver.java @@ -44,7 +44,7 @@ final class EvaluatorSizeTestDriver { @Inject public EvaluatorSizeTestDriver(final EvaluatorRequestor evaluatorRequestor, - final @Parameter(EvaluatorSizeTestConfiguration.MemorySize.class) int memorySize) { + @Parameter(EvaluatorSizeTestConfiguration.MemorySize.class) final int memorySize) { this.evaluatorRequestor = evaluatorRequestor; this.memorySize = memorySize; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorsize/MemorySizeTask.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorsize/MemorySizeTask.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorsize/MemorySizeTask.java index 899489d..c82332f 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorsize/MemorySizeTask.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/evaluatorsize/MemorySizeTask.java @@ -27,11 +27,11 @@ import javax.inject.Inject; final class MemorySizeTask implements Task { private static final int MEGA = 1048576; - private static final int allowedDelta = 128; // TODO: This should'nt be necessary. Could be the perm size we set. + private static final int ALLOWED_DELTA = 128; // TODO: This shouldn't be necessary. Could be the perm size we set. private final int memorySize; @Inject - public MemorySizeTask(final @Parameter(EvaluatorSizeTestConfiguration.MemorySize.class) int memorySize) { + public MemorySizeTask(@Parameter(EvaluatorSizeTestConfiguration.MemorySize.class) final int memorySize) { this.memorySize = memorySize; } @@ -40,7 +40,7 @@ final class MemorySizeTask implements Task { final long maxHeapSizeInBytes = Runtime.getRuntime().maxMemory(); final long maxHeapSizeMB = maxHeapSizeInBytes / MEGA; - if (maxHeapSizeMB < (this.memorySize - allowedDelta)) { + if (maxHeapSizeMB < (this.memorySize - ALLOWED_DELTA)) { throw new TaskSideFailure("Got an Evaluator with too little RAM. Asked for " + this.memorySize + "MB, but got " + maxHeapSizeMB + "MB."); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/examples/ExamplesTestSuite.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/examples/ExamplesTestSuite.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/examples/ExamplesTestSuite.java index 89036a7..3ec0ec8 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/examples/ExamplesTestSuite.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/examples/ExamplesTestSuite.java @@ -27,6 +27,6 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ TestHelloREEF.class -}) + }) public final class ExamplesTestSuite { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/examples/package-info.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/examples/package-info.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/examples/package-info.java index 9e21405..e428bb4 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/examples/package-info.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/examples/package-info.java @@ -17,6 +17,6 @@ * under the License. */ /** - * Tests of the REEF Examples + * Tests of the REEF Examples. */ package org.apache.reef.tests.examples; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/fail/FailTestSuite.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/fail/FailTestSuite.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/fail/FailTestSuite.java index 41b9ac0..d7eafb5 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/fail/FailTestSuite.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/fail/FailTestSuite.java @@ -27,6 +27,6 @@ import org.junit.runners.Suite; FailDriverTest.class, FailDriverDelayedMsgTest.class, DriverFailOnFailTest.class -}) + }) public final class FailTestSuite { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/fail/package-info.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/fail/package-info.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/fail/package-info.java new file mode 100644 index 0000000..09aada0 --- /dev/null +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/fail/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +/** + * TODO: Document. + */ +package org.apache.reef.tests.fail; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/files/FileResourceTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/files/FileResourceTest.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/files/FileResourceTest.java index b93f2a3..5868267 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/files/FileResourceTest.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/files/FileResourceTest.java @@ -79,7 +79,7 @@ public final class FileResourceTest { } /** - * Assembles the configuration based on TestDriverConfiguration + * Assembles the configuration based on TestDriverConfiguration. * * @param theFiles * @return @@ -90,7 +90,8 @@ public final class FileResourceTest { ConfigurationModule testDriverConfigurationModule = FileResourceTestDriverConfiguration.CONF; for (final File f : theFiles) { LOG.log(Level.FINEST, "Adding a file to the TestDriverConfiguration: " + f.getName()); - testDriverConfigurationModule = testDriverConfigurationModule.set(FileResourceTestDriverConfiguration.EXPECTED_FILE_NAME, f.getName()); + testDriverConfigurationModule = + testDriverConfigurationModule.set(FileResourceTestDriverConfiguration.EXPECTED_FILE_NAME, f.getName()); } final Configuration testDriverConfiguration = testDriverConfigurationModule.build(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/files/FileResourceTestDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/files/FileResourceTestDriver.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/files/FileResourceTestDriver.java index 00388af..76fcde5 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/files/FileResourceTestDriver.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/files/FileResourceTestDriver.java @@ -49,7 +49,8 @@ final class FileResourceTestDriver { private final File localFolder; @Inject - public FileResourceTestDriver(@Parameter(FileResourceTestDriverConfiguration.FileNamesToExpect.class) final Set<String> fileNamesToExpect, + public FileResourceTestDriver(@Parameter(FileResourceTestDriverConfiguration.FileNamesToExpect.class) + final Set<String> fileNamesToExpect, final EvaluatorRequestor requestor, final REEFFileNames fileNames) { this.fileNamesToExpect = fileNamesToExpect; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/files/FileResourceTestTask.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/files/FileResourceTestTask.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/files/FileResourceTestTask.java index c3a72fb..a8e0fc1 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/files/FileResourceTestTask.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/files/FileResourceTestTask.java @@ -34,13 +34,14 @@ import java.util.logging.Logger; * An Task that checks the presence of a set of files and throws TaskSideFailure if they cannot be found or read. */ final class FileResourceTestTask implements Task { - private final Logger LOG = Logger.getLogger(FileResourceTestTask.class.getName()); + private static final Logger LOG = Logger.getLogger(FileResourceTestTask.class.getName()); private final Set<String> expectedFileNames; private final Clock clock; private final File localFolder; @Inject - FileResourceTestTask(@Parameter(FileResourceTestTaskConfiguration.FileNamesToExpect.class) final Set<String> expectedFileNames, + FileResourceTestTask(@Parameter(FileResourceTestTaskConfiguration.FileNamesToExpect.class) + final Set<String> expectedFileNames, final Clock clock, final REEFFileNames fileNames) { this.expectedFileNames = expectedFileNames; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/ActiveContextHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/ActiveContextHandler.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/ActiveContextHandler.java index c6572c4..06ab37a 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/ActiveContextHandler.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/ActiveContextHandler.java @@ -30,7 +30,7 @@ import java.util.logging.Level; import java.util.logging.Logger; /** - * The ActiveContext handler + * The ActiveContext handler. */ public final class ActiveContextHandler implements EventHandler<ActiveContext> { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/AllocatedEvaluatorHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/AllocatedEvaluatorHandler.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/AllocatedEvaluatorHandler.java index 57c1205..a84745d 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/AllocatedEvaluatorHandler.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/AllocatedEvaluatorHandler.java @@ -30,7 +30,7 @@ import java.util.logging.Level; import java.util.logging.Logger; /** - * The allocated evaluator handler + * The allocated evaluator handler. */ public final class AllocatedEvaluatorHandler implements EventHandler<AllocatedEvaluator> { @@ -41,8 +41,9 @@ public final class AllocatedEvaluatorHandler implements EventHandler<AllocatedEv @Inject public AllocatedEvaluatorHandler() { ++countInstances; - if (countInstances > 1) + if (countInstances > 1) { throw new DriverSideFailure("Expect AllocatedEvaluatorHandler to be created only once"); + } } @Override http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/CompletedTaskHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/CompletedTaskHandler.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/CompletedTaskHandler.java index a8b7493..2b8c0fe 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/CompletedTaskHandler.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/CompletedTaskHandler.java @@ -38,8 +38,9 @@ public class CompletedTaskHandler implements EventHandler<CompletedTask> { @Inject public CompletedTaskHandler() { ++countInstances; - if (countInstances > 1) + if (countInstances > 1) { throw new DriverSideFailure("Expect CompletedTaskHandler to be created only once"); + } } @Override http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/StartHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/StartHandler.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/StartHandler.java index ac9132b..0d1cc7c 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/StartHandler.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/StartHandler.java @@ -29,7 +29,7 @@ import java.util.logging.Level; import java.util.logging.Logger; /** - * The start handler + * The start handler. */ public final class StartHandler implements EventHandler<StartTime> { @@ -46,8 +46,9 @@ public final class StartHandler implements EventHandler<StartTime> { public StartHandler(final EvaluatorRequestor requestor) { this.requestor = requestor; ++countInstances; - if (countInstances > 1) + if (countInstances > 1) { throw new DriverSideFailure("Expect StartHandler be created only once"); + } } @Override http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/package-info.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/package-info.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/package-info.java new file mode 100644 index 0000000..1b169bc --- /dev/null +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/multipleEventHandlerInstances/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +/** + * TODO: Document. + */ +package org.apache.reef.tests.multipleEventHandlerInstances; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/package-info.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/package-info.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/package-info.java new file mode 100644 index 0000000..d9f1bdf --- /dev/null +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +/** + * TODO: Document. + */ +package org.apache.reef.tests; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/rack/awareness/RackAwareEvaluatorTestDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/rack/awareness/RackAwareEvaluatorTestDriver.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/rack/awareness/RackAwareEvaluatorTestDriver.java index cdf1be8..3f0da84 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/rack/awareness/RackAwareEvaluatorTestDriver.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/rack/awareness/RackAwareEvaluatorTestDriver.java @@ -38,14 +38,15 @@ final class RackAwareEvaluatorTestDriver { } /** - * Verifies whether the rack received is the default rack + * Verifies whether the rack received is the default rack. */ final class EvaluatorAllocatedHandler implements EventHandler<AllocatedEvaluator> { @Override public void onNext(final AllocatedEvaluator allocatedEvaluator) { - final String actual = allocatedEvaluator.getEvaluatorDescriptor().getNodeDescriptor().getRackDescriptor().getName(); + final String actual = + allocatedEvaluator.getEvaluatorDescriptor().getNodeDescriptor().getRackDescriptor().getName(); if (!expectedRackName.equals(actual)) { throw new DriverSideFailure("The rack received is different that the expected one, received " + actual + " expected " + expectedRackName); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/rack/awareness/package-info.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/rack/awareness/package-info.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/rack/awareness/package-info.java index 2cbd7dc..7129782 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/rack/awareness/package-info.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/rack/awareness/package-info.java @@ -17,6 +17,6 @@ * under the License. */ /** - * Tests whether the rack information is correctly carried from the runtime to the Driver + * Tests whether the rack information is correctly carried from the runtime to the Driver. */ package org.apache.reef.tests.rack.awareness; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/subcontexts/SubContextDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/subcontexts/SubContextDriver.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/subcontexts/SubContextDriver.java index 2e1b3b0..bead848 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/subcontexts/SubContextDriver.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/subcontexts/SubContextDriver.java @@ -36,8 +36,8 @@ final class SubContextDriver { private static final Logger LOG = Logger.getLogger(SubContextDriver.class.getName()); - private static String CONTEXT_1_IDENTIFIER = "CONTEXT_1"; - private static String CONTEXT_2_IDENTIFIER = "CONTEXT_2"; + private static final String CONTEXT_1_IDENTIFIER = "CONTEXT_1"; + private static final String CONTEXT_2_IDENTIFIER = "CONTEXT_2"; private State state = State.INIT; // lock: this http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tests/src/test/java/org/apache/reef/tests/taskcounting/TaskCountingDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/taskcounting/TaskCountingDriver.java b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/taskcounting/TaskCountingDriver.java index 9067efc..bd5b6f6 100644 --- a/lang/java/reef-tests/src/test/java/org/apache/reef/tests/taskcounting/TaskCountingDriver.java +++ b/lang/java/reef-tests/src/test/java/org/apache/reef/tests/taskcounting/TaskCountingDriver.java @@ -44,7 +44,7 @@ final class TaskCountingDriver { TaskCountingDriver() { } - private final Configuration getTaskConfiguration(final String taskId) { + private Configuration getTaskConfiguration(final String taskId) { return TaskConfiguration.CONF .set(TaskConfiguration.IDENTIFIER, taskId) .set(TaskConfiguration.TASK, NoopTask.class) http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/CacheImplConcurrentTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/CacheImplConcurrentTest.java b/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/CacheImplConcurrentTest.java index 07927cb..64e55e9 100644 --- a/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/CacheImplConcurrentTest.java +++ b/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/CacheImplConcurrentTest.java @@ -31,7 +31,7 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; /** - * Test concurrent access of CacheImpl + * Test concurrent access of CacheImpl. */ public final class CacheImplConcurrentTest { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/CacheImplTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/CacheImplTest.java b/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/CacheImplTest.java index 3a1f722..62934c1 100644 --- a/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/CacheImplTest.java +++ b/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/CacheImplTest.java @@ -26,7 +26,7 @@ import java.util.concurrent.ExecutionException; import static org.junit.Assert.assertEquals; /** - * Test basic access of CacheImpl + * Test basic access of CacheImpl. */ public final class CacheImplTest { @@ -40,7 +40,7 @@ public final class CacheImplTest { } /** - * Test that an immediate get on the same key returns the cached value instead of triggering a new computation + * Test that an immediate get on the same key returns the cached value instead of triggering a new computation. */ @Test public void testGet() throws ExecutionException, InterruptedException { @@ -58,7 +58,7 @@ public final class CacheImplTest { } /** - * Test that an invalidate clears the cached value, so the next access triggers a new computation + * Test that an invalidate clears the cached value, so the next access triggers a new computation. */ @Test public void testInvalidate() throws ExecutionException { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/ImmediateInteger.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/ImmediateInteger.java b/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/ImmediateInteger.java index 268f72f..4fbc3e5 100644 --- a/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/ImmediateInteger.java +++ b/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/ImmediateInteger.java @@ -21,7 +21,7 @@ package org.apache.reef.util.cache; import java.util.concurrent.Callable; /** - * A mock computation that immediately returns an integer + * A mock computation that immediately returns an integer. */ class ImmediateInteger implements Callable<Integer> { private final int returnValue; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/SleepingInteger.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/SleepingInteger.java b/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/SleepingInteger.java index 9e0d2e5..0c642d2 100644 --- a/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/SleepingInteger.java +++ b/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/SleepingInteger.java @@ -21,14 +21,14 @@ package org.apache.reef.util.cache; import java.util.concurrent.Callable; /** - * A mock computation that simulates computation time by sleeping and returns an integer + * A mock computation that simulates computation time by sleeping and returns an integer. */ class SleepingInteger implements Callable<Integer> { private final int returnValue; private final long sleepMillis; /** - * Construct the mock value fetcher + * Construct the mock value fetcher. * * @param returnValue value to return * @param sleepMillis amount to sleep http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/WrappedValueTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/WrappedValueTest.java b/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/WrappedValueTest.java index e23de2b..e2f2ac5 100644 --- a/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/WrappedValueTest.java +++ b/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/WrappedValueTest.java @@ -28,13 +28,13 @@ import java.util.concurrent.Future; import static org.junit.Assert.*; public final class WrappedValueTest { - private static final CurrentTime systemTime = new SystemTime(); - private static final int numThreads = 10; + private static final CurrentTime SYSTEM_TIME = new SystemTime(); + private static final int NUM_THREADS = 10; @Test public void testLoadAndGet() throws ExecutionException { final Integer value = 5; - final WrappedValue<Integer> wrappedValue = new WrappedValue<>(new ImmediateInteger(value), systemTime); + final WrappedValue<Integer> wrappedValue = new WrappedValue<>(new ImmediateInteger(value), SYSTEM_TIME); assertFalse(wrappedValue.getValue().isPresent()); @@ -47,7 +47,7 @@ public final class WrappedValueTest { @Test public void testWaitAndGetOnPreviouslyLoadedValue() throws ExecutionException { final Integer value = 5; - final WrappedValue<Integer> wrappedValue = new WrappedValue<>(new ImmediateInteger(value), systemTime); + final WrappedValue<Integer> wrappedValue = new WrappedValue<>(new ImmediateInteger(value), SYSTEM_TIME); final Integer loadedValue = wrappedValue.loadAndGet(); final Integer waitedValue = wrappedValue.waitAndGet(); @@ -62,14 +62,14 @@ public final class WrappedValueTest { public void testConcurrentLoadWaitAndGet() throws ExecutionException, InterruptedException { final Integer value = 5; final long sleepMillis = 2000; - final ExecutorService executorService = Executors.newFixedThreadPool(numThreads); + final ExecutorService executorService = Executors.newFixedThreadPool(NUM_THREADS); final WrappedValue<Integer> wrappedValue = new WrappedValue<>( - new SleepingInteger(value, sleepMillis), systemTime); + new SleepingInteger(value, sleepMillis), SYSTEM_TIME); final Integer loadedValue = wrappedValue.loadAndGet(); - final Future<?>[] futures = new Future<?>[numThreads]; - for (int i = 0; i < numThreads; i++) { + final Future<?>[] futures = new Future<?>[NUM_THREADS]; + for (int i = 0; i < NUM_THREADS; i++) { futures[i] = executorService.submit(new Runnable() { @Override public void run() { @@ -79,7 +79,7 @@ public final class WrappedValueTest { } }); } - for (int i = 0; i < numThreads; i++) { + for (int i = 0; i < NUM_THREADS; i++) { futures[i].get(); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/package-info.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/package-info.java b/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/package-info.java new file mode 100644 index 0000000..b1dcd37 --- /dev/null +++ b/lang/java/reef-utils/src/test/java/org/apache/reef/util/cache/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +/** + * TODO: Document. + */ +package org.apache.reef.util.cache; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-utils/src/test/java/org/apache/reef/util/package-info.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-utils/src/test/java/org/apache/reef/util/package-info.java b/lang/java/reef-utils/src/test/java/org/apache/reef/util/package-info.java new file mode 100644 index 0000000..9c0bc9e --- /dev/null +++ b/lang/java/reef-utils/src/test/java/org/apache/reef/util/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +/** + * TODO: Document. + */ +package org.apache.reef.util; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/BlockingEventHandlerTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/BlockingEventHandlerTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/BlockingEventHandlerTest.java index 6da576f..4ff123b 100644 --- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/BlockingEventHandlerTest.java +++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/BlockingEventHandlerTest.java @@ -177,13 +177,16 @@ public class BlockingEventHandlerTest { }; Thread[] workers = new Thread[num]; - for (int ii = 0; ii < workers.length; ii++) + for (int ii = 0; ii < workers.length; ii++) { workers[ii] = new Thread(r); - for (Thread w : workers) + } + for (Thread w : workers) { w.start(); + } try { - for (Thread w : workers) + for (Thread w : workers) { w.join(); + } } catch (InterruptedException e) { fail(e.toString()); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/BlockingSignalEventHandlerTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/BlockingSignalEventHandlerTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/BlockingSignalEventHandlerTest.java index 3d63a0a..99f0276 100644 --- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/BlockingSignalEventHandlerTest.java +++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/BlockingSignalEventHandlerTest.java @@ -63,12 +63,13 @@ public class BlockingSignalEventHandlerTest { final AtomicInteger cnt = new AtomicInteger(0); final int num = 1000; - final BlockingSignalEventHandler<Integer> h = new BlockingSignalEventHandler<>(2 * num, new EventHandler<Integer>() { - @Override - public void onNext(Integer value) { - cnt.incrementAndGet(); - } - }); + final BlockingSignalEventHandler<Integer> h = + new BlockingSignalEventHandler<>(2 * num, new EventHandler<Integer>() { + @Override + public void onNext(Integer value) { + cnt.incrementAndGet(); + } + }); Runnable r = new Runnable() { @Override @@ -98,12 +99,13 @@ public class BlockingSignalEventHandlerTest { final int num = 1000; final int events = 10; - final BlockingSignalEventHandler<Integer> h = new BlockingSignalEventHandler<>(2 * num, new EventHandler<Integer>() { - @Override - public void onNext(Integer value) { - cnt.incrementAndGet(); - } - }); + final BlockingSignalEventHandler<Integer> h = new BlockingSignalEventHandler<>(2 * num, + new EventHandler<Integer>() { + @Override + public void onNext(Integer value) { + cnt.incrementAndGet(); + } + }); Runnable r = new Runnable() { @Override @@ -148,13 +150,16 @@ public class BlockingSignalEventHandlerTest { }; Thread[] workers = new Thread[num]; - for (int ii = 0; ii < workers.length; ii++) + for (int ii = 0; ii < workers.length; ii++) { workers[ii] = new Thread(r); - for (Thread w : workers) + } + for (Thread w : workers) { w.start(); + } try { - for (Thread w : workers) + for (Thread w : workers) { w.join(); + } } catch (InterruptedException e) { fail(e.toString()); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ForkPoolStageTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ForkPoolStageTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ForkPoolStageTest.java index 84b1c81..74b8cec 100644 --- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ForkPoolStageTest.java +++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ForkPoolStageTest.java @@ -33,13 +33,13 @@ import java.util.*; public class ForkPoolStageTest { - final String logPrefix = "TEST "; + private static final String LOG_PREFIX = "TEST "; @Rule public TestName name = new TestName(); @Test public void testPoolStage() throws Exception { - System.out.println(logPrefix + name.getMethodName()); + System.out.println(LOG_PREFIX + name.getMethodName()); Set<TestEvent> procSet = Collections.synchronizedSet(new HashSet<TestEvent>()); Set<TestEvent> orgSet = Collections.synchronizedSet(new HashSet<TestEvent>()); @@ -58,6 +58,7 @@ public class ForkPoolStageTest { } while (procSet.size() < 10) { + // } p.close(); @@ -68,7 +69,7 @@ public class ForkPoolStageTest { @Test public void testSharedPoolStage() throws Exception { - System.out.println(logPrefix + name.getMethodName()); + System.out.println(LOG_PREFIX + name.getMethodName()); Set<TestEvent> procSet = Collections.synchronizedSet(new HashSet<TestEvent>()); Set<TestEvent> orgSet = Collections.synchronizedSet(new HashSet<TestEvent>()); @@ -94,6 +95,7 @@ public class ForkPoolStageTest { } while (procSet.size() < 20) { + // } p.close(); @@ -105,7 +107,7 @@ public class ForkPoolStageTest { @Test public void testMultiSharedPoolStage() throws Exception { - System.out.println(logPrefix + name.getMethodName()); + System.out.println(LOG_PREFIX + name.getMethodName()); Set<TestEvent> procSet = Collections.synchronizedSet(new HashSet<TestEvent>()); Set<TestEvent> orgSet = Collections.synchronizedSet(new HashSet<TestEvent>()); @@ -130,6 +132,7 @@ public class ForkPoolStageTest { } while (procSet.size() < 20) { + // } p.close(); @@ -140,7 +143,7 @@ public class ForkPoolStageTest { @Test public void testMeter() throws Exception { - System.out.println(logPrefix + name.getMethodName()); + System.out.println(LOG_PREFIX + name.getMethodName()); WakeSharedPool p = new WakeSharedPool(10); EventHandler<TestEvent> eventHandler = new TestEventHandler(); ForkPoolStage<TestEvent> stage = new ForkPoolStage<TestEvent>(eventHandler, p); @@ -157,7 +160,7 @@ public class ForkPoolStageTest { @Test public void testMeterTwoStages() throws Exception { - System.out.println(logPrefix + name.getMethodName()); + System.out.println(LOG_PREFIX + name.getMethodName()); WakeSharedPool p = new WakeSharedPool(10); EventHandler<TestEvent> eventHandler = new TestEventHandler(); ForkPoolStage<TestEvent> stage2 = new ForkPoolStage<TestEvent>(eventHandler, p); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/IndependentIterationsThreadPoolStageTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/IndependentIterationsThreadPoolStageTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/IndependentIterationsThreadPoolStageTest.java index c1d82c9..2d4d8bd 100644 --- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/IndependentIterationsThreadPoolStageTest.java +++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/IndependentIterationsThreadPoolStageTest.java @@ -36,12 +36,13 @@ public class IndependentIterationsThreadPoolStageTest { public void testOneIteration() { final AtomicInteger x = new AtomicInteger(0); final int val = 101; - IndependentIterationsThreadPoolStage<Integer> dut = new IndependentIterationsThreadPoolStage<>(new EventHandler<Integer>() { - @Override - public void onNext(Integer value) { - x.addAndGet(value); - } - }, 1, 1); + IndependentIterationsThreadPoolStage<Integer> dut = new IndependentIterationsThreadPoolStage<>( + new EventHandler<Integer>() { + @Override + public void onNext(Integer value) { + x.addAndGet(value); + } + }, 1, 1); List<Integer> ll = new ArrayList<>(); ll.add(val); dut.onNext(ll); @@ -62,13 +63,14 @@ public class IndependentIterationsThreadPoolStageTest { ll.add(i); } - IndependentIterationsThreadPoolStage<Integer> dut = new IndependentIterationsThreadPoolStage<>(new EventHandler<Integer>() { - @Override - public void onNext(Integer value) { - Logger.getAnonymousLogger().info("Yow" + value); - x.addAndGet(value); - } - }, num, 1); + IndependentIterationsThreadPoolStage<Integer> dut = new IndependentIterationsThreadPoolStage<>( + new EventHandler<Integer>() { + @Override + public void onNext(Integer value) { + Logger.getAnonymousLogger().info("Yow" + value); + x.addAndGet(value); + } + }, num, 1); dut.onNext(ll); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/MetricsTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/MetricsTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/MetricsTest.java index c88661e..f996192 100644 --- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/MetricsTest.java +++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/MetricsTest.java @@ -29,13 +29,13 @@ import java.util.Random; public class MetricsTest { - final String logPrefix = "TEST "; + private static final String LOG_PREFIX = "TEST "; @Rule public TestName name = new TestName(); @Test public void testHistogram() throws Exception { - System.out.println(logPrefix + name.getMethodName()); + System.out.println(LOG_PREFIX + name.getMethodName()); Histogram histogram = new UniformHistogram(10, 100); Random rand = new Random(1); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/PubSubThreadPoolStageTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/PubSubThreadPoolStageTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/PubSubThreadPoolStageTest.java index 19cc36f..2836811 100644 --- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/PubSubThreadPoolStageTest.java +++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/PubSubThreadPoolStageTest.java @@ -37,13 +37,13 @@ import java.util.Set; public class PubSubThreadPoolStageTest { - final String logPrefix = "TEST "; + private static final String LOG_PREFIX = "TEST "; @Rule public TestName name = new TestName(); @Test public void testPubSubThreadPoolStage() throws Exception { - System.out.println(logPrefix + name.getMethodName()); + System.out.println(LOG_PREFIX + name.getMethodName()); Monitor monitor = new Monitor(); TimerStage timer = new TimerStage(new TimeoutHandler(monitor), 5000, 5000); @@ -107,8 +107,9 @@ public class PubSubThreadPoolStageTest { public void onNext(TestEvent e) { set.add(e); System.out.println(name + " " + e + " " + e.getMsg()); - if (set.size() == expected) + if (set.size() == expected) { monitor.mnotify(); + } } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/StageManagerTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/StageManagerTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/StageManagerTest.java index 320d9ce..dc2a000 100644 --- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/StageManagerTest.java +++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/StageManagerTest.java @@ -25,8 +25,6 @@ import org.junit.Test; import org.junit.rules.TestName; public class StageManagerTest { - - final String logPrefix = "TEST "; @Rule public TestName name = new TestName(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/SyncStageTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/SyncStageTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/SyncStageTest.java index 5675c5e..552b0ab 100644 --- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/SyncStageTest.java +++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/SyncStageTest.java @@ -32,13 +32,13 @@ import java.util.*; public class SyncStageTest { - final String logPrefix = "TEST "; + private static final String LOG_PREFIX = "TEST "; @Rule public TestName name = new TestName(); @Test public void testSyncStage() throws Exception { - System.out.println(logPrefix + name.getMethodName()); + System.out.println(LOG_PREFIX + name.getMethodName()); Set<TestEvent> procSet = Collections.synchronizedSet(new HashSet<TestEvent>()); Set<TestEvent> orgSet = Collections.synchronizedSet(new HashSet<TestEvent>());
