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/27 21:42:21 UTC
[1/4] incubator-reef git commit: [REEF-487] Enable checkstyle for
test source directories
Repository: incubator-reef
Updated Branches:
refs/heads/master 7b4f9f13c -> a5cc97299
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/ThreadPoolStageTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ThreadPoolStageTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ThreadPoolStageTest.java
index af4f5cd..d4a5048 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ThreadPoolStageTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/ThreadPoolStageTest.java
@@ -33,13 +33,13 @@ import java.util.*;
public class ThreadPoolStageTest {
- final String logPrefix = "TEST ";
+ private static final String LOG_PREFIX = "TEST ";
@Rule
public TestName name = new TestName();
@Test
public void testSingleThreadStage() 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>());
@@ -55,6 +55,7 @@ public class ThreadPoolStageTest {
}
while (procSet.size() < 10) {
+ //
}
stage.close();
@@ -64,7 +65,7 @@ public class ThreadPoolStageTest {
@Test(expected = IllegalStateException.class)
public void testSingleThreadStageQueueFull() {
- System.out.println(logPrefix + name.getMethodName());
+ System.out.println(LOG_PREFIX + name.getMethodName());
Set<TestEvent> procSet = Collections.synchronizedSet(new HashSet<TestEvent>());
final EventHandler<TestEventA> eventHandler = new TestEventHandlerA(procSet);
@@ -80,7 +81,7 @@ public class ThreadPoolStageTest {
@Test
public void testThreadPoolStage() 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>());
@@ -97,6 +98,7 @@ public class ThreadPoolStageTest {
}
while (procSet.size() < 10) {
+ //
}
stage.close();
@@ -106,7 +108,7 @@ public class ThreadPoolStageTest {
@Test
public void testMultiThreadPoolStage() 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 ThreadPoolStageTest {
}
while (procSet.size() < 20) {
+ //
}
stage.close();
@@ -139,7 +142,7 @@ public class ThreadPoolStageTest {
@Test
public void testMeter() throws Exception {
- System.out.println(logPrefix + name.getMethodName());
+ System.out.println(LOG_PREFIX + name.getMethodName());
EventHandler<TestEvent> eventHandler = new TestEventHandler();
ThreadPoolStage<TestEvent> stage = new ThreadPoolStage<TestEvent>(eventHandler, 10);
@@ -155,7 +158,7 @@ public class ThreadPoolStageTest {
@Test
public void testMeterTwoStages() throws Exception {
- System.out.println(logPrefix + name.getMethodName());
+ System.out.println(LOG_PREFIX + name.getMethodName());
EventHandler<TestEvent> eventHandler = new TestEventHandler();
ThreadPoolStage<TestEvent> stage2 = new ThreadPoolStage<TestEvent>(eventHandler, 5);
ThreadPoolStage<TestEvent> stage1 = new ThreadPoolStage<TestEvent>(stage2, 5);
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/TimerStageTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/TimerStageTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/TimerStageTest.java
index 4a6f652..c25f6e8 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/TimerStageTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/TimerStageTest.java
@@ -33,20 +33,20 @@ import java.util.concurrent.atomic.AtomicInteger;
public class TimerStageTest {
- final String logPrefix = "TEST ";
- final long shutdownTimeout = 1000;
+ private static final String LOG_PREFIX = "TEST ";
+ private static final long SHUTDOWN_TIMEOUT = 1000;
@Rule
public TestName name = new TestName();
@Test
public void testTimerStage() throws Exception {
- System.out.println(logPrefix + name.getMethodName());
+ System.out.println(LOG_PREFIX + name.getMethodName());
Monitor monitor = new Monitor();
int expected = 10;
TestEventHandler handler = new TestEventHandler(monitor, expected);
- Stage stage = new TimerStage(handler, 100, shutdownTimeout);
+ Stage stage = new TimerStage(handler, 100, SHUTDOWN_TIMEOUT);
monitor.mwait();
@@ -69,8 +69,9 @@ public class TimerStageTest {
public void onNext(PeriodicEvent e) {
count.incrementAndGet();
System.out.println(count.get() + " " + e + " scheduled event at " + System.currentTimeMillis());
- if (count.get() == expected)
+ if (count.get() == expected) {
monitor.mnotify();
+ }
}
public int getCount() {
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/examples/SkipListTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/examples/SkipListTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/examples/SkipListTest.java
index f01436e..c7b41c1 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/examples/SkipListTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/examples/SkipListTest.java
@@ -51,7 +51,9 @@ public class SkipListTest {
long inend = System.currentTimeMillis();
long outstart = System.currentTimeMillis();
- while (x.pollFirstEntry() != null) ;
+ while (x.pollFirstEntry() != null) {
+ //
+ }
long outend = System.currentTimeMillis();
@@ -78,7 +80,9 @@ public class SkipListTest {
long outstart = System.currentTimeMillis();
Integer k = x.pollFirstEntry().getKey();
- while ((k = x.higherKey(k)) != null) ;
+ while ((k = x.higherKey(k)) != null) {
+ //
+ }
long outend = System.currentTimeMillis();
@@ -90,7 +94,7 @@ public class SkipListTest {
+ " seconds (" + ((double) unique) / (outelapsed * 1000.0 * 1000.0) + " million events/sec)");
}
- public boolean n_threads(int n, Runnable r, long timeout, TimeUnit t) {
+ public boolean nThreads(int n, Runnable r, long timeout, TimeUnit t) {
ExecutorService e = Executors.newCachedThreadPool();
for (int i = 0; i < n; i++) {
e.submit(r);
@@ -120,7 +124,9 @@ public class SkipListTest {
long outstart = System.currentTimeMillis();
Integer k = x.pollFirstEntry().getKey();
x.remove(k);
- while ((k = x.higherKey(k)) != null) x.remove(k);
+ while ((k = x.higherKey(k)) != null) {
+ x.remove(k);
+ }
long outend = System.currentTimeMillis();
@@ -147,13 +153,15 @@ public class SkipListTest {
System.gc();
long outstart = System.currentTimeMillis();
- Assert.assertTrue(n_threads(numOutW, new Runnable() {
+ Assert.assertTrue(nThreads(numOutW, new Runnable() {
@Override
public void run() {
Integer k = x.pollFirstEntry().getKey();
x.remove(k);
- while ((k = x.higherKey(k)) != null) x.remove(k);
+ while ((k = x.higherKey(k)) != null) {
+ x.remove(k);
+ }
}
}, 30, TimeUnit.SECONDS));
long outend = System.currentTimeMillis();
@@ -184,7 +192,7 @@ public class SkipListTest {
long outstart = System.currentTimeMillis();
final AtomicInteger uid = new AtomicInteger(0);
final int blockSize = unique / numOutW;
- Assert.assertTrue(n_threads(numOutW, new Runnable() {
+ Assert.assertTrue(nThreads(numOutW, new Runnable() {
@Override
public void run() {
@@ -192,7 +200,9 @@ public class SkipListTest {
final Integer startK = x.ceilingKey(blockSize * id);
Integer k = startK;
x.remove(k);
- while ((k = x.higherKey(k)) != null) x.remove(k);
+ while ((k = x.higherKey(k)) != null) {
+ x.remove(k);
+ }
}
}, 30, TimeUnit.SECONDS));
long outend = System.currentTimeMillis();
@@ -224,7 +234,7 @@ public class SkipListTest {
long outstart = System.currentTimeMillis();
final AtomicInteger uid = new AtomicInteger(0);
final int blockSize = unique / numOutW;
- Assert.assertTrue(n_threads(numOutW, new Runnable() {
+ Assert.assertTrue(nThreads(numOutW, new Runnable() {
@Override
public void run() {
@@ -232,8 +242,10 @@ public class SkipListTest {
final Integer startK = x.ceilingKey(blockSize * id);
final Integer endK = x.ceilingKey(blockSize * (id + 1));
Integer k = startK;
- x.remove(k);
- while ((k = x.higherKey(k)) != null && k < endK) x.remove(k);
+ do {
+ x.remove(k);
+ k = x.higherKey(k);
+ } while (k != null && k < endK);
}
}, 30, TimeUnit.SECONDS));
long outend = System.currentTimeMillis();
@@ -265,7 +277,7 @@ public class SkipListTest {
long outstart = System.currentTimeMillis();
final AtomicInteger uid = new AtomicInteger(0);
final int blockSize = unique / numOutW;
- Assert.assertTrue(n_threads(numOutW, new Runnable() {
+ Assert.assertTrue(nThreads(numOutW, new Runnable() {
@Override
public void run() {
@@ -273,7 +285,13 @@ public class SkipListTest {
ConcurrentNavigableMap<Integer, Integer> myView = x.tailMap(blockSize * id);
final Integer endK = x.ceilingKey(blockSize * (id + 1));
Integer k = myView.pollFirstEntry().getKey();
- while ((k = x.higherKey(k)) != null && k < endK) x.remove(k);
+ do {
+ k = x.higherKey(k);
+ if (k == null || k >= endK) {
+ break;
+ }
+ x.remove(k);
+ } while (true);
}
}, 30, TimeUnit.SECONDS));
long outend = System.currentTimeMillis();
@@ -289,6 +307,7 @@ public class SkipListTest {
}
//@Test
+ @SuppressWarnings("checkstyle:avoidnestedblocks")
public void testSeparateMaps() {
for (int numOutW = 1; numOutW <= 24; numOutW += 1) {
System.out.println("separate maps " + numOutW);
@@ -297,7 +316,7 @@ public class SkipListTest {
long instart = System.currentTimeMillis();
{
final AtomicInteger uid = new AtomicInteger(0);
- n_threads(numOutW, new Runnable() {
+ nThreads(numOutW, new Runnable() {
@Override
public void run() {
@@ -317,7 +336,7 @@ public class SkipListTest {
long outstart = System.currentTimeMillis();
final AtomicInteger uid = new AtomicInteger(0);
- Assert.assertTrue(n_threads(numOutW, new Runnable() {
+ Assert.assertTrue(nThreads(numOutW, new Runnable() {
@Override
public void run() {
@@ -326,7 +345,9 @@ public class SkipListTest {
final Integer startK = mm.pollFirstEntry().getKey();
Integer k = startK;
mm.remove(k);
- while ((k = mm.higherKey(k)) != null) mm.remove(k);
+ while ((k = mm.higherKey(k)) != null) {
+ mm.remove(k);
+ }
}
}, 30, TimeUnit.SECONDS));
long outend = System.currentTimeMillis();
@@ -356,13 +377,15 @@ public class SkipListTest {
System.gc();
long outstart = System.currentTimeMillis();
- Assert.assertTrue(n_threads(numOutW, new Runnable() {
+ Assert.assertTrue(nThreads(numOutW, new Runnable() {
@Override
public void run() {
Integer k = x.pollFirstEntry().getKey();
x.remove(k);
- while ((k = x.higherKey(k)) != null) x.remove(k);
+ while ((k = x.higherKey(k)) != null) {
+ x.remove(k);
+ }
}
}, 30, TimeUnit.SECONDS));
long outend = System.currentTimeMillis();
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/examples/TestCombiner.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/examples/TestCombiner.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/examples/TestCombiner.java
index 04916c5..1717521 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/examples/TestCombiner.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/examples/TestCombiner.java
@@ -29,15 +29,14 @@ import java.util.concurrent.atomic.AtomicInteger;
public class TestCombiner {
- int bucketCount = 1000;
- int bucketSleepMillis = 100;
- int threadCount = 1;
- int eventsCount = 2 * 1000000;
- int eventsPerThread = eventsCount / threadCount;
+ private static final int BUCKET_COUNT = 1000;
+ private static final int THREAD_COUNT = 1;
+ private static final int EVENTS_COUNT = 2 * 1000000;
+ private static final int EVENTS_PER_THREAD = EVENTS_COUNT / THREAD_COUNT;
- Observer<Entry<Integer, Integer>> o;
+ private Observer<Entry<Integer, Integer>> o;
- volatile boolean done = false;
+ private volatile boolean done = false;
@Test
public void test() throws Exception {
@@ -54,45 +53,46 @@ public class TestCombiner {
}
}, new Observer<Entry<Integer, Integer>>() {
- private AtomicInteger x = new AtomicInteger(0);
-
- @Override
- public void onNext(Entry<Integer, Integer> value) {
- System.out.println(value.getKey() + "=" + value.getValue());
- x.incrementAndGet();
- try {
- if (!done)
- Thread.sleep(10);
- } catch (InterruptedException e) {
- throw new IllegalStateException(e);
- }
- }
+ private AtomicInteger x = new AtomicInteger(0);
- @Override
- public void onError(Exception error) {
- System.err.println("onError called!");
- error.printStackTrace();
- }
+ @Override
+ public void onNext(Entry<Integer, Integer> value) {
+ System.out.println(value.getKey() + "=" + value.getValue());
+ x.incrementAndGet();
+ try {
+ if (!done) {
+ Thread.sleep(10);
+ }
+ } catch (InterruptedException e) {
+ throw new IllegalStateException(e);
+ }
+ }
- @Override
- public void onCompleted() {
- System.out.println("onCompleted " + x);
- }
+ @Override
+ public void onError(Exception error) {
+ System.err.println("onError called!");
+ error.printStackTrace();
+ }
+
+ @Override
+ public void onCompleted() {
+ System.out.println("onCompleted " + x);
+ }
- });
+ });
o = stage.wireIn();
- WorkerThread[] workers = new WorkerThread[threadCount];
+ WorkerThread[] workers = new WorkerThread[THREAD_COUNT];
- for (int i = 0; i < threadCount; i++) {
+ for (int i = 0; i < THREAD_COUNT; i++) {
workers[i] = new WorkerThread();
}
long start = System.currentTimeMillis();
- for (int i = 0; i < threadCount; i++) {
+ for (int i = 0; i < THREAD_COUNT; i++) {
workers[i].start();
}
- for (int i = 0; i < threadCount; i++) {
+ for (int i = 0; i < THREAD_COUNT; i++) {
workers[i].join();
}
o.onCompleted();
@@ -103,7 +103,7 @@ public class TestCombiner {
stage.close();
long outStop = System.currentTimeMillis();
- long eventCount = threadCount * eventsPerThread;
+ long eventCount = THREAD_COUNT * EVENTS_PER_THREAD;
double inelapsed = ((double) (inStop - start)) / 1000.0;
double inoutelapsed = ((double) (outStop - start)) / 1000.0;
System.out.println("Emitted " + eventCount + " events in " + inelapsed
@@ -113,14 +113,12 @@ public class TestCombiner {
}
- ;
-
private class WorkerThread extends Thread {
@Override
public void run() {
Random rand = new Random();
- for (int i = 0; i < eventsPerThread; i++) {
- int r = rand.nextInt(bucketCount);
+ for (int i = 0; i < EVENTS_PER_THREAD; i++) {
+ int r = rand.nextInt(BUCKET_COUNT);
o.onNext(new CombinerStage.Pair<Integer, Integer>(r, 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/examples/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/examples/package-info.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/examples/package-info.java
new file mode 100644
index 0000000..4604e1e
--- /dev/null
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/examples/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.wake.test.examples;
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/remote/LargeMsgTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/LargeMsgTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/LargeMsgTest.java
index c0c6a01..2fc962d 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/LargeMsgTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/LargeMsgTest.java
@@ -43,15 +43,15 @@ import java.net.InetSocketAddress;
import java.util.logging.Level;
/**
- * Test transferring large messages
+ * Test transferring large messages.
*/
public class LargeMsgTest {
private final LocalAddressProvider localAddressProvider;
private final TransportFactory tpFactory;
- private final static byte[][] values = new byte[3][];
- private final static int l0 = 1 << 25;
- private final static int l1 = 1 << 2;
- private final static int l2 = 1 << 21;
+ private static final byte[][] VALUES = new byte[3][];
+ private static final int L_0 = 1 << 25;
+ private static final int L_1 = 1 << 2;
+ private static final int L_2 = 1 << 21;
public LargeMsgTest() throws InjectionException {
final Injector injector = Tang.Factory.getTang().newInjector();
@@ -61,18 +61,18 @@ public class LargeMsgTest {
@BeforeClass
public static void setUpBeforeClass() {
- values[0] = new byte[l0];
+ VALUES[0] = new byte[L_0];
for (int i = 1; i < 25; i += 3) {
- values[0][1 << i] = (byte) i;
+ VALUES[0][1 << i] = (byte) i;
}
- values[1] = new byte[l1];
- values[1][0] = (byte) 5;
- values[1][3] = (byte) 94;
+ VALUES[1] = new byte[L_1];
+ VALUES[1][0] = (byte) 5;
+ VALUES[1][3] = (byte) 94;
- values[2] = new byte[l2];
+ VALUES[2] = new byte[L_2];
for (int i = 1; i < 21; i += 4) {
- values[2][1 << i] = (byte) (i * 2);
+ VALUES[2][1 << i] = (byte) (i * 2);
}
}
@@ -82,7 +82,7 @@ public class LargeMsgTest {
Monitor monitor = new Monitor();
TimerStage timer = new TimerStage(new TimeoutHandler(monitor), 20000, 20000);
- long dataSize = values[0].length + values[1].length + values[2].length;
+ long dataSize = VALUES[0].length + VALUES[1].length + VALUES[2].length;
EStage<TransportEvent> clientStage = new ThreadPoolStage<>("client1",
new LoggingEventHandler<TransportEvent>(), 1, new LoggingEventHandler<Throwable>());
@@ -100,9 +100,9 @@ public class LargeMsgTest {
link.write(value);
}
}, 3, new LoggingEventHandler<Throwable>());
- writeSubmitter.onNext(values[0]);
- writeSubmitter.onNext(values[1]);
- writeSubmitter.onNext(values[2]);
+ writeSubmitter.onNext(VALUES[0]);
+ writeSubmitter.onNext(VALUES[1]);
+ writeSubmitter.onNext(VALUES[2]);
monitor.mwait();
@@ -129,19 +129,22 @@ public class LargeMsgTest {
byte[] data = value.getData();
switch (data.length) {
- case l0:
- Assert.assertArrayEquals(values[0], data);
- break;
- case l1:
- Assert.assertArrayEquals(values[1], data);
- break;
- case l2:
- Assert.assertArrayEquals(values[2], data);
- break;
+ case L_0:
+ Assert.assertArrayEquals(VALUES[0], data);
+ break;
+ case L_1:
+ Assert.assertArrayEquals(VALUES[1], data);
+ break;
+ case L_2:
+ Assert.assertArrayEquals(VALUES[2], data);
+ break;
+ default:
+ break;
}
accSize += data.length;
- if (accSize == expectedSize)
+ if (accSize == expectedSize) {
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/remote/RemoteIdentifierFactoryTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteIdentifierFactoryTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteIdentifierFactoryTest.java
index 6ddde01..0b52ae8 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteIdentifierFactoryTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteIdentifierFactoryTest.java
@@ -40,18 +40,18 @@ public class RemoteIdentifierFactoryTest {
@Rule
public final TestName name = new TestName();
- final String logPrefix = "TEST ";
+ private static final String LOG_PREFIX = "TEST ";
@Test
public void testRemoteIdentifierFactory() {
- System.out.println(logPrefix + name.getMethodName());
+ System.out.println(LOG_PREFIX + name.getMethodName());
Map<String, Class<? extends Identifier>> typeToIdMap = new HashMap<String, Class<? extends Identifier>>();
typeToIdMap.put("test", TestRemoteIdentifier.class);
IdentifierFactory factory = new DefaultIdentifierFactory(typeToIdMap);
- String name = "test://name";
- Identifier id = factory.getNewInstance(name);
+ String idName = "test://name";
+ Identifier id = factory.getNewInstance(idName);
System.out.println(id.toString());
Assert.assertTrue(id instanceof TestRemoteIdentifier);
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/remote/RemoteManagerTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteManagerTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteManagerTest.java
index 19abc1d..e81b211 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteManagerTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteManagerTest.java
@@ -63,12 +63,12 @@ public class RemoteManagerTest {
@Rule
public final TestName name = new TestName();
- final String logPrefix = "TEST ";
- final int port = 9100;
+ private static final String LOG_PREFIX = "TEST ";
+ private static final int PORT = 9100;
@Test
public void testRemoteManagerTest() throws Exception {
- System.out.println(logPrefix + name.getMethodName());
+ System.out.println(LOG_PREFIX + name.getMethodName());
LoggingUtils.setLoggingLevel(Level.INFO);
Monitor monitor = new Monitor();
@@ -84,11 +84,11 @@ public class RemoteManagerTest {
final String hostAddress = localAddressProvider.getLocalAddress();
final RemoteManager rm = this.remoteManagerFactory.getInstance(
- "name", hostAddress, port, codec, new LoggingEventHandler<Throwable>(), false, 3, 10000,
+ "name", hostAddress, PORT, codec, new LoggingEventHandler<Throwable>(), false, 3, 10000,
localAddressProvider, RangeTcpPortProvider.Default);
RemoteIdentifierFactory factory = new DefaultRemoteIdentifierFactoryImplementation();
- RemoteIdentifier remoteId = factory.getNewInstance("socket://" + hostAddress + ":" + port);
+ RemoteIdentifier remoteId = factory.getNewInstance("socket://" + hostAddress + ":" + PORT);
Assert.assertTrue(rm.getMyIdentifier().equals(remoteId));
EventHandler<StartEvent> proxyConnection = rm.getHandler(remoteId, StartEvent.class);
@@ -102,7 +102,7 @@ public class RemoteManagerTest {
proxyConnection.onNext(new StartEvent());
monitor.mwait();
- proxyHandler1.onNext(new TestEvent1("hello1", 0.0));// registration after send expected to fail
+ proxyHandler1.onNext(new TestEvent1("hello1", 0.0)); // registration after send expected to fail
proxyHandler2.onNext(new TestEvent2("hello2", 1.0));
monitor.mwait();
@@ -152,7 +152,8 @@ public class RemoteManagerTest {
Thread.sleep(2000);
RemoteManager receivingManager = getTestRemoteManager("receiver", 9010, 1, 2000);
- Future<Integer> receivingFuture = rmExecutor.submit(new ReceivingRemoteManagerThread(receivingManager, 20000, numOfSenderThreads, 2));
+ Future<Integer> receivingFuture =
+ rmExecutor.submit(new ReceivingRemoteManagerThread(receivingManager, 20000, numOfSenderThreads, 2));
// waiting sending remote manager.
for (Future<Integer> future : smFutures) {
@@ -171,7 +172,7 @@ public class RemoteManagerTest {
@Test
public void testRemoteManagerOrderingGuaranteeTest() throws Exception {
- System.out.println(logPrefix + name.getMethodName());
+ System.out.println(LOG_PREFIX + name.getMethodName());
LoggingUtils.setLoggingLevel(Level.INFO);
Monitor monitor = new Monitor();
@@ -187,11 +188,11 @@ public class RemoteManagerTest {
final String hostAddress = localAddressProvider.getLocalAddress();
final RemoteManager rm = this.remoteManagerFactory.getInstance(
- "name", hostAddress, port, codec, new LoggingEventHandler<Throwable>(), true, 3, 10000,
+ "name", hostAddress, PORT, codec, new LoggingEventHandler<Throwable>(), true, 3, 10000,
localAddressProvider, RangeTcpPortProvider.Default);
RemoteIdentifierFactory factory = new DefaultRemoteIdentifierFactoryImplementation();
- RemoteIdentifier remoteId = factory.getNewInstance("socket://" + hostAddress + ":" + port);
+ RemoteIdentifier remoteId = factory.getNewInstance("socket://" + hostAddress + ":" + PORT);
EventHandler<StartEvent> proxyConnection = rm.getHandler(remoteId, StartEvent.class);
EventHandler<TestEvent1> proxyHandler1 = rm.getHandler(remoteId, TestEvent1.class);
@@ -218,7 +219,7 @@ public class RemoteManagerTest {
@Test
public void testRemoteManagerPBufTest() throws Exception {
- System.out.println(logPrefix + name.getMethodName());
+ System.out.println(LOG_PREFIX + name.getMethodName());
LoggingUtils.setLoggingLevel(Level.INFO);
Monitor monitor = new Monitor();
@@ -231,11 +232,11 @@ public class RemoteManagerTest {
String hostAddress = localAddressProvider.getLocalAddress();
final RemoteManager rm = this.remoteManagerFactory.getInstance(
- "name", hostAddress, port, codec, new LoggingEventHandler<Throwable>(), false, 3, 10000,
+ "name", hostAddress, PORT, codec, new LoggingEventHandler<Throwable>(), false, 3, 10000,
localAddressProvider, RangeTcpPortProvider.Default);
RemoteIdentifierFactory factory = new DefaultRemoteIdentifierFactoryImplementation();
- RemoteIdentifier remoteId = factory.getNewInstance("socket://" + hostAddress + ":" + port);
+ RemoteIdentifier remoteId = factory.getNewInstance("socket://" + hostAddress + ":" + PORT);
EventHandler<TestEvent> proxyHandler = rm.getHandler(remoteId, TestEvent.class);
@@ -255,7 +256,7 @@ public class RemoteManagerTest {
@Test
public void testRemoteManagerExceptionTest() {
- System.out.println(logPrefix + name.getMethodName());
+ System.out.println(LOG_PREFIX + name.getMethodName());
LoggingUtils.setLoggingLevel(Level.INFO);
Monitor monitor = new Monitor();
@@ -270,9 +271,9 @@ public class RemoteManagerTest {
ExceptionHandler errorHandler = new ExceptionHandler(monitor);
- try (final RemoteManager rm = remoteManagerFactory.getInstance("name", port, codec, errorHandler)) {
+ try (final RemoteManager rm = remoteManagerFactory.getInstance("name", PORT, codec, errorHandler)) {
RemoteIdentifierFactory factory = new DefaultRemoteIdentifierFactoryImplementation();
- RemoteIdentifier remoteId = factory.getNewInstance("socket://" + hostAddress + ":" + port);
+ RemoteIdentifier remoteId = factory.getNewInstance("socket://" + hostAddress + ":" + PORT);
EventHandler<StartEvent> proxyConnection = rm.getHandler(remoteId, StartEvent.class);
rm.registerHandler(StartEvent.class, new ExceptionGenEventHandler<StartEvent>("recvExceptionGen"));
@@ -288,7 +289,7 @@ public class RemoteManagerTest {
}
}
- private RemoteManager getTestRemoteManager(String name, int localPort, int retry, int retryTimeout) {
+ private RemoteManager getTestRemoteManager(String rmName, int localPort, int retry, int retryTimeout) {
Map<Class<?>, Codec<?>> clazzToCodecMap = new HashMap<Class<?>, Codec<?>>();
clazzToCodecMap.put(StartEvent.class, new ObjectSerializableCodec<StartEvent>());
clazzToCodecMap.put(TestEvent1.class, new ObjectSerializableCodec<TestEvent1>());
@@ -296,7 +297,7 @@ public class RemoteManagerTest {
Codec<?> codec = new MultiCodec<Object>(clazzToCodecMap);
String hostAddress = localAddressProvider.getLocalAddress();
- return remoteManagerFactory.getInstance(name, hostAddress, localPort,
+ return remoteManagerFactory.getInstance(rmName, hostAddress, localPort,
codec, new LoggingEventHandler<Throwable>(), false, retry, retryTimeout,
localAddressProvider, RangeTcpPortProvider.Default);
}
@@ -335,8 +336,8 @@ public class RemoteManagerTest {
monitor.mwait();
- proxyHandler1.onNext(new TestEvent1("hello1", 0.0));// registration after send expected to fail
- proxyHandler2.onNext(new TestEvent2("hello2", 0.0));// registration after send expected to fail
+ proxyHandler1.onNext(new TestEvent1("hello1", 0.0)); // registration after send expected to fail
+ proxyHandler2.onNext(new TestEvent2("hello2", 0.0)); // registration after send expected to fail
timer.close();
return counter.get();
@@ -407,8 +408,10 @@ public class RemoteManagerTest {
// }
// register specific handlers
- rm.registerHandler(id, TestEvent1.class, new ConsoleEventHandler<TestEvent1>("console1", monitor, counter, finalSize));
- rm.registerHandler(id, TestEvent2.class, new ConsoleEventHandler<TestEvent2>("console2", monitor, counter, finalSize));
+ rm.registerHandler(id, TestEvent1.class,
+ new ConsoleEventHandler<TestEvent1>("console1", monitor, counter, finalSize));
+ rm.registerHandler(id, TestEvent2.class,
+ new ConsoleEventHandler<TestEvent2>("console2", monitor, counter, finalSize));
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/remote/RemoteTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteTest.java
index 35f879a..06936fd 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteTest.java
@@ -53,7 +53,7 @@ public class RemoteTest {
@Rule
public final TestName name = new TestName();
- final String logPrefix = "TEST ";
+ private static final String LOG_PREFIX = "TEST ";
public RemoteTest() throws InjectionException {
@@ -64,7 +64,7 @@ public class RemoteTest {
@Test
public void testRemoteEventCodec() throws UnknownHostException {
- System.out.println(logPrefix + name.getMethodName());
+ System.out.println(LOG_PREFIX + name.getMethodName());
ObjectSerializableCodec<TestEvent> codec = new ObjectSerializableCodec<TestEvent>();
@@ -86,7 +86,7 @@ public class RemoteTest {
@Test
public void testRandomPort() throws Exception {
- System.out.println(logPrefix + name.getMethodName());
+ System.out.println(LOG_PREFIX + name.getMethodName());
LoggingUtils.setLoggingLevel(Level.FINEST);
// receiver stage
@@ -109,7 +109,7 @@ public class RemoteTest {
@Test
public void testRemoteTest() throws Exception {
- System.out.println(logPrefix + name.getMethodName());
+ System.out.println(LOG_PREFIX + name.getMethodName());
LoggingUtils.setLoggingLevel(Level.FINEST);
Monitor monitor = new Monitor();
@@ -174,8 +174,10 @@ public class RemoteTest {
monitor.mwait();
- if (set.size() != finalSize)
- Assert.fail(name.getMethodName() + " takes too long and times out : " + set.size() + " out of " + finalSize + " events");
+ if (set.size() != finalSize) {
+ Assert.fail(name.getMethodName() + " takes too long and times out : " +
+ set.size() + " out of " + finalSize + " events");
+ }
// shutdown
reSendStage.close();
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/remote/SmallMessagesTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/SmallMessagesTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/SmallMessagesTest.java
index 6e93d67..fcaf182 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/SmallMessagesTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/SmallMessagesTest.java
@@ -56,11 +56,11 @@ public class SmallMessagesTest {
@Rule
public final TestName name = new TestName();
- final String logPrefix = "TEST ";
+ private static final String LOG_PREFIX = "TEST ";
@Test
public void testRemoteTest() throws Exception {
- System.out.println(logPrefix + name.getMethodName());
+ System.out.println(LOG_PREFIX + name.getMethodName());
LoggingUtils.setLoggingLevel(Level.FINEST);
Monitor monitor = new Monitor();
@@ -118,9 +118,10 @@ public class SmallMessagesTest {
monitor.mwait();
long end = System.nanoTime();
- long runtime_ns = end - start;
- double runtime_s = ((double) runtime_ns) / (1000 * 1000 * 1000);
- System.out.println("msgs/s: " + finalSize / runtime_s);// most time is spent in netty.channel.socket.nio.SelectorUtil.select()
+ long runtimeNs = end - start;
+ double runtimeS = ((double) runtimeNs) / (1000 * 1000 * 1000);
+ System.out.println("msgs/s: " + finalSize / runtimeS);
+ // most time is spent in netty.channel.socket.nio.SelectorUtil.select()
if (set.size() != finalSize) {
Assert.fail(name.getMethodName() +
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/remote/TestEventCodec.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/TestEventCodec.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/TestEventCodec.java
index 4e00c94..6541c3f 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/TestEventCodec.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/TestEventCodec.java
@@ -24,7 +24,7 @@ import org.apache.reef.wake.remote.exception.RemoteRuntimeException;
import org.apache.reef.wake.test.proto.TestProtos.TestEventPBuf;
/**
- * TestEvent codec using the protocol buffer
+ * TestEvent codec using the protocol buffer.
*/
public class TestEventCodec implements Codec<TestEvent> {
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/remote/TestRemote.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/TestRemote.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/TestRemote.java
index 1167746..3b97dc5 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/TestRemote.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/TestRemote.java
@@ -46,7 +46,8 @@ public class TestRemote implements Runnable {
int myPort = 10011;
int remotePort = 10001;
Codec<TestEvent> codec = new TestEventCodec();
- try (RemoteManager rm = remoteManagerFactory.getInstance("name", myPort, codec, new LoggingEventHandler<Throwable>())) {
+ try (RemoteManager rm =
+ remoteManagerFactory.getInstance("name", myPort, codec, new LoggingEventHandler<Throwable>())) {
// proxy handler
RemoteIdentifierFactory factory = new DefaultRemoteIdentifierFactoryImplementation();
RemoteIdentifier remoteId = factory.getNewInstance("socket://" + hostAddress + ":" + remotePort);
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/remote/TransportRaceTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/TransportRaceTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/TransportRaceTest.java
index b8fd236..5a84cff 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/TransportRaceTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/TransportRaceTest.java
@@ -79,9 +79,9 @@ public class TransportRaceTest {
monitor.mwait();
int msgsRcvd = serverHandler.getAccSize();
- if (msgsRcvd != msgsSent)
- Assert.assertEquals("Num Msgs transmitted==Num Msgs received", msgsSent,
- msgsRcvd);
+ if (msgsRcvd != msgsSent) {
+ Assert.assertEquals("Num Msgs transmitted==Num Msgs received", msgsSent, msgsRcvd);
+ }
transport.close();
clientStage.close();
serverStage.close();
@@ -107,8 +107,9 @@ public class TransportRaceTest {
@Override
public void onNext(TransportEvent value) {
++accSize;
- if (accSize == expectedSize)
+ if (accSize == expectedSize) {
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/remote/TransportTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/TransportTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/TransportTest.java
index 3ad767a..d3ae9b3 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/TransportTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/TransportTest.java
@@ -54,13 +54,13 @@ public class TransportTest {
this.tpFactory = injector.getInstance(TransportFactory.class);
}
- final String logPrefix = "TEST ";
+ private static final String LOG_PREFIX = "TEST ";
@Rule
public TestName name = new TestName();
@Test
public void testTransportString() throws Exception {
- System.out.println(logPrefix + name.getMethodName());
+ System.out.println(LOG_PREFIX + name.getMethodName());
LoggingUtils.setLoggingLevel(Level.INFO);
Monitor monitor = new Monitor();
@@ -68,7 +68,6 @@ public class TransportTest {
final int expected = 2;
final String hostAddress = this.localAddressProvider.getLocalAddress();
- ;
final int port = 9100;
// Codec<String>
@@ -92,7 +91,7 @@ public class TransportTest {
@Test
public void testTransportTestEvent() throws Exception {
- System.out.println(logPrefix + name.getMethodName());
+ System.out.println(LOG_PREFIX + name.getMethodName());
LoggingUtils.setLoggingLevel(Level.INFO);
Monitor monitor = new Monitor();
@@ -103,7 +102,8 @@ public class TransportTest {
final int port = 9100;
// Codec<TestEvent>
- ReceiverStage<TestEvent> stage = new ReceiverStage<TestEvent>(new ObjectSerializableCodec<TestEvent>(), monitor, expected);
+ ReceiverStage<TestEvent> stage =
+ new ReceiverStage<TestEvent>(new ObjectSerializableCodec<TestEvent>(), monitor, expected);
Transport transport = tpFactory.newInstance(hostAddress, port, stage, stage, 1, 10000);
// sending side
@@ -143,8 +143,9 @@ public class TransportTest {
codec.decode(value.getData());
//System.out.println(value + " " + obj);
- if (count.incrementAndGet() == expected)
+ if (count.incrementAndGet() == expected) {
monitor.mnotify();
+ }
}
@Override
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/rx/RxTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/rx/RxTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/rx/RxTest.java
index 46f3c1e..bb3d112 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/rx/RxTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/rx/RxTest.java
@@ -39,8 +39,9 @@ public class RxTest {
int i = 0;
try {
- for (i = 0; i < 20; ++i)
+ for (i = 0; i < 20; ++i) {
stage.onNext(new TestEvent(i));
+ }
stage.onCompleted();
} catch (Exception e) {
stage.onError(e);
@@ -85,6 +86,4 @@ public class RxTest {
}
}
- ;
-
}
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/rx/RxThreadPoolStageTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/rx/RxThreadPoolStageTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/rx/RxThreadPoolStageTest.java
index 887552a..5c8adbc 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/rx/RxThreadPoolStageTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/rx/RxThreadPoolStageTest.java
@@ -189,6 +189,4 @@ public class RxThreadPoolStageTest {
}
}
- ;
-
}
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/time/ClockTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/time/ClockTest.java b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/time/ClockTest.java
index 2e93c70..eb80884 100644
--- a/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/time/ClockTest.java
+++ b/lang/java/reef-wake/wake/src/test/java/org/apache/reef/wake/test/time/ClockTest.java
@@ -137,8 +137,9 @@ public class ClockTest {
}, numThreads);
try {
- for (int i = 0; i < numThreads; ++i)
+ for (int i = 0; i < numThreads; ++i) {
stage.onNext(null);
+ }
Assert.assertTrue(eventCountLatch.await(10, TimeUnit.SECONDS));
} finally {
stage.close();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestAvroHttpSerializer.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestAvroHttpSerializer.java b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestAvroHttpSerializer.java
index 5c6d9e5..ac69ca1 100644
--- a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestAvroHttpSerializer.java
+++ b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestAvroHttpSerializer.java
@@ -32,7 +32,7 @@ import java.nio.charset.Charset;
import java.util.ArrayList;
/**
- * Test Avro Http Serializer
+ * Test Avro Http Serializer.
*/
public final class TestAvroHttpSerializer {
@Rule
@@ -70,7 +70,7 @@ public final class TestAvroHttpSerializer {
}
/**
- * Test serialize to file then deserialize from file
+ * Test serialize to file then deserialize from file.
* @throws IOException
* @throws ServletException
*/
@@ -85,7 +85,7 @@ public final class TestAvroHttpSerializer {
/**
- * Test serialize to bytes, then write to file, then read from file, finally deserialize
+ * Test serialize to bytes, then write to file, then read from file, finally deserialize.
* @throws IOException
* @throws ServletException
*/
@@ -110,7 +110,7 @@ public final class TestAvroHttpSerializer {
}
/**
- * Test serialize to string, then write to file, then read from file, finally deserialize
+ * Test serialize to string, then write to file, then read from file, finally deserialize.
* @throws IOException
* @throws ServletException
*/
@@ -119,7 +119,7 @@ public final class TestAvroHttpSerializer {
final String serializedString = avroHttpSerializer.toString(avroRequest);
final File f = new File("httpRequestData.txt");
- final OutputStream os = new FileOutputStream(f);//"httpRequestData.txt");
+ final OutputStream os = new FileOutputStream(f); //"httpRequestData.txt");
final OutputStreamWriter sw = new OutputStreamWriter(os);
sw.write(serializedString);
sw.flush();
@@ -137,7 +137,7 @@ public final class TestAvroHttpSerializer {
}
/**
- * Test serialize to JSon string, the deserialize from it
+ * Test serialize to JSon string, the deserialize from it.
*/
@Test
public void testJSonsStringRoundTrip() {
@@ -147,7 +147,7 @@ public final class TestAvroHttpSerializer {
}
/**
- * Test serialize to bytes, the deserialize from it
+ * Test serialize to bytes, the deserialize from it.
*/
@Test
public void testBytesRoundTrip() {
@@ -165,7 +165,7 @@ public final class TestAvroHttpSerializer {
}
/**
- * Test null incomplete request
+ * Test null incomplete request.
*/
@Test
public void testIncompleteData() {
@@ -183,7 +183,7 @@ public final class TestAvroHttpSerializer {
}
/**
- * Test null query string
+ * Test null query string.
*/
@Test
public void testNullData() {
@@ -202,7 +202,7 @@ public final class TestAvroHttpSerializer {
}
/**
- * Test null bytes
+ * Test null bytes.
*/
@Test
public void testNullBytes() {
@@ -222,7 +222,7 @@ public final class TestAvroHttpSerializer {
}
/**
- * Test empty string
+ * Test empty string.
*/
@Test
public void testEmptyString() {
@@ -245,7 +245,7 @@ public final class TestAvroHttpSerializer {
}
/**
- * Test empty bytes
+ * Test empty bytes.
*/
@Test
public void testEmptyBytes() {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestAvroSerializerForHttp.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestAvroSerializerForHttp.java b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestAvroSerializerForHttp.java
index b370f94..f0adce3 100644
--- a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestAvroSerializerForHttp.java
+++ b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestAvroSerializerForHttp.java
@@ -20,7 +20,6 @@ package org.apache.reef.webserver;
import org.apache.reef.driver.catalog.NodeDescriptor;
import org.apache.reef.driver.catalog.RackDescriptor;
-import org.apache.reef.driver.evaluator.CLRProcess;
import org.apache.reef.driver.evaluator.CLRProcessFactory;
import org.apache.reef.driver.evaluator.EvaluatorDescriptor;
import org.apache.reef.driver.evaluator.EvaluatorProcess;
@@ -40,58 +39,70 @@ import java.util.List;
import java.util.Map;
/**
- * Test Avro Serializer for http schema
+ * Test Avro Serializer for http schema.
*/
public class TestAvroSerializerForHttp {
@Test
- public void DriverInfoSerializerInjectionTest() {
+ public void driverInfoSerializerInjectionTest() {
try {
- final DriverInfoSerializer serializer = Tang.Factory.getTang().newInjector().getInstance(DriverInfoSerializer.class);
+ final DriverInfoSerializer serializer =
+ Tang.Factory.getTang().newInjector().getInstance(DriverInfoSerializer.class);
final ArrayList<AvroReefServiceInfo> services = new ArrayList<>();
- final AvroReefServiceInfo exampleService = AvroReefServiceInfo.newBuilder().setServiceName("exampleService").setServiceInfo("serviceInformation").build();
+ final AvroReefServiceInfo exampleService =
+ AvroReefServiceInfo.newBuilder().setServiceName("exampleService").setServiceInfo("serviceInformation")
+ .build();
services.add(exampleService);
final AvroDriverInfo driverInfo = serializer.toAvro("abc", "xxxxxx", services);
final String driverInfoString = serializer.toString(driverInfo);
- Assert.assertEquals(driverInfoString, "{\"remoteId\":\"abc\",\"startTime\":\"xxxxxx\",\"services\":[{\"serviceName\":\"exampleService\",\"serviceInfo\":\"serviceInformation\"}]}");
+ Assert.assertEquals(driverInfoString, "{\"remoteId\":\"abc\",\"startTime\":\"xxxxxx\"," +
+ "\"services\":[{\"serviceName\":\"exampleService\",\"serviceInfo\":\"serviceInformation\"}]}");
} catch (final InjectionException e) {
Assert.fail("Not able to inject DriverInfoSerializer");
}
}
@Test
- public void EvaluatorInfoSerializerInjectionTest() {
+ public void evaluatorInfoSerializerInjectionTest() {
try {
- final EvaluatorInfoSerializer serializer = Tang.Factory.getTang().newInjector().getInstance(EvaluatorInfoSerializer.class);
+ final EvaluatorInfoSerializer serializer =
+ Tang.Factory.getTang().newInjector().getInstance(EvaluatorInfoSerializer.class);
final List<String> ids = new ArrayList<>();
ids.add("abc");
- final EvaluatorDescriptor evaluatorDescriptor = Tang.Factory.getTang().newInjector(EvaluatorDescriptorConfig.CONF.build()).getInstance(EvaluatorDescriptor.class);
+ final EvaluatorDescriptor evaluatorDescriptor =
+ Tang.Factory.getTang().newInjector(EvaluatorDescriptorConfig.CONF.build())
+ .getInstance(EvaluatorDescriptor.class);
final Map<String, EvaluatorDescriptor> data = new HashMap<>();
data.put("abc", evaluatorDescriptor);
final AvroEvaluatorsInfo evaluatorInfo = serializer.toAvro(ids, data);
final String evaluatorInfoString = serializer.toString(evaluatorInfo);
- Assert.assertEquals(evaluatorInfoString, "{\"evaluatorsInfo\":[{\"evaluatorId\":\"abc\",\"nodeId\":\"\",\"nodeName\":\"mock\",\"memory\":64,\"type\":\"CLR\",\"internetAddress\":\"\"}]}");
+ Assert.assertEquals(evaluatorInfoString, "{\"evaluatorsInfo\":[{\"evaluatorId\":\"abc\",\"nodeId\":\"\"," +
+ "\"nodeName\":\"mock\",\"memory\":64,\"type\":\"CLR\",\"internetAddress\":\"\"}]}");
} catch (final InjectionException e) {
Assert.fail("Not able to inject EvaluatorInfoSerializer");
}
}
@Test
- public void EvaluatorListSerializerInjectionTest() {
+ public void evaluatorListSerializerInjectionTest() {
try {
- final EvaluatorListSerializer serializer = Tang.Factory.getTang().newInjector().getInstance(EvaluatorListSerializer.class);
+ final EvaluatorListSerializer serializer =
+ Tang.Factory.getTang().newInjector().getInstance(EvaluatorListSerializer.class);
final List<String> ids = new ArrayList<>();
ids.add("abc");
- final EvaluatorDescriptor evaluatorDescriptor = Tang.Factory.getTang().newInjector(EvaluatorDescriptorConfig.CONF.build()).getInstance(EvaluatorDescriptor.class);
+ final EvaluatorDescriptor evaluatorDescriptor =
+ Tang.Factory.getTang().newInjector(EvaluatorDescriptorConfig.CONF.build())
+ .getInstance(EvaluatorDescriptor.class);
final Map<String, EvaluatorDescriptor> data = new HashMap<>();
data.put("abc", evaluatorDescriptor);
final AvroEvaluatorList evaluatorList = serializer.toAvro(data, 1, "xxxxxx");
final String evaluatorListString = serializer.toString(evaluatorList);
- Assert.assertEquals(evaluatorListString, "{\"evaluators\":[{\"id\":\"abc\",\"name\":\"mock\"}],\"total\":1,\"startTime\":\"xxxxxx\"}");
+ Assert.assertEquals(evaluatorListString,
+ "{\"evaluators\":[{\"id\":\"abc\",\"name\":\"mock\"}],\"total\":1,\"startTime\":\"xxxxxx\"}");
} catch (final InjectionException e) {
Assert.fail("Not able to inject EvaluatorListSerializer");
}
@@ -174,7 +185,7 @@ public class TestAvroSerializerForHttp {
}
/**
- * Returns an identifier of this object
+ * Returns an identifier of this object.
*
* @return an identifier of this object
*/
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestHttpConfiguration.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestHttpConfiguration.java b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestHttpConfiguration.java
index b692f01..7edca44 100644
--- a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestHttpConfiguration.java
+++ b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestHttpConfiguration.java
@@ -35,7 +35,7 @@ import org.apache.reef.wake.time.event.StopTime;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
+import org.apache.commons.lang.NotImplementedException;
import javax.inject.Inject;
import java.text.Format;
@@ -44,11 +44,11 @@ import java.util.Date;
import java.util.Map;
/**
- * Test Http Configuration and runtime handlers
+ * Test Http Configuration and runtime handlers.
*/
public class TestHttpConfiguration {
- private final static Format DATE_TIME_FORMAT = new SimpleDateFormat("yyyy MM dd HH:mm:ss");
+ private static final Format DATE_TIME_FORMAT = new SimpleDateFormat("yyyy MM dd HH:mm:ss");
private Injector injector;
@@ -60,7 +60,8 @@ public class TestHttpConfiguration {
.build();
final Configuration driverConfigurationForHttpServer = DriverServiceConfiguration.CONF
- .set(DriverServiceConfiguration.ON_EVALUATOR_ALLOCATED, ReefEventStateManager.AllocatedEvaluatorStateHandler.class)
+ .set(DriverServiceConfiguration.ON_EVALUATOR_ALLOCATED,
+ ReefEventStateManager.AllocatedEvaluatorStateHandler.class)
.set(DriverServiceConfiguration.ON_CONTEXT_ACTIVE, ReefEventStateManager.ActiveContextStateHandler.class)
.set(DriverServiceConfiguration.ON_TASK_RUNNING, ReefEventStateManager.TaskRunningStateHandler.class)
.set(DriverServiceConfiguration.ON_DRIVER_STARTED, ReefEventStateManager.StartStateHandler.class)
@@ -173,7 +174,8 @@ final class MockActiveContext implements ActiveContext {
}
@Override
- public void submitContextAndService(final Configuration contextConfiguration, final Configuration serviceConfiguration) {
+ public void submitContextAndService(final Configuration contextConfiguration,
+ final Configuration serviceConfiguration) {
throw new NotImplementedException();
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestHttpServer.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestHttpServer.java b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestHttpServer.java
index 0a6b34f..a331052 100644
--- a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestHttpServer.java
+++ b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestHttpServer.java
@@ -30,12 +30,12 @@ import org.junit.Assert;
import org.junit.Test;
/**
- * Test Http Server
+ * Test Http Server.
*/
public class TestHttpServer {
/**
- * This is to test the case when using HttpRuntimeConfiguration.CONF with all the ther default bindings
+ * This is to test the case when using HttpRuntimeConfiguration.CONF with all the ther default bindings.
* @throws Exception
*/
@Test
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestJettyHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestJettyHandler.java b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestJettyHandler.java
index 6519b7b..5705b9a 100644
--- a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestJettyHandler.java
+++ b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestJettyHandler.java
@@ -38,7 +38,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
- * Unit Test for Jetty Handler
+ * Unit Test for Jetty Handler.
*/
public class TestJettyHandler {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestReefEventHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestReefEventHandler.java b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestReefEventHandler.java
index 70700bb..9282861 100644
--- a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestReefEventHandler.java
+++ b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestReefEventHandler.java
@@ -37,7 +37,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
- * Test Http Server Reef Event Handler
+ * Test Http Server Reef Event Handler.
*/
public class TestReefEventHandler {
private Request request;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestReefEventStateManager.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestReefEventStateManager.java b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestReefEventStateManager.java
index a480456..3b16df0 100644
--- a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestReefEventStateManager.java
+++ b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestReefEventStateManager.java
@@ -40,7 +40,7 @@ import java.net.InetSocketAddress;
import java.util.Map;
/**
- * Test ReefEventStateManager
+ * Test ReefEventStateManager.
*/
public class TestReefEventStateManager {
private Injector injector;
@@ -94,7 +94,7 @@ public class TestReefEventStateManager {
}
final class MockEvaluatorDescriptor implements EvaluatorDescriptor {
- final private NodeDescriptor nodeDescriptor;
+ private final NodeDescriptor nodeDescriptor;
final EvaluatorProcessFactory evaluatorProcessFactory;
@Inject
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestRuntimeStartHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestRuntimeStartHandler.java b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestRuntimeStartHandler.java
index 849a327..b439902 100644
--- a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestRuntimeStartHandler.java
+++ b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestRuntimeStartHandler.java
@@ -40,7 +40,7 @@ import java.io.IOException;
import java.util.Set;
/**
- * TestRuntimeStartHandler
+ * TestRuntimeStartHandler.
*/
public class TestRuntimeStartHandler {
@@ -60,7 +60,8 @@ public class TestRuntimeStartHandler {
}
/**
- * With HttpHandlerConfiguration merged with HttpRuntimeConfiguration and binding for http handlers, when inject RuntimeClock
+ * With HttpHandlerConfiguration merged with HttpRuntimeConfiguration and binding for http handlers,
+ * when inject RuntimeClock.
* all the nested objects including HeetServer, JettyHandler, HttpRuntimeStartHandler and HttpRuntimeStopHandler
*
* @throws BindException
@@ -73,7 +74,7 @@ public class TestRuntimeStartHandler {
}
/**
- * This test is to get RuntimeStartHandler, simulate the call to onNext to so tah tto start Jetty server
+ * This test is to get RuntimeStartHandler, simulate the call to onNext to so tah tto start Jetty server.
*
* @throws BindException
* @throws InjectionException
@@ -81,9 +82,10 @@ public class TestRuntimeStartHandler {
@Test
public void testRunTimeStartStopHandler() throws BindException, InjectionException {
final Injector injector = Tang.Factory.getTang().newInjector(this.configuation);
- final Set<EventHandler<RuntimeStart>> startEventHandlers = injector.getNamedInstance(RuntimeClock.RuntimeStartHandler.class);
- for (final EventHandler<RuntimeStart> enventHandler : startEventHandlers) {
- final HttpRuntimeStartHandler runtimeStartHandler = (HttpRuntimeStartHandler) enventHandler;
+ final Set<EventHandler<RuntimeStart>> startEventHandlers =
+ injector.getNamedInstance(RuntimeClock.RuntimeStartHandler.class);
+ for (final EventHandler<RuntimeStart> eventHandler : startEventHandlers) {
+ final HttpRuntimeStartHandler runtimeStartHandler = (HttpRuntimeStartHandler) eventHandler;
try {
runtimeStartHandler.onNext(null);
} catch (final Exception e) {
@@ -91,9 +93,10 @@ public class TestRuntimeStartHandler {
}
}
- final Set<EventHandler<RuntimeStop>> stopEventHandlers = injector.getNamedInstance(RuntimeClock.RuntimeStopHandler.class);
- for (final EventHandler<RuntimeStop> enventHandler : stopEventHandlers) {
- final HttpRuntimeStopHandler runtimeStopHandler = (HttpRuntimeStopHandler) enventHandler;
+ final Set<EventHandler<RuntimeStop>> stopEventHandlers =
+ injector.getNamedInstance(RuntimeClock.RuntimeStopHandler.class);
+ for (final EventHandler<RuntimeStop> eventHandler : stopEventHandlers) {
+ final HttpRuntimeStopHandler runtimeStopHandler = (HttpRuntimeStopHandler) eventHandler;
try {
runtimeStopHandler.onNext(null);
} catch (final Exception e) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestTrackingUri.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestTrackingUri.java b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestTrackingUri.java
index 7ccd021..a53ffc9 100644
--- a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestTrackingUri.java
+++ b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/TestTrackingUri.java
@@ -30,11 +30,11 @@ import org.junit.Test;
import java.net.UnknownHostException;
/**
- * Tracking Uri test
+ * Tracking Uri test.
*/
public class TestTrackingUri {
/**
- * Get Default Tracking URI
+ * Get Default Tracking URI.
*
* @throws InjectionException
* @throws UnknownHostException
@@ -46,7 +46,7 @@ public class TestTrackingUri {
}
/**
- * Get Tracking URI with specified port number and HttpTrackingURLProvider
+ * Get Tracking URI with specified port number and HttpTrackingURLProvider.
*
* @throws InjectionException
* @throws UnknownHostException
@@ -66,7 +66,7 @@ public class TestTrackingUri {
}
/**
- * Get Tracking URI with HttpTrackingURLProvider and defualt port number
+ * Get Tracking URI with HttpTrackingURLProvider and defualt port number.
*
* @throws InjectionException
* @throws UnknownHostException
@@ -85,7 +85,7 @@ public class TestTrackingUri {
}
/**
- * Http Tracking URI using default binding test
+ * Http Tracking URI using default binding test.
*
* @throws InjectionException
* @throws UnknownHostException
@@ -100,7 +100,7 @@ public class TestTrackingUri {
}
/**
- * Verify if URI is correct
+ * Verify if URI is correct.
*
* @param uri
* @param port
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/package-info.java b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/package-info.java
new file mode 100644
index 0000000..06338c8
--- /dev/null
+++ b/lang/java/reef-webserver/src/test/java/org/apache/reef/webserver/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.webserver;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8839886..f526e07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,6 +290,7 @@ under the License.
<format>xml</format>
<format>html</format>
<outputFile>${project.build.directory}/test/checkstyle-errors.xml</outputFile>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
</plugin>
</plugins>
[4/4] incubator-reef git commit: [REEF-487] Enable checkstyle for
test source directories
Posted by we...@apache.org.
[REEF-487] Enable checkstyle for test source directories
This addressed the issue by
* turning on includeTestSourceDirectory param in checkstyle
* fixing checkstyle violations in test sources
JIRA:
[REEF-487](https://issues.apache.org/jira/browse/REEF-487)
Pull Request:
This closes #320
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/a5cc9729
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/a5cc9729
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/a5cc9729
Branch: refs/heads/master
Commit: a5cc9729912e8df430e1d8f37414b9eaff7d5107
Parents: 7b4f9f1
Author: Mariia Mykhailova <mi...@gmail.com>
Authored: Tue Jul 21 17:37:39 2015 -0700
Committer: Markus Weimer <we...@apache.org>
Committed: Mon Jul 27 12:41:15 2015 -0700
----------------------------------------------------------------------
.../driver/EvaluatorRequestorImplTest.java | 24 ++++---
.../common/driver/catalog/CatalogTest.java | 2 +-
.../common/driver/catalog/package-info.java | 22 ++++++
.../runtime/common/driver/package-info.java | 22 ++++++
.../org/apache/reef/util/DeadlockInfoTest.java | 10 +--
.../org/apache/reef/util/LoggingScopeTest.java | 24 +++----
.../java/org/apache/reef/util/package-info.java | 22 ++++++
.../reef/examples/hello/package-info.java | 22 ++++++
.../reef/examples/suspend/package-info.java | 22 ++++++
.../reef/io/data/loading/impl/package-info.java | 22 ++++++
.../GroupCommunicationMessageCodecTest.java | 9 ++-
.../reef/io/network/group/package-info.java | 22 ++++++
.../apache/reef/io/network/util/TestUtils.java | 48 ++++++++-----
.../reef/io/network/util/package-info.java | 22 ++++++
.../reef/services/network/NameClientTest.java | 14 ++--
.../reef/services/network/NamingTest.java | 52 ++++++++------
.../network/NetworkConnectionServiceTest.java | 39 ++++++----
.../services/network/NetworkServiceTest.java | 53 ++++++++------
.../apache/reef/services/network/TestEvent.java | 2 +-
.../reef/services/network/package-info.java | 22 ++++++
.../services/network/util/LoggingUtils.java | 8 ++-
.../reef/services/network/util/Monitor.java | 3 +-
.../util/NetworkMessagingTestService.java | 6 +-
.../services/network/util/package-info.java | 3 +
.../reef/services/storage/SpoolFileTest.java | 7 +-
.../reef/services/storage/package-info.java | 22 ++++++
.../TestHDInsightRESTJsonSerialization.java | 35 +++++----
.../reef/runtime/hdinsight/package-info.java | 22 ++++++
.../local/driver/ResourceRequestQueueTest.java | 3 +-
.../reef/runtime/local/driver/package-info.java | 22 ++++++
.../reef/tang/implementation/Subplan.java | 2 +-
.../tang/ClassHierarchyDeserializationTest.java | 30 +++++---
.../org/apache/reef/tang/TestBindSingleton.java | 6 +-
.../org/apache/reef/tang/TestClassLoaders.java | 6 +-
.../apache/reef/tang/TestConfFileParser.java | 2 +-
.../reef/tang/TestImplicitConversions.java | 24 +++----
.../apache/reef/tang/TestInjectionFuture.java | 12 ++--
.../org/apache/reef/tang/TestListInjection.java | 18 ++---
.../reef/tang/TestNamedParameterRoundTrip.java | 65 ++++++++---------
.../java/org/apache/reef/tang/TestTang.java | 59 +++++++++------
.../org/apache/reef/tang/TestTweetExample.java | 19 ++---
...onfigurationSerializerAvroRoundtripTest.java | 3 +-
...figurationSerializerStringRoundtripTest.java | 3 +-
.../tang/formats/ConfigurationFileTest.java | 3 +-
.../reef/tang/formats/TestCommandLine.java | 4 +-
.../tang/formats/TestConfigurationModule.java | 14 ++--
.../apache/reef/tang/formats/package-info.java | 22 ++++++
.../tang/implementation/TestClassHierarchy.java | 73 +++++++++++--------
.../tang/implementation/avro/package-info.java | 22 ++++++
.../java/TestConfigurationBuilder.java | 7 +-
.../java/TestParameterParser.java | 5 +-
.../tang/implementation/java/package-info.java | 22 ++++++
.../reef/tang/implementation/package-info.java | 22 ++++++
.../java/org/apache/reef/tang/package-info.java | 22 ++++++
.../org/apache/reef/tang/test/AnInterface.java | 2 +-
.../tang/test/AnInterfaceImplementation.java | 12 +++-
.../apache/reef/tang/test/CyclicDependency.java | 18 +++--
.../tang/test/CyclicDependencyClassOne.java | 14 ++--
.../tang/test/CyclicDependencyClassTwo.java | 8 ++-
.../java/org/apache/reef/tang/test/Handler.java | 2 +-
.../apache/reef/tang/test/InjectableClass.java | 12 +++-
.../apache/reef/tang/test/ListOfBaseTypes.java | 20 ++++--
.../reef/tang/test/ListOfImplementations.java | 12 +++-
.../apache/reef/tang/test/ObjectTreeTest.java | 6 +-
.../reef/tang/test/RootImplementation.java | 58 ++++++++++-----
.../test/RootImplementationWithoutList.java | 52 ++++++++++----
.../apache/reef/tang/test/RootInterface.java | 2 +-
.../apache/reef/tang/test/RoundTripTest.java | 3 +-
.../reef/tang/test/SetInterfaceImplOne.java | 12 +++-
.../reef/tang/test/SetInterfaceImplTwo.java | 12 +++-
.../apache/reef/tang/test/SetOfBaseTypes.java | 20 ++++--
.../reef/tang/test/SetOfImplementations.java | 12 +++-
.../reef/tang/test/TestConfiguration.java | 18 ++---
.../tang/test/TestConfigurationWithoutList.java | 2 +-
.../org/apache/reef/tang/test/UnitClass.java | 42 ++++++++---
.../org/apache/reef/tests/AllTestsSuite.java | 2 +-
.../java/org/apache/reef/tests/FailureTest.java | 3 +-
.../apache/reef/tests/LocalTestEnvironment.java | 8 +--
.../apache/reef/tests/MesosTestEnvironment.java | 7 +-
.../apache/reef/tests/ProbabilisticTests.java | 2 +-
.../apache/reef/tests/TestEnvironmentBase.java | 2 +-
.../reef/tests/TestEnvironmentFactory.java | 8 ++-
.../java/org/apache/reef/tests/TestUtils.java | 6 ++
.../apache/reef/tests/YarnTestEnvironment.java | 6 +-
.../reef/tests/close_eval/package-info.java | 22 ++++++
.../ConfigurationProviderTest.java | 12 ++--
.../parameters/DriverAndEvaluatorParameter.java | 5 ++
.../parameters/DriverParameter.java | 8 ++-
.../parameters/EvaluatorParameter.java | 8 ++-
.../parameters/package-info.java | 4 +-
.../apache/reef/tests/driver/package-info.java | 22 ++++++
.../evaluatorexit/EvaluatorExitTestTask.java | 2 +-
.../evaluatorfailure/EvaluatorFailureTest.java | 9 ++-
.../reef/tests/evaluatorreuse/package-info.java | 22 ++++++
.../tests/evaluatorsize/EvaluatorSizeTest.java | 5 +-
.../evaluatorsize/EvaluatorSizeTestDriver.java | 2 +-
.../tests/evaluatorsize/MemorySizeTask.java | 6 +-
.../reef/tests/examples/ExamplesTestSuite.java | 2 +-
.../reef/tests/examples/package-info.java | 2 +-
.../apache/reef/tests/fail/FailTestSuite.java | 2 +-
.../apache/reef/tests/fail/package-info.java | 22 ++++++
.../reef/tests/files/FileResourceTest.java | 5 +-
.../tests/files/FileResourceTestDriver.java | 3 +-
.../reef/tests/files/FileResourceTestTask.java | 5 +-
.../ActiveContextHandler.java | 2 +-
.../AllocatedEvaluatorHandler.java | 5 +-
.../CompletedTaskHandler.java | 3 +-
.../StartHandler.java | 5 +-
.../package-info.java | 22 ++++++
.../org/apache/reef/tests/package-info.java | 22 ++++++
.../awareness/RackAwareEvaluatorTestDriver.java | 5 +-
.../reef/tests/rack/awareness/package-info.java | 2 +-
.../tests/subcontexts/SubContextDriver.java | 4 +-
.../tests/taskcounting/TaskCountingDriver.java | 2 +-
.../util/cache/CacheImplConcurrentTest.java | 2 +-
.../apache/reef/util/cache/CacheImplTest.java | 6 +-
.../reef/util/cache/ImmediateInteger.java | 2 +-
.../apache/reef/util/cache/SleepingInteger.java | 4 +-
.../reef/util/cache/WrappedValueTest.java | 18 ++---
.../apache/reef/util/cache/package-info.java | 22 ++++++
.../java/org/apache/reef/util/package-info.java | 22 ++++++
.../wake/test/BlockingEventHandlerTest.java | 9 ++-
.../test/BlockingSignalEventHandlerTest.java | 35 +++++----
.../reef/wake/test/ForkPoolStageTest.java | 15 ++--
...ndependentIterationsThreadPoolStageTest.java | 28 ++++----
.../org/apache/reef/wake/test/MetricsTest.java | 4 +-
.../wake/test/PubSubThreadPoolStageTest.java | 7 +-
.../apache/reef/wake/test/StageManagerTest.java | 2 -
.../apache/reef/wake/test/SyncStageTest.java | 4 +-
.../reef/wake/test/ThreadPoolStageTest.java | 17 +++--
.../apache/reef/wake/test/TimerStageTest.java | 11 +--
.../reef/wake/test/examples/SkipListTest.java | 59 ++++++++++-----
.../reef/wake/test/examples/TestCombiner.java | 76 ++++++++++----------
.../reef/wake/test/examples/package-info.java | 22 ++++++
.../reef/wake/test/remote/LargeMsgTest.java | 55 +++++++-------
.../remote/RemoteIdentifierFactoryTest.java | 8 +--
.../wake/test/remote/RemoteManagerTest.java | 47 ++++++------
.../reef/wake/test/remote/RemoteTest.java | 14 ++--
.../wake/test/remote/SmallMessagesTest.java | 11 +--
.../reef/wake/test/remote/TestEventCodec.java | 2 +-
.../reef/wake/test/remote/TestRemote.java | 3 +-
.../wake/test/remote/TransportRaceTest.java | 9 +--
.../reef/wake/test/remote/TransportTest.java | 13 ++--
.../org/apache/reef/wake/test/rx/RxTest.java | 5 +-
.../wake/test/rx/RxThreadPoolStageTest.java | 2 -
.../apache/reef/wake/test/time/ClockTest.java | 3 +-
.../reef/webserver/TestAvroHttpSerializer.java | 24 +++----
.../webserver/TestAvroSerializerForHttp.java | 41 +++++++----
.../reef/webserver/TestHttpConfiguration.java | 12 ++--
.../apache/reef/webserver/TestHttpServer.java | 4 +-
.../apache/reef/webserver/TestJettyHandler.java | 2 +-
.../reef/webserver/TestReefEventHandler.java | 2 +-
.../webserver/TestReefEventStateManager.java | 4 +-
.../reef/webserver/TestRuntimeStartHandler.java | 21 +++---
.../apache/reef/webserver/TestTrackingUri.java | 12 ++--
.../org/apache/reef/webserver/package-info.java | 22 ++++++
pom.xml | 1 +
157 files changed, 1672 insertions(+), 704 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-common/src/test/java/org/apache/reef/runtime/common/driver/EvaluatorRequestorImplTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/test/java/org/apache/reef/runtime/common/driver/EvaluatorRequestorImplTest.java b/lang/java/reef-common/src/test/java/org/apache/reef/runtime/common/driver/EvaluatorRequestorImplTest.java
index 3ef77f8..a786be9 100644
--- a/lang/java/reef-common/src/test/java/org/apache/reef/runtime/common/driver/EvaluatorRequestorImplTest.java
+++ b/lang/java/reef-common/src/test/java/org/apache/reef/runtime/common/driver/EvaluatorRequestorImplTest.java
@@ -51,9 +51,11 @@ public class EvaluatorRequestorImplTest {
public void testMemoryOnly() {
final int memory = 777;
final DummyRequestHandler requestHandler = new DummyRequestHandler();
- final EvaluatorRequestor evaluatorRequestor = new EvaluatorRequestorImpl(resourceCatalog, requestHandler, loggingScopeFactory);
+ final EvaluatorRequestor evaluatorRequestor =
+ new EvaluatorRequestorImpl(resourceCatalog, requestHandler, loggingScopeFactory);
evaluatorRequestor.submit(EvaluatorRequest.newBuilder().setMemory(memory).build());
- Assert.assertEquals("Memory request did not make it", memory, requestHandler.get().getMemorySize().get().intValue());
+ Assert.assertEquals("Memory request did not make it",
+ memory, requestHandler.get().getMemorySize().get().intValue());
Assert.assertEquals("Number of requests did not make it", 1, requestHandler.get().getResourceCount());
}
@@ -65,9 +67,11 @@ public class EvaluatorRequestorImplTest {
final int memory = 777;
final int count = 9;
final DummyRequestHandler requestHandler = new DummyRequestHandler();
- final EvaluatorRequestor evaluatorRequestor = new EvaluatorRequestorImpl(resourceCatalog, requestHandler, loggingScopeFactory);
+ final EvaluatorRequestor evaluatorRequestor =
+ new EvaluatorRequestorImpl(resourceCatalog, requestHandler, loggingScopeFactory);
evaluatorRequestor.submit(EvaluatorRequest.newBuilder().setMemory(memory).setNumber(count).build());
- Assert.assertEquals("Memory request did not make it", memory, requestHandler.get().getMemorySize().get().intValue());
+ Assert.assertEquals("Memory request did not make it",
+ memory, requestHandler.get().getMemorySize().get().intValue());
Assert.assertEquals("Number of requests did not make it", count, requestHandler.get().getResourceCount());
}
@@ -79,8 +83,10 @@ public class EvaluatorRequestorImplTest {
final int memory = 0;
final int count = 1;
final DummyRequestHandler requestHandler = new DummyRequestHandler();
- final EvaluatorRequestor evaluatorRequestor = new EvaluatorRequestorImpl(resourceCatalog, requestHandler, loggingScopeFactory);
- evaluatorRequestor.submit(EvaluatorRequest.newBuilder().setMemory(memory).setNumberOfCores(1).setNumber(count).build());
+ final EvaluatorRequestor evaluatorRequestor =
+ new EvaluatorRequestorImpl(resourceCatalog, requestHandler, loggingScopeFactory);
+ evaluatorRequestor.submit(EvaluatorRequest.newBuilder().setMemory(memory).setNumberOfCores(1).setNumber(count)
+ .build());
}
/**
@@ -91,8 +97,10 @@ public class EvaluatorRequestorImplTest {
final int memory = 128;
final int count = 0;
final DummyRequestHandler requestHandler = new DummyRequestHandler();
- final EvaluatorRequestor evaluatorRequestor = new EvaluatorRequestorImpl(resourceCatalog, requestHandler, loggingScopeFactory);
- evaluatorRequestor.submit(EvaluatorRequest.newBuilder().setMemory(memory).setNumberOfCores(1).setNumber(count).build());
+ final EvaluatorRequestor evaluatorRequestor =
+ new EvaluatorRequestorImpl(resourceCatalog, requestHandler, loggingScopeFactory);
+ evaluatorRequestor.submit(EvaluatorRequest.newBuilder().setMemory(memory).setNumberOfCores(1).setNumber(count)
+ .build());
}
private class DummyRequestHandler implements ResourceRequestHandler {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-common/src/test/java/org/apache/reef/runtime/common/driver/catalog/CatalogTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/test/java/org/apache/reef/runtime/common/driver/catalog/CatalogTest.java b/lang/java/reef-common/src/test/java/org/apache/reef/runtime/common/driver/catalog/CatalogTest.java
index b9e9df9..e24661c 100644
--- a/lang/java/reef-common/src/test/java/org/apache/reef/runtime/common/driver/catalog/CatalogTest.java
+++ b/lang/java/reef-common/src/test/java/org/apache/reef/runtime/common/driver/catalog/CatalogTest.java
@@ -30,7 +30,7 @@ public final class CatalogTest {
* that they exist.
*/
@Test
- public final void TestResourceCatalog() {
+ public void testResourceCatalog() {
final int nodes = 10;
final ResourceCatalogImpl catalog = new ResourceCatalogImpl();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-common/src/test/java/org/apache/reef/runtime/common/driver/catalog/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/test/java/org/apache/reef/runtime/common/driver/catalog/package-info.java b/lang/java/reef-common/src/test/java/org/apache/reef/runtime/common/driver/catalog/package-info.java
new file mode 100644
index 0000000..777db78
--- /dev/null
+++ b/lang/java/reef-common/src/test/java/org/apache/reef/runtime/common/driver/catalog/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.runtime.common.driver.catalog;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-common/src/test/java/org/apache/reef/runtime/common/driver/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/test/java/org/apache/reef/runtime/common/driver/package-info.java b/lang/java/reef-common/src/test/java/org/apache/reef/runtime/common/driver/package-info.java
new file mode 100644
index 0000000..030173e
--- /dev/null
+++ b/lang/java/reef-common/src/test/java/org/apache/reef/runtime/common/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.runtime.common.driver;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-common/src/test/java/org/apache/reef/util/DeadlockInfoTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/test/java/org/apache/reef/util/DeadlockInfoTest.java b/lang/java/reef-common/src/test/java/org/apache/reef/util/DeadlockInfoTest.java
index 3e7b1d4..dc017ed 100644
--- a/lang/java/reef-common/src/test/java/org/apache/reef/util/DeadlockInfoTest.java
+++ b/lang/java/reef-common/src/test/java/org/apache/reef/util/DeadlockInfoTest.java
@@ -34,17 +34,17 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
/**
- * Test DeadlockInfo by creating a deadlock
+ * Test DeadlockInfo by creating a deadlock.
*/
public final class DeadlockInfoTest {
private static final Logger LOG = Logger.getLogger(DeadlockInfoTest.class.getName());
- private static final long timeoutMillis = 50;
+ private static final long TIMEOUT_MILLIS = 50;
/**
* Create a deadlock consisting of two threads.
* The threads wait on a barrier, and once the barrier is met they proceed to deadlock.
- * setUpClass sleeps for timeoutMillis to allow the threads time to progress past the barrier into deadlock.
+ * setUpClass sleeps for TIMEOUT_MILLIS to allow the threads time to progress past the barrier into deadlock.
*
* One thread holds an Object and Long lock, and is waiting on an Integer lock.
* The other thread holds the Integer lock and is waiting on the Long lock.
@@ -52,7 +52,7 @@ public final class DeadlockInfoTest {
@BeforeClass
public static void setUpClass() {
createDeadlock();
- threadSleep(timeoutMillis);
+ threadSleep(TIMEOUT_MILLIS);
}
/**
@@ -130,7 +130,7 @@ public final class DeadlockInfoTest {
private static void barrierAwait(final CyclicBarrier barrier) {
try {
- barrier.await(timeoutMillis, TimeUnit.MILLISECONDS);
+ barrier.await(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
e.printStackTrace();
fail("Unexpected exception");
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-common/src/test/java/org/apache/reef/util/LoggingScopeTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/test/java/org/apache/reef/util/LoggingScopeTest.java b/lang/java/reef-common/src/test/java/org/apache/reef/util/LoggingScopeTest.java
index a6a3989..628ae23 100644
--- a/lang/java/reef-common/src/test/java/org/apache/reef/util/LoggingScopeTest.java
+++ b/lang/java/reef-common/src/test/java/org/apache/reef/util/LoggingScopeTest.java
@@ -20,7 +20,6 @@
package org.apache.reef.util;
import org.apache.reef.tang.ConfigurationBuilder;
-import org.apache.reef.tang.ExternalConstructor;
import org.apache.reef.tang.Injector;
import org.apache.reef.tang.Tang;
import org.apache.reef.tang.exceptions.InjectionException;
@@ -29,12 +28,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import javax.inject.Inject;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
/**
- * Test LoggingScope
+ * Test LoggingScope.
*/
public class LoggingScopeTest {
@@ -50,30 +45,31 @@ public class LoggingScopeTest {
}
/**
- * Test getNewLoggingScope() in LoggingScopeFactory that injects LoggingScope object
+ * Test getNewLoggingScope() in LoggingScopeFactory that injects LoggingScope object.
*
* @throws Exception
*/
@Test
public void testGetNewLoggingScope() throws InjectionException {
try (final LoggingScope ls = logFactory.getNewLoggingScope("test")) {
- Assert.assertTrue(true);
+ Assert.assertTrue(true);
}
}
/**
- * Test getNewLoggingScope() in LoggingScopeFactory that injects LoggingScope object with param as a parameter
+ * Test getNewLoggingScope() in LoggingScopeFactory that injects LoggingScope object with param as a parameter.
* @throws InjectionException
*/
@Test
public void testGetNewLoggingScopeWithParam() throws InjectionException {
- try (final LoggingScope ls = logFactory.getNewLoggingScope("test first string = {0}, second = {1}", new Object[] { "first", "second" })) {
+ try (final LoggingScope ls = logFactory.getNewLoggingScope("test first string = {0}, second = {1}",
+ new Object[] {"first", "second"})) {
Assert.assertTrue(true);
}
}
/**
- * Test calling predefined method in LoggingScopeFactory
+ * Test calling predefined method in LoggingScopeFactory.
*
* @throws Exception
*/
@@ -85,15 +81,15 @@ public class LoggingScopeTest {
}
/**
- * Use default log level in injecting LoggingScopeFactory constructor
+ * Use default log level in injecting LoggingScopeFactory constructor.
* @throws InjectionException
*/
@Test
public void testLoggingScopeFactoryWithDefaultLogLevel() throws InjectionException {
final Injector i = Tang.Factory.getTang().newInjector(Tang.Factory.getTang().newConfigurationBuilder().build());
- final LoggingScopeFactory logFactory = i.getInstance(LoggingScopeFactory.class);
+ final LoggingScopeFactory localLogFactory = i.getInstance(LoggingScopeFactory.class);
- try (final LoggingScope ls = logFactory.activeContextReceived("test")) {
+ try (final LoggingScope ls = localLogFactory.activeContextReceived("test")) {
Assert.assertTrue(true);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-common/src/test/java/org/apache/reef/util/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/test/java/org/apache/reef/util/package-info.java b/lang/java/reef-common/src/test/java/org/apache/reef/util/package-info.java
new file mode 100644
index 0000000..9c0bc9e
--- /dev/null
+++ b/lang/java/reef-common/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-examples/src/test/java/org/apache/reef/examples/hello/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-examples/src/test/java/org/apache/reef/examples/hello/package-info.java b/lang/java/reef-examples/src/test/java/org/apache/reef/examples/hello/package-info.java
new file mode 100644
index 0000000..d2fe07b
--- /dev/null
+++ b/lang/java/reef-examples/src/test/java/org/apache/reef/examples/hello/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.examples.hello;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-examples/src/test/java/org/apache/reef/examples/suspend/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-examples/src/test/java/org/apache/reef/examples/suspend/package-info.java b/lang/java/reef-examples/src/test/java/org/apache/reef/examples/suspend/package-info.java
new file mode 100644
index 0000000..e7524c0
--- /dev/null
+++ b/lang/java/reef-examples/src/test/java/org/apache/reef/examples/suspend/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.examples.suspend;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-io/src/test/java/org/apache/reef/io/data/loading/impl/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/io/data/loading/impl/package-info.java b/lang/java/reef-io/src/test/java/org/apache/reef/io/data/loading/impl/package-info.java
new file mode 100644
index 0000000..627f2f8
--- /dev/null
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/io/data/loading/impl/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.io.data.loading.impl;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-io/src/test/java/org/apache/reef/io/network/group/GroupCommunicationMessageCodecTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/io/network/group/GroupCommunicationMessageCodecTest.java b/lang/java/reef-io/src/test/java/org/apache/reef/io/network/group/GroupCommunicationMessageCodecTest.java
index 2ba2fb6..e41ab8c 100644
--- a/lang/java/reef-io/src/test/java/org/apache/reef/io/network/group/GroupCommunicationMessageCodecTest.java
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/io/network/group/GroupCommunicationMessageCodecTest.java
@@ -50,7 +50,8 @@ public class GroupCommunicationMessageCodecTest {
@Test(timeout = 100)
public final void testInstantiation() throws InjectionException {
- final GroupCommunicationMessageCodec codec = Tang.Factory.getTang().newInjector().getInstance(GroupCommunicationMessageCodec.class);
+ final GroupCommunicationMessageCodec codec =
+ Tang.Factory.getTang().newInjector().getInstance(GroupCommunicationMessageCodec.class);
Assert.assertNotNull("tang.getInstance(GroupCommunicationMessageCodec.class): ", codec);
}
@@ -59,14 +60,16 @@ public class GroupCommunicationMessageCodecTest {
final Random r = new Random();
final byte[] data = new byte[100];
r.nextBytes(data);
- final GroupCommunicationMessage expMsg = Utils.bldVersionedGCM(GroupName.class, OperName.class, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ChildAdd, "From", 0, "To", 1, data);
+ final GroupCommunicationMessage expMsg = Utils.bldVersionedGCM(GroupName.class, OperName.class,
+ ReefNetworkGroupCommProtos.GroupCommMessage.Type.ChildAdd, "From", 0, "To", 1, data);
final GroupCommunicationMessageCodec codec = new GroupCommunicationMessageCodec();
final GroupCommunicationMessage actMsg1 = codec.decode(codec.encode(expMsg));
Assert.assertEquals("decode(encode(msg)): ", expMsg, actMsg1);
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
final DataOutputStream daos = new DataOutputStream(baos);
codec.encodeToStream(expMsg, daos);
- final GroupCommunicationMessage actMsg2 = codec.decodeFromStream(new DataInputStream(new ByteArrayInputStream(baos.toByteArray())));
+ final GroupCommunicationMessage actMsg2 =
+ codec.decodeFromStream(new DataInputStream(new ByteArrayInputStream(baos.toByteArray())));
Assert.assertEquals("decodeFromStream(encodeToStream(msg)): ", expMsg, actMsg2);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-io/src/test/java/org/apache/reef/io/network/group/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/io/network/group/package-info.java b/lang/java/reef-io/src/test/java/org/apache/reef/io/network/group/package-info.java
new file mode 100644
index 0000000..eafc13b
--- /dev/null
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/io/network/group/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.io.network.group;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-io/src/test/java/org/apache/reef/io/network/util/TestUtils.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/io/network/util/TestUtils.java b/lang/java/reef-io/src/test/java/org/apache/reef/io/network/util/TestUtils.java
index ec861d0..ee305ec 100644
--- a/lang/java/reef-io/src/test/java/org/apache/reef/io/network/util/TestUtils.java
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/io/network/util/TestUtils.java
@@ -22,18 +22,22 @@ import com.google.protobuf.ByteString;
import org.apache.reef.io.network.proto.ReefNetworkGroupCommProtos;
import org.apache.reef.wake.Identifier;
-public class TestUtils {
- public static ReefNetworkGroupCommProtos.GroupCommMessage bldGCM(final ReefNetworkGroupCommProtos.GroupCommMessage.Type msgType, final Identifier from, final Identifier to, final byte[]... elements) {
- final ReefNetworkGroupCommProtos.GroupCommMessage.Builder GCMBuilder = ReefNetworkGroupCommProtos.GroupCommMessage.newBuilder();
- GCMBuilder.setType(msgType);
- GCMBuilder.setSrcid(from.toString());
- GCMBuilder.setDestid(to.toString());
- final ReefNetworkGroupCommProtos.GroupMessageBody.Builder bodyBuilder = ReefNetworkGroupCommProtos.GroupMessageBody.newBuilder();
+public final class TestUtils {
+ public static ReefNetworkGroupCommProtos.GroupCommMessage bldGCM(
+ final ReefNetworkGroupCommProtos.GroupCommMessage.Type msgType,
+ final Identifier from, final Identifier to, final byte[]... elements) {
+ final ReefNetworkGroupCommProtos.GroupCommMessage.Builder gcmBuilder =
+ ReefNetworkGroupCommProtos.GroupCommMessage.newBuilder();
+ gcmBuilder.setType(msgType);
+ gcmBuilder.setSrcid(from.toString());
+ gcmBuilder.setDestid(to.toString());
+ final ReefNetworkGroupCommProtos.GroupMessageBody.Builder bodyBuilder =
+ ReefNetworkGroupCommProtos.GroupMessageBody.newBuilder();
for (final byte[] element : elements) {
bodyBuilder.setData(ByteString.copyFrom(element));
- GCMBuilder.addMsgs(bodyBuilder.build());
+ gcmBuilder.addMsgs(bodyBuilder.build());
}
- final ReefNetworkGroupCommProtos.GroupCommMessage msg = GCMBuilder.build();
+ final ReefNetworkGroupCommProtos.GroupCommMessage msg = gcmBuilder.build();
return msg;
}
@@ -44,17 +48,23 @@ public class TestUtils {
public static boolean controlMessage(final ReefNetworkGroupCommProtos.GroupCommMessage.Type type) {
switch (type) {
- case AllGather:
- case AllReduce:
- case Broadcast:
- case Gather:
- case Reduce:
- case ReduceScatter:
- case Scatter:
- return false;
+ case AllGather:
+ case AllReduce:
+ case Broadcast:
+ case Gather:
+ case Reduce:
+ case ReduceScatter:
+ case Scatter:
+ return false;
- default:
- return true;
+ default:
+ return true;
}
}
+
+ /**
+ * 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-io/src/test/java/org/apache/reef/io/network/util/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/io/network/util/package-info.java b/lang/java/reef-io/src/test/java/org/apache/reef/io/network/util/package-info.java
new file mode 100644
index 0000000..819a2df
--- /dev/null
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/io/network/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.io.network.util;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NameClientTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NameClientTest.java b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NameClientTest.java
index c46e2be..d4afd3e 100644
--- a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NameClientTest.java
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NameClientTest.java
@@ -96,7 +96,8 @@ public class NameClientTest {
.set(NameResolverConfiguration.RETRY_COUNT, retryCount)
.build();
- try (final NameResolver client = Tang.Factory.getTang().newInjector(nameResolverConf).getInstance(NameClient.class)) {
+ try (final NameResolver client =
+ Tang.Factory.getTang().newInjector(nameResolverConf).getInstance(NameClient.class)) {
final Identifier id = factory.getNewInstance("Task1");
client.register(id, new InetSocketAddress(localAddress, 7001));
client.unregister(id);
@@ -130,10 +131,11 @@ public class NameClientTest {
.set(NameResolverConfiguration.RETRY_COUNT, retryCount)
.build();
- try (final NameResolver client = Tang.Factory.getTang().newInjector(nameResolverConf).getInstance(NameClient.class)) {
+ try (final NameResolver client =
+ Tang.Factory.getTang().newInjector(nameResolverConf).getInstance(NameClient.class)) {
final Identifier id = factory.getNewInstance("Task1");
client.register(id, new InetSocketAddress(localAddress, 7001));
- client.lookup(id);// caches the entry
+ client.lookup(id); // caches the entry
client.unregister(id);
Thread.sleep(100);
try {
@@ -147,9 +149,11 @@ public class NameClientTest {
Assert.assertNull("client.lookup(id)", addr);
} catch (Exception e) {
if (e instanceof ExecutionException) {
- Assert.assertTrue("Execution Exception cause is instanceof NamingException", e.getCause() instanceof NamingException);
- } else
+ Assert.assertTrue("Execution Exception cause is instanceof NamingException",
+ e.getCause() instanceof NamingException);
+ } else {
throw e;
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NamingTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NamingTest.java b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NamingTest.java
index b726b78..6137155 100644
--- a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NamingTest.java
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NamingTest.java
@@ -45,19 +45,19 @@ import java.util.logging.Level;
import java.util.logging.Logger;
/**
- * Naming server and client test
+ * Naming server and client test.
*/
public class NamingTest {
private static final Logger LOG = Logger.getLogger(NamingTest.class.getName());
- private static final int retryCount;
- private static final int retryTimeout;
+ private static final int RETRY_COUNT;
+ private static final int RETRY_TIMEOUT;
static {
try {
final Injector injector = Tang.Factory.getTang().newInjector();
- retryCount = injector.getNamedInstance(NameResolverRetryCount.class);
- retryTimeout = injector.getNamedInstance(NameResolverRetryTimeout.class);
+ RETRY_COUNT = injector.getNamedInstance(NameResolverRetryCount.class);
+ RETRY_TIMEOUT = injector.getNamedInstance(NameResolverRetryTimeout.class);
} catch (final InjectionException ex) {
final String msg = "Exception while trying to find default values for retryCount & Timeout";
LOG.log(Level.SEVERE, msg, ex);
@@ -68,7 +68,7 @@ public class NamingTest {
private final LocalAddressProvider localAddressProvider;
@Rule
public final TestName name = new TestName();
- final long TTL = 30000;
+ static final long TTL = 30000;
final IdentifierFactory factory = new StringIdentifierFactory();
int port;
@@ -77,7 +77,7 @@ public class NamingTest {
}
/**
- * NameServer and NameLookupClient test
+ * NameServer and NameLookupClient test.
*
* @throws Exception
*/
@@ -104,7 +104,7 @@ public class NamingTest {
// run a client
try (final NameLookupClient client = new NameLookupClient(localAddress, this.port,
- 10000, this.factory, retryCount, retryTimeout, new NameCache(this.TTL), this.localAddressProvider)) {
+ 10000, this.factory, RETRY_COUNT, RETRY_TIMEOUT, new NameCache(this.TTL), this.localAddressProvider)) {
final Identifier id1 = this.factory.getNewInstance("task1");
final Identifier id2 = this.factory.getNewInstance("task2");
@@ -125,7 +125,7 @@ public class NamingTest {
}
/**
- * Test concurrent lookups (threads share a client)
+ * Test concurrent lookups (threads share a client).
*
* @throws Exception
*/
@@ -158,7 +158,7 @@ public class NamingTest {
// run a client
try (final NameLookupClient client = new NameLookupClient(localAddress, this.port,
- 10000, this.factory, retryCount, retryTimeout, new NameCache(this.TTL), this.localAddressProvider)) {
+ 10000, this.factory, RETRY_COUNT, RETRY_TIMEOUT, new NameCache(this.TTL), this.localAddressProvider)) {
final Identifier id1 = this.factory.getNewInstance("task1");
final Identifier id2 = this.factory.getNewInstance("task2");
@@ -166,7 +166,8 @@ public class NamingTest {
final ExecutorService e = Executors.newCachedThreadPool();
- final ConcurrentMap<Identifier, InetSocketAddress> respMap = new ConcurrentHashMap<Identifier, InetSocketAddress>();
+ final ConcurrentMap<Identifier, InetSocketAddress> respMap =
+ new ConcurrentHashMap<Identifier, InetSocketAddress>();
final Future<?> f1 = e.submit(new Runnable() {
@Override
@@ -223,7 +224,7 @@ public class NamingTest {
}
/**
- * NameServer and NameRegistryClient test
+ * NameServer and NameRegistryClient test.
*
* @throws Exception
*/
@@ -246,8 +247,8 @@ public class NamingTest {
// registration
// invoke registration from the client side
- try (final NameRegistryClient client = new NameRegistryClient(localAddress,
- this.port, this.factory, this.localAddressProvider)) {
+ try (final NameRegistryClient client =
+ new NameRegistryClient(localAddress, this.port, this.factory, this.localAddressProvider)) {
for (final Identifier id : idToAddrMap.keySet()) {
client.register(id, idToAddrMap.get(id));
}
@@ -278,8 +279,9 @@ public class NamingTest {
serverMap = new HashMap<Identifier, InetSocketAddress>();
nas = server.lookup(ids);
- for (final NameAssignment na : nas)
+ for (final NameAssignment na : nas) {
serverMap.put(na.getIdentifier(), na.getAddress());
+ }
Assert.assertEquals(0, serverMap.size());
}
@@ -287,7 +289,7 @@ public class NamingTest {
}
/**
- * NameServer and NameClient test
+ * NameServer and NameClient test.
*
* @throws Exception
*/
@@ -313,8 +315,8 @@ public class NamingTest {
.set(NameResolverConfiguration.NAME_SERVER_HOSTNAME, localAddress)
.set(NameResolverConfiguration.NAME_SERVICE_PORT, this.port)
.set(NameResolverConfiguration.CACHE_TIMEOUT, this.TTL)
- .set(NameResolverConfiguration.RETRY_TIMEOUT, retryTimeout)
- .set(NameResolverConfiguration.RETRY_COUNT, retryCount)
+ .set(NameResolverConfiguration.RETRY_TIMEOUT, RETRY_TIMEOUT)
+ .set(NameResolverConfiguration.RETRY_COUNT, RETRY_COUNT)
.build();
try (final NameResolver client
@@ -353,9 +355,13 @@ public class NamingTest {
final Map<Identifier, InetSocketAddress> serverMap = new HashMap<Identifier, InetSocketAddress>();
addr1 = server.lookup(id1);
- if (addr1 != null) serverMap.put(id1, addr1);
+ if (addr1 != null) {
+ serverMap.put(id1, addr1);
+ }
addr2 = server.lookup(id1);
- if (addr2 != null) serverMap.put(id2, addr2);
+ if (addr2 != null) {
+ serverMap.put(id2, addr2);
+ }
Assert.assertEquals(0, serverMap.size());
}
@@ -382,9 +388,9 @@ public class NamingTest {
private void busyWait(final NameServer server, final int expected, final Set<Identifier> ids) {
int count = 0;
- for (; ; ) {
+ for (;;) {
final Iterable<NameAssignment> nas = server.lookup(ids);
- for (final @SuppressWarnings("unused") NameAssignment na : nas) {
+ for (@SuppressWarnings("unused") final NameAssignment na : nas) {
++count;
}
if (count == expected) {
@@ -393,4 +399,4 @@ public class NamingTest {
count = 0;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NetworkConnectionServiceTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NetworkConnectionServiceTest.java b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NetworkConnectionServiceTest.java
index 3cb1310..e9c903c 100644
--- a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NetworkConnectionServiceTest.java
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NetworkConnectionServiceTest.java
@@ -101,7 +101,8 @@ public class NetworkConnectionServiceTest {
runMessagingNetworkConnectionService(new StreamingStringCodec());
}
- public void runNetworkConnServiceWithMultipleConnFactories(Codec<String> stringCodec, Codec<Integer> integerCodec) throws Exception {
+ public void runNetworkConnServiceWithMultipleConnFactories(Codec<String> stringCodec, Codec<Integer> integerCodec)
+ throws Exception {
final ExecutorService executor = Executors.newFixedThreadPool(5);
final int groupcommMessages = 1000;
@@ -117,7 +118,8 @@ public class NetworkConnectionServiceTest {
executor.submit(new Runnable() {
@Override
public void run() {
- try (final Connection<String> conn = messagingTestService.getConnectionFromSenderToReceiver(groupCommClientId)) {
+ try (final Connection<String> conn =
+ messagingTestService.getConnectionFromSenderToReceiver(groupCommClientId)) {
conn.open();
for (int count = 0; count < groupcommMessages; ++count) {
// send messages to the receiver.
@@ -134,7 +136,8 @@ public class NetworkConnectionServiceTest {
executor.submit(new Runnable() {
@Override
public void run() {
- try (final Connection<Integer> conn = messagingTestService.getConnectionFromSenderToReceiver(shuffleClientId)) {
+ try (final Connection<Integer> conn =
+ messagingTestService.getConnectionFromSenderToReceiver(shuffleClientId)) {
conn.open();
for (int count = 0; count < shuffleMessages; ++count) {
// send messages to the receiver.
@@ -194,7 +197,8 @@ public class NetworkConnectionServiceTest {
}
final String message = msb.toString();
- try (final Connection<String> conn = messagingTestService.getConnectionFromSenderToReceiver(groupCommClientId)) {
+ try (final Connection<String> conn =
+ messagingTestService.getConnectionFromSenderToReceiver(groupCommClientId)) {
long start = System.currentTimeMillis();
try {
@@ -211,7 +215,8 @@ public class NetworkConnectionServiceTest {
final long end = System.currentTimeMillis();
final double runtime = ((double) end - start) / 1000;
- LOG.log(Level.INFO, "size: " + size + "; messages/s: " + numMessages / runtime + " bandwidth(bytes/s): " + ((double) numMessages * 2 * size) / runtime);// x2 for unicode chars
+ LOG.log(Level.INFO, "size: " + size + "; messages/s: " + numMessages / runtime +
+ " bandwidth(bytes/s): " + ((double) numMessages * 2 * size) / runtime); // x2 for unicode chars
}
}
}
@@ -241,7 +246,8 @@ public class NetworkConnectionServiceTest {
final Codec<String> codec = new StringCodec();
messagingTestService.registerTestConnectionFactory(groupCommClientId, numMessages, monitor, codec);
- try (final Connection<String> conn = messagingTestService.getConnectionFromSenderToReceiver(groupCommClientId)) {
+ try (final Connection<String> conn =
+ messagingTestService.getConnectionFromSenderToReceiver(groupCommClientId)) {
// build the message
final StringBuilder msb = new StringBuilder();
@@ -272,18 +278,21 @@ public class NetworkConnectionServiceTest {
// start and time
final long start = System.currentTimeMillis();
final Object ignore = new Object();
- for (int i = 0; i < numThreads; i++) barrier.add(ignore);
+ for (int i = 0; i < numThreads; i++) {
+ barrier.add(ignore);
+ }
e.shutdown();
e.awaitTermination(100, TimeUnit.SECONDS);
final long end = System.currentTimeMillis();
final double runtime = ((double) end - start) / 1000;
- LOG.log(Level.INFO, "size: " + size + "; messages/s: " + totalNumMessages / runtime + " bandwidth(bytes/s): " + ((double) totalNumMessages * 2 * size) / runtime);// x2 for unicode chars
+ LOG.log(Level.INFO, "size: " + size + "; messages/s: " + totalNumMessages / runtime +
+ " bandwidth(bytes/s): " + ((double) totalNumMessages * 2 * size) / runtime); // x2 for unicode chars
}
@Test
public void testMultithreadedSharedConnMessagingNetworkConnServiceRate() throws Exception {
LOG.log(Level.FINEST, name.getMethodName());
- final int[] messageSizes = {2000};// {1,16,32,64,512,64*1024,1024*1024};
+ final int[] messageSizes = {2000}; // {1,16,32,64,512,64*1024,1024*1024};
for (int size : messageSizes) {
final int numMessages = 300000 / (Math.max(1, size / 512));
@@ -302,7 +311,8 @@ public class NetworkConnectionServiceTest {
msb.append("1");
}
final String message = msb.toString();
- try (final Connection<String> conn = messagingTestService.getConnectionFromSenderToReceiver(groupCommClientId)) {
+ try (final Connection<String> conn =
+ messagingTestService.getConnectionFromSenderToReceiver(groupCommClientId)) {
final long start = System.currentTimeMillis();
for (int i = 0; i < numThreads; i++) {
@@ -328,7 +338,8 @@ public class NetworkConnectionServiceTest {
monitor.mwait();
final long end = System.currentTimeMillis();
final double runtime = ((double) end - start) / 1000;
- LOG.log(Level.INFO, "size: " + size + "; messages/s: " + totalNumMessages / runtime + " bandwidth(bytes/s): " + ((double) totalNumMessages * 2 * size) / runtime);// x2 for unicode chars
+ LOG.log(Level.INFO, "size: " + size + "; messages/s: " + totalNumMessages / runtime +
+ " bandwidth(bytes/s): " + ((double) totalNumMessages * 2 * size) / runtime); // x2 for unicode chars
}
}
}
@@ -350,7 +361,8 @@ public class NetworkConnectionServiceTest {
final Codec<String> codec = new StringCodec();
try (final NetworkMessagingTestService messagingTestService = new NetworkMessagingTestService(localAddress)) {
messagingTestService.registerTestConnectionFactory(groupCommClientId, numMessages, monitor, codec);
- try (final Connection<String> conn = messagingTestService.getConnectionFromSenderToReceiver(groupCommClientId)) {
+ try (final Connection<String> conn =
+ messagingTestService.getConnectionFromSenderToReceiver(groupCommClientId)) {
// build the message
final StringBuilder msb = new StringBuilder();
@@ -378,7 +390,8 @@ public class NetworkConnectionServiceTest {
final long end = System.currentTimeMillis();
final double runtime = ((double) end - start) / 1000;
final long numAppMessages = numMessages * batchSize / size;
- LOG.log(Level.INFO, "size: " + size + "; messages/s: " + numAppMessages / runtime + " bandwidth(bytes/s): " + ((double) numAppMessages * 2 * size) / runtime);// x2 for unicode chars
+ LOG.log(Level.INFO, "size: " + size + "; messages/s: " + numAppMessages / runtime +
+ " bandwidth(bytes/s): " + ((double) numAppMessages * 2 * size) / runtime); // x2 for unicode chars
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NetworkServiceTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NetworkServiceTest.java b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NetworkServiceTest.java
index 2b96c11..85b2860 100644
--- a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NetworkServiceTest.java
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NetworkServiceTest.java
@@ -47,7 +47,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
/**
- * Network service test
+ * Network service test.
*/
public class NetworkServiceTest {
private static final Logger LOG = Logger.getLogger(NetworkServiceTest.class.getName());
@@ -64,7 +64,7 @@ public class NetworkServiceTest {
public TestName name = new TestName();
/**
- * NetworkService messaging test
+ * NetworkService messaging test.
*/
@Test
public void testMessagingNetworkService() throws Exception {
@@ -85,7 +85,8 @@ public class NetworkServiceTest {
// network service
final String name2 = "task2";
final String name1 = "task1";
- final Configuration nameResolverConf = Tang.Factory.getTang().newConfigurationBuilder(NameResolverConfiguration.CONF
+ final Configuration nameResolverConf =
+ Tang.Factory.getTang().newConfigurationBuilder(NameResolverConfiguration.CONF
.set(NameResolverConfiguration.NAME_SERVER_HOSTNAME, this.localAddress)
.set(NameResolverConfiguration.NAME_SERVICE_PORT, nameServerPort)
.build())
@@ -129,7 +130,7 @@ public class NetworkServiceTest {
}
/**
- * NetworkService messaging rate benchmark
+ * NetworkService messaging rate benchmark.
*/
@Test
public void testMessagingNetworkServiceRate() throws Exception {
@@ -153,7 +154,8 @@ public class NetworkServiceTest {
// network service
final String name2 = "task2";
final String name1 = "task1";
- final Configuration nameResolverConf = Tang.Factory.getTang().newConfigurationBuilder(NameResolverConfiguration.CONF
+ final Configuration nameResolverConf =
+ Tang.Factory.getTang().newConfigurationBuilder(NameResolverConfiguration.CONF
.set(NameResolverConfiguration.NAME_SERVER_HOSTNAME, this.localAddress)
.set(NameResolverConfiguration.NAME_SERVICE_PORT, nameServerPort)
.build())
@@ -201,14 +203,15 @@ public class NetworkServiceTest {
}
long end = System.currentTimeMillis();
double runtime = ((double) end - start) / 1000;
- LOG.log(Level.FINEST, "size: " + size + "; messages/s: " + numMessages / runtime + " bandwidth(bytes/s): " + ((double) numMessages * 2 * size) / runtime);// x2 for unicode chars
+ LOG.log(Level.FINEST, "size: " + size + "; messages/s: " + numMessages / runtime +
+ " bandwidth(bytes/s): " + ((double) numMessages * 2 * size) / runtime); // x2 for unicode chars
}
}
}
}
/**
- * NetworkService messaging rate benchmark
+ * NetworkService messaging rate benchmark.
*/
@Test
public void testMessagingNetworkServiceRateDisjoint() throws Exception {
@@ -243,7 +246,8 @@ public class NetworkServiceTest {
// network service
final String name2 = "task2-" + tt;
final String name1 = "task1-" + tt;
- final Configuration nameResolverConf = Tang.Factory.getTang().newConfigurationBuilder(NameResolverConfiguration.CONF
+ final Configuration nameResolverConf =
+ Tang.Factory.getTang().newConfigurationBuilder(NameResolverConfiguration.CONF
.set(NameResolverConfiguration.NAME_SERVER_HOSTNAME, localAddress)
.set(NameResolverConfiguration.NAME_SERVICE_PORT, nameServerPort)
.build())
@@ -256,7 +260,8 @@ public class NetworkServiceTest {
try (final NameResolver nameResolver = injector.getInstance(NameResolver.class);
NetworkService<String> ns2 = new NetworkService<String>(factory, 0, nameResolver,
new StringCodec(), new MessagingTransportFactory(localAddressProvider),
- new MessageHandler<String>(name2, monitor, numMessages), new ExceptionHandler(), localAddressProvider);
+ new MessageHandler<String>(name2, monitor, numMessages),
+ new ExceptionHandler(), localAddressProvider);
NetworkService<String> ns1 = new NetworkService<String>(factory, 0, nameResolver,
new StringCodec(), new MessagingTransportFactory(localAddressProvider),
new MessageHandler<String>(name1, null, 0), new ExceptionHandler(), localAddressProvider)) {
@@ -300,13 +305,16 @@ public class NetworkServiceTest {
// start and time
long start = System.currentTimeMillis();
Object ignore = new Object();
- for (int i = 0; i < numThreads; i++) barrier.add(ignore);
+ for (int i = 0; i < numThreads; i++) {
+ barrier.add(ignore);
+ }
e.shutdown();
e.awaitTermination(100, TimeUnit.SECONDS);
long end = System.currentTimeMillis();
double runtime = ((double) end - start) / 1000;
- LOG.log(Level.FINEST, "size: " + size + "; messages/s: " + totalNumMessages / runtime + " bandwidth(bytes/s): " + ((double) totalNumMessages * 2 * size) / runtime);// x2 for unicode chars
+ LOG.log(Level.FINEST, "size: " + size + "; messages/s: " + totalNumMessages / runtime +
+ " bandwidth(bytes/s): " + ((double) totalNumMessages * 2 * size) / runtime); // x2 for unicode chars
}
}
@@ -322,7 +330,7 @@ public class NetworkServiceTest {
try (final NameServer server = injector.getInstance(NameServer.class)) {
int nameServerPort = server.getPort();
- final int[] messageSizes = {2000};// {1,16,32,64,512,64*1024,1024*1024};
+ final int[] messageSizes = {2000}; // {1,16,32,64,512,64*1024,1024*1024};
for (int size : messageSizes) {
final int numMessages = 300000 / (Math.max(1, size / 512));
@@ -334,7 +342,8 @@ public class NetworkServiceTest {
// network service
final String name2 = "task2";
final String name1 = "task1";
- final Configuration nameResolverConf = Tang.Factory.getTang().newConfigurationBuilder(NameResolverConfiguration.CONF
+ final Configuration nameResolverConf =
+ Tang.Factory.getTang().newConfigurationBuilder(NameResolverConfiguration.CONF
.set(NameResolverConfiguration.NAME_SERVER_HOSTNAME, this.localAddress)
.set(NameResolverConfiguration.NAME_SERVICE_PORT, nameServerPort)
.build())
@@ -347,7 +356,8 @@ public class NetworkServiceTest {
try (final NameResolver nameResolver = injector2.getInstance(NameResolver.class);
NetworkService<String> ns2 = new NetworkService<String>(factory, 0, nameResolver,
new StringCodec(), new MessagingTransportFactory(localAddressProvider),
- new MessageHandler<String>(name2, monitor, totalNumMessages), new ExceptionHandler(), localAddressProvider);
+ new MessageHandler<String>(name2, monitor, totalNumMessages),
+ new ExceptionHandler(), localAddressProvider);
NetworkService<String> ns1 = new NetworkService<String>(factory, 0, nameResolver,
new StringCodec(), new MessagingTransportFactory(localAddressProvider),
new MessageHandler<String>(name1, null, 0), new ExceptionHandler(), localAddressProvider)) {
@@ -395,7 +405,8 @@ public class NetworkServiceTest {
long end = System.currentTimeMillis();
double runtime = ((double) end - start) / 1000;
- LOG.log(Level.FINEST, "size: " + size + "; messages/s: " + totalNumMessages / runtime + " bandwidth(bytes/s): " + ((double) totalNumMessages * 2 * size) / runtime);// x2 for unicode chars
+ LOG.log(Level.FINEST, "size: " + size + "; messages/s: " + totalNumMessages / runtime +
+ " bandwidth(bytes/s): " + ((double) totalNumMessages * 2 * size) / runtime); // x2 for unicode chars
}
}
}
@@ -403,7 +414,7 @@ public class NetworkServiceTest {
}
/**
- * NetworkService messaging rate benchmark
+ * NetworkService messaging rate benchmark.
*/
@Test
public void testMessagingNetworkServiceBatchingRate() throws Exception {
@@ -428,7 +439,8 @@ public class NetworkServiceTest {
// network service
final String name2 = "task2";
final String name1 = "task1";
- final Configuration nameResolverConf = Tang.Factory.getTang().newConfigurationBuilder(NameResolverConfiguration.CONF
+ final Configuration nameResolverConf =
+ Tang.Factory.getTang().newConfigurationBuilder(NameResolverConfiguration.CONF
.set(NameResolverConfiguration.NAME_SERVER_HOSTNAME, this.localAddress)
.set(NameResolverConfiguration.NAME_SERVICE_PORT, nameServerPort)
.build())
@@ -481,14 +493,15 @@ public class NetworkServiceTest {
long end = System.currentTimeMillis();
double runtime = ((double) end - start) / 1000;
long numAppMessages = numMessages * batchSize / size;
- LOG.log(Level.FINEST, "size: " + size + "; messages/s: " + numAppMessages / runtime + " bandwidth(bytes/s): " + ((double) numAppMessages * 2 * size) / runtime);// x2 for unicode chars
+ LOG.log(Level.FINEST, "size: " + size + "; messages/s: " + numAppMessages / runtime +
+ " bandwidth(bytes/s): " + ((double) numAppMessages * 2 * size) / runtime); // x2 for unicode chars
}
}
}
}
/**
- * Test message handler
+ * Test message handler.
*/
class MessageHandler<T> implements EventHandler<Message<T>> {
@@ -523,7 +536,7 @@ public class NetworkServiceTest {
}
/**
- * Test exception handler
+ * Test exception handler.
*/
class ExceptionHandler implements EventHandler<Exception> {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-io/src/test/java/org/apache/reef/services/network/TestEvent.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/TestEvent.java b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/TestEvent.java
index 21a07ae..494f2e0 100644
--- a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/TestEvent.java
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/TestEvent.java
@@ -21,7 +21,7 @@ package org.apache.reef.services.network;
import java.io.Serializable;
/**
- * Event for testing
+ * Event for testing.
*/
public class TestEvent implements Serializable {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-io/src/test/java/org/apache/reef/services/network/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/package-info.java b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/package-info.java
new file mode 100644
index 0000000..2556f21
--- /dev/null
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/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.services.network;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/LoggingUtils.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/LoggingUtils.java b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/LoggingUtils.java
index e927ec0..d27f4cf 100644
--- a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/LoggingUtils.java
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/LoggingUtils.java
@@ -23,7 +23,7 @@ import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;
-public class LoggingUtils {
+public final class LoggingUtils {
public static void setLoggingLevel(Level level) {
Handler[] handlers = Logger.getLogger("").getHandlers();
ConsoleHandler ch = null;
@@ -40,4 +40,10 @@ public class LoggingUtils {
ch.setLevel(level);
Logger.getLogger("").setLevel(level);
}
+
+ /**
+ * Empty private constructor to prohibit instantiation of utility class.
+ */
+ private LoggingUtils() {
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/Monitor.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/Monitor.java b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/Monitor.java
index 8734a22..161ee6a 100644
--- a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/Monitor.java
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/Monitor.java
@@ -25,8 +25,9 @@ public class Monitor {
public void mwait() throws InterruptedException {
synchronized (this) {
- while (!finished.get())
+ while (!finished.get()) {
this.wait();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/NetworkMessagingTestService.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/NetworkMessagingTestService.java b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/NetworkMessagingTestService.java
index 0b188c5..ccc2e4b 100644
--- a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/NetworkMessagingTestService.java
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/NetworkMessagingTestService.java
@@ -86,8 +86,10 @@ public final class NetworkMessagingTestService implements AutoCloseable {
public <T> void registerTestConnectionFactory(final Identifier connFactoryId,
final int numMessages, final Monitor monitor,
final Codec<T> codec) throws NetworkException {
- receiverNetworkConnService.registerConnectionFactory(connFactoryId, codec, new MessageHandler<T>(monitor, numMessages), new TestListener<T>());
- senderNetworkConnService.registerConnectionFactory(connFactoryId, codec, new MessageHandler<T>(monitor, numMessages), new TestListener<T>());
+ receiverNetworkConnService.registerConnectionFactory(connFactoryId, codec,
+ new MessageHandler<T>(monitor, numMessages), new TestListener<T>());
+ senderNetworkConnService.registerConnectionFactory(connFactoryId, codec,
+ new MessageHandler<T>(monitor, numMessages), new TestListener<T>());
}
public <T> Connection<T> getConnectionFromSenderToReceiver(final Identifier connFactoryId) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/package-info.java b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/package-info.java
index 47f0766..5630dec 100644
--- a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/package-info.java
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/util/package-info.java
@@ -16,4 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+/**
+ * TODO: Document.
+ */
package org.apache.reef.services.network.util;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-io/src/test/java/org/apache/reef/services/storage/SpoolFileTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/services/storage/SpoolFileTest.java b/lang/java/reef-io/src/test/java/org/apache/reef/services/storage/SpoolFileTest.java
index ec126ef..9a76b27 100644
--- a/lang/java/reef-io/src/test/java/org/apache/reef/services/storage/SpoolFileTest.java
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/services/storage/SpoolFileTest.java
@@ -137,9 +137,10 @@ public class SpoolFileTest {
final Tang t = Tang.Factory.getTang();
final ConfigurationBuilder configurationBuilderOne = t.newConfigurationBuilder(RamConf.CONF.build());
- final AvroConfigurationSerializer serializer = new AvroConfigurationSerializer();
- final String serializedConfiguration = serializer.toString(configurationBuilderOne.build());
- final ConfigurationBuilder configurationBuilderTwo = t.newConfigurationBuilder(serializer.fromString(serializedConfiguration));
+ final AvroConfigurationSerializer avroSerializer = new AvroConfigurationSerializer();
+ final String serializedConfiguration = avroSerializer.toString(configurationBuilderOne.build());
+ final ConfigurationBuilder configurationBuilderTwo =
+ t.newConfigurationBuilder(avroSerializer.fromString(serializedConfiguration));
@SuppressWarnings("unchecked")
final Spool<Integer> f = (Spool<Integer>) t.newInjector(configurationBuilderTwo.build()).getInstance(
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-io/src/test/java/org/apache/reef/services/storage/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/services/storage/package-info.java b/lang/java/reef-io/src/test/java/org/apache/reef/services/storage/package-info.java
new file mode 100644
index 0000000..15f78cd
--- /dev/null
+++ b/lang/java/reef-io/src/test/java/org/apache/reef/services/storage/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.services.storage;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-runtime-hdinsight/src/test/java/org/apache/reef/runtime/hdinsight/TestHDInsightRESTJsonSerialization.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-hdinsight/src/test/java/org/apache/reef/runtime/hdinsight/TestHDInsightRESTJsonSerialization.java b/lang/java/reef-runtime-hdinsight/src/test/java/org/apache/reef/runtime/hdinsight/TestHDInsightRESTJsonSerialization.java
index 7af724d..8dc37c4 100644
--- a/lang/java/reef-runtime-hdinsight/src/test/java/org/apache/reef/runtime/hdinsight/TestHDInsightRESTJsonSerialization.java
+++ b/lang/java/reef-runtime-hdinsight/src/test/java/org/apache/reef/runtime/hdinsight/TestHDInsightRESTJsonSerialization.java
@@ -38,7 +38,7 @@ import java.util.Map;
public final class TestHDInsightRESTJsonSerialization {
@Test
- public void TestSerializeApplicationSubmission() throws IOException {
+ public void testSerializeApplicationSubmission() throws IOException {
// Define expected values
final Map<String, LocalResource> localResourceMap = new HashMap<>();
final String archiveKey = "archive";
@@ -84,7 +84,8 @@ public final class TestHDInsightRESTJsonSerialization {
Assert.assertEquals(rootJsonNode.get(Constants.APPLICATION_ID).asText(), submission.getApplicationId());
Assert.assertEquals(rootJsonNode.get(Constants.APPLICATION_NAME).asText(), submission.getApplicationName());
Assert.assertEquals(rootJsonNode.get(Constants.MAX_APP_ATTEMPTS).asInt(), submission.getMaxAppAttempts());
- Assert.assertEquals(rootJsonNode.get(Constants.KEEP_CONTAINERS_ACROSS_APPLICATION_ATTEMPTS).asBoolean(), submission.isKeepContainers());
+ Assert.assertEquals(rootJsonNode.get(Constants.KEEP_CONTAINERS_ACROSS_APPLICATION_ATTEMPTS).asBoolean(),
+ submission.isKeepContainers());
Assert.assertEquals(rootJsonNode.get(Constants.QUEUE).asText(), submission.getQueue());
Assert.assertEquals(rootJsonNode.get(Constants.PRIORITY).asInt(), submission.getPriority());
Assert.assertEquals(rootJsonNode.get(Constants.UNMANAGED_AM).asBoolean(), submission.isUnmanagedAM());
@@ -96,7 +97,8 @@ public final class TestHDInsightRESTJsonSerialization {
JsonNode amSpecNode = rootJsonNode.get(Constants.AM_CONTAINER_SPEC);
Assert.assertNotNull(amSpecNode);
- Assert.assertEquals(amSpecNode.get(Constants.COMMANDS).get(Constants.COMMAND).asText(), containerSpec.getCommands().getCommand());
+ Assert.assertEquals(amSpecNode.get(Constants.COMMANDS).get(Constants.COMMAND).asText(),
+ containerSpec.getCommands().getCommand());
JsonNode locResourcesNode = amSpecNode.get(Constants.LOCAL_RESOURCES).get(Constants.ENTRY);
Assert.assertTrue(locResourcesNode.isArray());
for (final JsonNode localResourceKVNode : locResourcesNode) {
@@ -162,7 +164,7 @@ public final class TestHDInsightRESTJsonSerialization {
}
@Test
- public void TestDeserializeGetApplicationId() throws IOException {
+ public void testDeserializeGetApplicationId() throws IOException {
final String appIdStr = "application_1404198295326_0003";
final int memory = 8192;
final int vCores = 32;
@@ -183,9 +185,10 @@ public final class TestHDInsightRESTJsonSerialization {
}
@Test
- public void TestDeserializeGetApplication() throws IOException {
+ public void testDeserializeGetApplication() throws IOException {
final long finishedTime = 1326824991300L;
- final String amContainerLogs = "http://host.domain.com:8042/node/containerlogs/container_1326821518301_0005_01_000001";
+ final String amContainerLogs =
+ "http://host.domain.com:8042/node/containerlogs/container_1326821518301_0005_01_000001";
final String trackingUI = "History";
final String state = "FINISHED";
final String user = "user1";
@@ -199,7 +202,8 @@ public final class TestHDInsightRESTJsonSerialization {
final long startedTime = 1326824544552L;
final long elapsedTime = 446748L;
final String diagnostics = "";
- final String trackingUrl = "http://host.domain.com:8088/proxy/application_1326821518301_0005/jobhistory/job/job_1326821518301_5_5";
+ final String trackingUrl =
+ "http://host.domain.com:8088/proxy/application_1326821518301_0005/jobhistory/job/job_1326821518301_5_5";
final String queue = "a1";
final long memorySeconds = 151730L;
final long vcoreSeconds = 103L;
@@ -252,7 +256,7 @@ public final class TestHDInsightRESTJsonSerialization {
}
@Test
- public void TestDeserializeListApplications() throws IOException {
+ public void testDeserializeListApplications() throws IOException {
final String listAppsBody = "{\n" +
" \"apps\":\n" +
" {\n" +
@@ -260,7 +264,8 @@ public final class TestHDInsightRESTJsonSerialization {
" [\n" +
" {\n" +
" \"finishedTime\" : 1326815598530,\n" +
- " \"amContainerLogs\" : \"http://host.domain.com:8042/node/containerlogs/container_1326815542473_0001_01_000001\",\n" +
+ " \"amContainerLogs\" : " +
+ "\"http://host.domain.com:8042/node/containerlogs/container_1326815542473_0001_01_000001\",\n" +
" \"trackingUI\" : \"History\",\n" +
" \"state\" : \"FINISHED\",\n" +
" \"user\" : \"user1\",\n" +
@@ -273,7 +278,8 @@ public final class TestHDInsightRESTJsonSerialization {
" \"startedTime\" : 1326815573334,\n" +
" \"elapsedTime\" : 25196,\n" +
" \"diagnostics\" : \"\",\n" +
- " \"trackingUrl\" : \"http://host.domain.com:8088/proxy/application_1326815542473_0001/jobhistory/job/job_1326815542473_1_1\",\n" +
+ " \"trackingUrl\" : " +
+ "\"http://host.domain.com:8088/proxy/application_1326815542473_0001/jobhistory/job/job_1326815542473_1_1\",\n" +
" \"queue\" : \"default\",\n" +
" \"allocatedMB\" : 0,\n" +
" \"allocatedVCores\" : 0,\n" +
@@ -283,7 +289,8 @@ public final class TestHDInsightRESTJsonSerialization {
" },\n" +
" {\n" +
" \"finishedTime\" : 1326815789546,\n" +
- " \"amContainerLogs\" : \"http://host.domain.com:8042/node/containerlogs/container_1326815542473_0002_01_000001\",\n" +
+ " \"amContainerLogs\" : " +
+ "\"http://host.domain.com:8042/node/containerlogs/container_1326815542473_0002_01_000001\",\n" +
" \"trackingUI\" : \"History\",\n" +
" \"state\" : \"FINISHED\",\n" +
" \"user\" : \"user1\",\n" +
@@ -296,7 +303,8 @@ public final class TestHDInsightRESTJsonSerialization {
" \"startedTime\" : 1326815641380,\n" +
" \"elapsedTime\" : 148166,\n" +
" \"diagnostics\" : \"\",\n" +
- " \"trackingUrl\" : \"http://host.domain.com:8088/proxy/application_1326815542473_0002/jobhistory/job/job_1326815542473_2_2\",\n" +
+ " \"trackingUrl\" : " +
+ "\"http://host.domain.com:8088/proxy/application_1326815542473_0002/jobhistory/job/job_1326815542473_2_2\",\n" +
" \"queue\" : \"default\",\n" +
" \"allocatedMB\" : 0,\n" +
" \"allocatedVCores\" : 0,\n" +
@@ -308,7 +316,8 @@ public final class TestHDInsightRESTJsonSerialization {
" }\n" +
"}";
- ListApplicationResponse listAppsResponse = new ObjectMapper().readValue(listAppsBody, ListApplicationResponse.class);
+ ListApplicationResponse listAppsResponse =
+ new ObjectMapper().readValue(listAppsBody, ListApplicationResponse.class);
Assert.assertTrue(listAppsResponse.getApps().containsKey(Constants.APP));
Assert.assertEquals(listAppsResponse.getApplicationStates().size(), 2);
for (ApplicationState state : listAppsResponse.getApplicationStates()) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-runtime-hdinsight/src/test/java/org/apache/reef/runtime/hdinsight/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-hdinsight/src/test/java/org/apache/reef/runtime/hdinsight/package-info.java b/lang/java/reef-runtime-hdinsight/src/test/java/org/apache/reef/runtime/hdinsight/package-info.java
new file mode 100644
index 0000000..de9c7ac
--- /dev/null
+++ b/lang/java/reef-runtime-hdinsight/src/test/java/org/apache/reef/runtime/hdinsight/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.runtime.hdinsight;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceRequestQueueTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceRequestQueueTest.java b/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceRequestQueueTest.java
index 5e1eaa8..a4271f1 100644
--- a/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceRequestQueueTest.java
+++ b/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceRequestQueueTest.java
@@ -44,7 +44,8 @@ public class ResourceRequestQueueTest {
q.add(getAlmostSatisfied());
Assert.assertTrue("A queue should not be empty after an insert.", q.hasOutStandingRequests());
q.satisfyOne();
- Assert.assertFalse("The queue should be empty after all requests have been satisfied", q.hasOutStandingRequests());
+ Assert.assertFalse("The queue should be empty after all requests have been satisfied",
+ q.hasOutStandingRequests());
}
final int nInsert = 10;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/package-info.java b/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/package-info.java
new file mode 100644
index 0000000..2778f33
--- /dev/null
+++ b/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/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.runtime.local.driver;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/Subplan.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/Subplan.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/Subplan.java
index 5ec7ec5..8a59299 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/Subplan.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/Subplan.java
@@ -150,7 +150,7 @@ public final class Subplan<T> extends InjectionPlan<T> {
ambig.add(alt);
}
}
- StringBuffer sb = new StringBuffer("Ambigous subplan " + getNode().getFullName());
+ StringBuffer sb = new StringBuffer("Ambiguous subplan " + getNode().getFullName());
for (InjectionPlan<?> alt : alts) {
sb.append("\n " + alt.toShallowString() + " ");
}
[3/4] incubator-reef git commit: [REEF-487] Enable checkstyle for
test source directories
Posted by we...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/ClassHierarchyDeserializationTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/ClassHierarchyDeserializationTest.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/ClassHierarchyDeserializationTest.java
index af9648a..de9522d 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/ClassHierarchyDeserializationTest.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/ClassHierarchyDeserializationTest.java
@@ -42,7 +42,7 @@ public class ClassHierarchyDeserializationTest {
private final ClassHierarchySerializer classHierarchySerializer = new AvroClassHierarchySerializer();
/**
- * generate task.bin from running .Net ClassHierarchyBuilder.exe
+ * generate task.bin from running .Net ClassHierarchyBuilder.exe.
*/
@Test
public void testDeserializationForTasks() {
@@ -52,11 +52,15 @@ public class ClassHierarchyDeserializationTest {
// TODO: Use AvroClassHierarchySerializer instead (REEF-400)
final ClassHierarchyProto.Node root = ClassHierarchyProto.Node.parseFrom(chin);
final ClassHierarchy ch = new ProtocolBufferClassHierarchy(root);
- Node n1 = ch.getNode("Org.Apache.REEF.Examples.Tasks.StreamingTasks.StreamTask1, Org.Apache.REEF.Examples.Tasks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null");
- Assert.assertTrue(n1.getFullName().equals("Org.Apache.REEF.Examples.Tasks.StreamingTasks.StreamTask1, Org.Apache.REEF.Examples.Tasks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"));
+ Node n1 = ch.getNode("Org.Apache.REEF.Examples.Tasks.StreamingTasks.StreamTask1, " +
+ "Org.Apache.REEF.Examples.Tasks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null");
+ Assert.assertTrue(n1.getFullName().equals("Org.Apache.REEF.Examples.Tasks.StreamingTasks.StreamTask1, " +
+ "Org.Apache.REEF.Examples.Tasks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"));
- Node n2 = ch.getNode("Org.Apache.REEF.Examples.Tasks.HelloTask.HelloTask, Org.Apache.REEF.Examples.Tasks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null");
- Assert.assertTrue(n2.getFullName().equals("Org.Apache.REEF.Examples.Tasks.HelloTask.HelloTask, Org.Apache.REEF.Examples.Tasks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"));
+ Node n2 = ch.getNode("Org.Apache.REEF.Examples.Tasks.HelloTask.HelloTask, " +
+ "Org.Apache.REEF.Examples.Tasks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null");
+ Assert.assertTrue(n2.getFullName().equals("Org.Apache.REEF.Examples.Tasks.HelloTask.HelloTask, " +
+ "Org.Apache.REEF.Examples.Tasks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"));
final ConfigurationBuilder taskConfigurationBuilder1 = Tang.Factory.getTang()
.newConfigurationBuilder(ch);
@@ -73,7 +77,7 @@ public class ClassHierarchyDeserializationTest {
}
/**
- * This is to test CLR protocol Buffer class hierarchy merge
+ * This is to test CLR protocol Buffer class hierarchy merge.
*/
@Test
public void testProtocolClassHierarchyMerge() {
@@ -108,7 +112,7 @@ public class ClassHierarchyDeserializationTest {
}
/**
- * generate event.bin from .Net Tang test case TestSerilization.TestGenericClass
+ * generate event.bin from .Net Tang test case TestSerilization.TestGenericClass.
*/
@Test
public void testDeserializationForEvent() {
@@ -127,14 +131,16 @@ public class ClassHierarchyDeserializationTest {
}
@Test
- //Test bindSetEntry(NamedParameterNode<Set<T>> iface, String impl) in ConfigurationBuilderImpl with deserialized class hierarchy
+ // Test bindSetEntry(NamedParameterNode<Set<T>> iface, String impl) in ConfigurationBuilderImpl
+ // with deserialized class hierarchy
public void testBindSetEntryWithSetOfT() throws IOException {
final ClassHierarchy ns1 = Tang.Factory.getTang().getDefaultClassHierarchy();
ns1.getNode(SetOfClasses.class.getName());
final ClassHierarchy ns2 = classHierarchySerializer.fromString(classHierarchySerializer.toString(ns1));
final ConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(ns2);
- final NamedParameterNode<Set<Number>> n2 = (NamedParameterNode<Set<Number>>) ns1.getNode(SetOfClasses.class.getName());
+ final NamedParameterNode<Set<Number>> n2 =
+ (NamedParameterNode<Set<Number>>) ns1.getNode(SetOfClasses.class.getName());
final Node fn = ns1.getNode(Float.class.getName());
cb.bindSetEntry(n2, fn);
@@ -142,7 +148,8 @@ public class ClassHierarchyDeserializationTest {
}
@Test
- //Test public <T> void bindParameter(NamedParameterNode<T> name, String value) in ConfigurationBuilderImpl with deserialized class hierarchy
+ // Test public <T> void bindParameter(NamedParameterNode<T> name, String value) in ConfigurationBuilderImpl
+ // with deserialized class hierarchy
public void testBindSetEntryWithSetOfString() throws IOException {
final ClassHierarchy ns1 = Tang.Factory.getTang().getDefaultClassHierarchy();
ns1.getNode(SetOfStrings.class.getName());
@@ -151,7 +158,8 @@ public class ClassHierarchyDeserializationTest {
cb.bindSetEntry(SetOfStrings.class.getName(), "four");
cb.bindSetEntry(SetOfStrings.class.getName(), "five");
- final NamedParameterNode<Set<String>> n2 = (NamedParameterNode<Set<String>>) ns1.getNode(SetOfStrings.class.getName());
+ final NamedParameterNode<Set<String>> n2 =
+ (NamedParameterNode<Set<String>>) ns1.getNode(SetOfStrings.class.getName());
cb.bindSetEntry(n2, "six");
final Configuration c = configurationSerializer.fromString(configurationSerializer.toString(cb.build()), ns2);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java
index 3157f0a..23e6b5b 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java
@@ -101,14 +101,16 @@ public class TestBindSingleton {
final Injector i1 = Tang.Factory.getTang().newInjector(cb.build());
final Injector i2 = Tang.Factory.getTang().newInjector(cb.build());
- assertTrue("Different injectors should return different singleton object instances", i1.getInstance(AA.class) != i2.getInstance(AA.class));
+ assertTrue("Different injectors should return different singleton object instances",
+ i1.getInstance(AA.class) != i2.getInstance(AA.class));
final Configuration c = cb.build();
final Injector i3 = Tang.Factory.getTang().newInjector(c);
final Injector i4 = Tang.Factory.getTang().newInjector(c);
- assertTrue("Different injectors should return different singleton object instances", i3.getInstance(AA.class) != i4.getInstance(AA.class));
+ assertTrue("Different injectors should return different singleton object instances",
+ i3.getInstance(AA.class) != i4.getInstance(AA.class));
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestClassLoaders.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestClassLoaders.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestClassLoaders.java
index a53d2b0..f352853 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestClassLoaders.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestClassLoaders.java
@@ -98,8 +98,10 @@ public class TestClassLoaders {
"../tang-test-jarA/target/tang-test-jarA-1.0-SNAPSHOT.jar").toURI()
.toURL());
- Assert.assertEquals(1, ((ClassNode<?>) (cbA1.getClassHierarchy().getNode("org.apache.reef.tang.examples.A"))).getInjectableConstructors().length);
- Assert.assertEquals(0, ((ClassNode<?>) (cbAother.getClassHierarchy().getNode("org.apache.reef.tang.examples.A"))).getInjectableConstructors().length);
+ Assert.assertEquals(1, ((ClassNode<?>) (cbA1.getClassHierarchy().getNode("org.apache.reef.tang.examples.A")))
+ .getInjectableConstructors().length);
+ Assert.assertEquals(0, ((ClassNode<?>) (cbAother.getClassHierarchy().getNode("org.apache.reef.tang.examples.A")))
+ .getInjectableConstructors().length);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestConfFileParser.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestConfFileParser.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestConfFileParser.java
index 79dc5db..cf648f7 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestConfFileParser.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestConfFileParser.java
@@ -95,7 +95,7 @@ public class TestConfFileParser {
}
@NamedParameter(doc = "remote id.")
- private final static class RemoteIdentifier implements Name<String> {
+ private static final class RemoteIdentifier implements Name<String> {
}
@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/TestImplicitConversions.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestImplicitConversions.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestImplicitConversions.java
index 1e10daa..b62570d 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestImplicitConversions.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestImplicitConversions.java
@@ -44,7 +44,8 @@ public class TestImplicitConversions {
ConfigurationFile.addConfiguration(b2, s);
Configuration c2 = b2.build();
- Assert.assertEquals("b://b", c2.getNamedParameter((NamedParameterNode<?>) c2.getClassHierarchy().getNode(ReflectionUtilities.getFullName(IdName.class))));
+ Assert.assertEquals("b://b", c2.getNamedParameter(
+ (NamedParameterNode<?>) c2.getClassHierarchy().getNode(ReflectionUtilities.getFullName(IdName.class))));
Injector i = Tang.Factory.getTang().newInjector(c2);
Assert.assertEquals("b://b", i.getNamedInstance(IdName.class).toString());
@@ -52,8 +53,6 @@ public class TestImplicitConversions {
}
- ;
-
@SuppressWarnings("unchecked")
@Test
public void testBindSubclassFromString() throws BindException, InjectionException {
@@ -68,7 +67,8 @@ public class TestImplicitConversions {
ConfigurationFile.addConfiguration(b2, s);
Configuration c2 = b2.build();
- Assert.assertEquals("b://b", c2.getNamedParameter((NamedParameterNode<?>) c2.getClassHierarchy().getNode(ReflectionUtilities.getFullName(BIdName.class))));
+ Assert.assertEquals("b://b", c2.getNamedParameter(
+ (NamedParameterNode<?>) c2.getClassHierarchy().getNode(ReflectionUtilities.getFullName(BIdName.class))));
Injector i = Tang.Factory.getTang().newInjector(c2);
Assert.assertEquals("b://b", i.getNamedInstance(BIdName.class).toString());
@@ -84,8 +84,6 @@ public class TestImplicitConversions {
b.bindNamedParameter(AIdName.class, "b://b");
}
- ;
-
@Test(expected = InjectionException.class)
public void testInjectUnboundParsable() throws BindException, InjectionException {
@SuppressWarnings("unchecked")
@@ -93,17 +91,15 @@ public class TestImplicitConversions {
Tang.Factory.getTang().newInjector(b.build()).getNamedInstance(IdName.class);
}
- static interface Identifier {
+ interface Identifier {
}
- ;
-
- static interface AIdentifier extends Identifier {
+ interface AIdentifier extends Identifier {
}
- static interface BIdentifier extends Identifier {
+ interface BIdentifier extends Identifier {
}
@@ -136,11 +132,13 @@ public class TestImplicitConversions {
}
static class IdentifierParser implements ExternalConstructor<Identifier> {
- final Identifier id;
+ private final Identifier id;
@Inject
public IdentifierParser(String id) {
- this.id = id.startsWith("a://") ? new AIdentifierImpl(id) : id.startsWith("b://") ? new BIdentifierImpl(id) : null;
+ this.id = id.startsWith("a://") ? new AIdentifierImpl(id) :
+ id.startsWith("b://") ? new BIdentifierImpl(id) :
+ null;
if (this.id == null) {
throw new IllegalArgumentException("Need string that starts with a:// or b://!");
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestInjectionFuture.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestInjectionFuture.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestInjectionFuture.java
index 1ce3610..eb2a50b 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestInjectionFuture.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestInjectionFuture.java
@@ -119,30 +119,30 @@ public class TestInjectionFuture {
@DefaultImplementation(Futurist.class)
public static class Futurist {
- private final InjectionFuture<FlyingCar> f_car;
+ private final InjectionFuture<FlyingCar> fCar;
@Inject
public Futurist(InjectionFuture<FlyingCar> car) {
- this.f_car = car;
+ this.fCar = car;
}
public FlyingCar getMyCar() {
- FlyingCar c = f_car.get();
+ FlyingCar c = fCar.get();
return c;
}
}
public static class PickyFuturist extends Futurist {
- private final InjectionFuture<FlyingCar> f_car;
+ private final InjectionFuture<FlyingCar> fCar;
@Inject
public PickyFuturist(@Parameter(MyFlyingCar.class) InjectionFuture<FlyingCar> myFlyingCar) {
super(myFlyingCar);
- f_car = myFlyingCar;
+ fCar = myFlyingCar;
}
public FlyingCar getMyCar() {
- FlyingCar c = f_car.get();
+ FlyingCar c = fCar.get();
return c;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestListInjection.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestListInjection.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestListInjection.java
index b4908bd..81fbdfb 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestListInjection.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestListInjection.java
@@ -40,7 +40,7 @@ import java.util.List;
public class TestListInjection {
/**
- * Test code for injecting default list with string elements
+ * Test code for injecting default list with string elements.
*
* @throws InjectionException
*/
@@ -55,7 +55,7 @@ public class TestListInjection {
}
/**
- * Test code for injecting default list with non-string values
+ * Test code for injecting default list with non-string values.
*
* @throws InjectionException
*/
@@ -70,7 +70,7 @@ public class TestListInjection {
}
/**
- * Test code for injecting default list with implementations
+ * Test code for injecting default list with implementations.
*
* @throws InjectionException
*/
@@ -90,7 +90,7 @@ public class TestListInjection {
}
/**
- * Test code for injecting list with String elements
+ * Test code for injecting list with String elements.
*
* @throws InjectionException
*/
@@ -111,7 +111,7 @@ public class TestListInjection {
}
/**
- * Test code for injecting list with parsable non-string values
+ * Test code for injecting list with parsable non-string values.
*
* @throws InjectionException
*/
@@ -133,7 +133,7 @@ public class TestListInjection {
}
/**
- * Test code for injecting list with implementations
+ * Test code for injecting list with implementations.
*
* @throws InjectionException
*/
@@ -201,7 +201,7 @@ public class TestListInjection {
}
/**
- * Test code for injecting list of strings with ConfigurationBuilder
+ * Test code for injecting list of strings with ConfigurationBuilder.
*
* @throws InjectionException
*/
@@ -225,7 +225,7 @@ public class TestListInjection {
}
/**
- * Test code for injecting list of implementations with ConfigurationBuilder
+ * Test code for injecting list of implementations with ConfigurationBuilder.
*
* @throws InjectionException
*/
@@ -254,7 +254,7 @@ public class TestListInjection {
}
/**
- * Test code for injectiong list with ConfigurationModule
+ * Test code for injectiong list with ConfigurationModule.
*
* @throws InjectionException
*/
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestNamedParameterRoundTrip.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestNamedParameterRoundTrip.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestNamedParameterRoundTrip.java
index 12732ed..e6f62e9 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestNamedParameterRoundTrip.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestNamedParameterRoundTrip.java
@@ -38,54 +38,49 @@ public class TestNamedParameterRoundTrip {
b.bindNamedParameter(Eps.class, String.valueOf(eps));
final Configuration conf = b.build();
- {
- final Injector i = Tang.Factory.getTang().newInjector(conf);
+ final Injector i1 = Tang.Factory.getTang().newInjector(conf);
- final int readD = i.getNamedInstance(Dimensionality.class).intValue();
- final double readEps = i.getNamedInstance(Eps.class).doubleValue();
+ final int readD1 = i1.getNamedInstance(Dimensionality.class).intValue();
+ final double readEps1 = i1.getNamedInstance(Eps.class).doubleValue();
- assertEquals(eps, readEps, 1e-12);
- assertEquals(d, readD);
- }
+ assertEquals(eps, readEps1, 1e-12);
+ assertEquals(d, readD1);
- {
- JavaConfigurationBuilder roundTrip = Tang.Factory.getTang().newConfigurationBuilder();
- ConfigurationFile.addConfiguration(roundTrip, ConfigurationFile.toConfigurationString(conf));
- final Injector i = Tang.Factory.getTang().newInjector(roundTrip.build());
+ JavaConfigurationBuilder roundTrip2 = Tang.Factory.getTang().newConfigurationBuilder();
+ ConfigurationFile.addConfiguration(roundTrip2, ConfigurationFile.toConfigurationString(conf));
+ final Injector i2 = Tang.Factory.getTang().newInjector(roundTrip2.build());
- final int readD = i.getNamedInstance(Dimensionality.class).intValue();
- final double readEps = i.getNamedInstance(Eps.class).doubleValue();
+ final int readD2 = i2.getNamedInstance(Dimensionality.class).intValue();
+ final double readEps2 = i2.getNamedInstance(Eps.class).doubleValue();
- assertEquals(eps, readEps, 1e-12);
- assertEquals(d, readD);
- }
+ assertEquals(eps, readEps2, 1e-12);
+ assertEquals(d, readD2);
- {
- final Injector parent = Tang.Factory.getTang().newInjector(Tang.Factory.getTang().newConfigurationBuilder().build());
- final Injector i = parent.forkInjector(conf);
- final int readD = i.getNamedInstance(Dimensionality.class).intValue();
- final double readEps = i.getNamedInstance(Eps.class).doubleValue();
+ final Injector parent3 =
+ Tang.Factory.getTang().newInjector(Tang.Factory.getTang().newConfigurationBuilder().build());
+ final Injector i3 = parent3.forkInjector(conf);
- assertEquals(eps, readEps, 1e-12);
- assertEquals(d, readD);
- }
+ final int readD3 = i3.getNamedInstance(Dimensionality.class).intValue();
+ final double readEps3 = i3.getNamedInstance(Eps.class).doubleValue();
- {
- final Injector parent = Tang.Factory.getTang().newInjector(Tang.Factory.getTang().newConfigurationBuilder().build());
- final JavaConfigurationBuilder roundTrip = Tang.Factory.getTang().newConfigurationBuilder();
- ConfigurationFile.addConfiguration(roundTrip,
- ConfigurationFile.toConfigurationString(conf));
- final Injector i = parent.forkInjector(roundTrip.build());
+ assertEquals(eps, readEps3, 1e-12);
+ assertEquals(d, readD3);
- final int readD = i.getNamedInstance(Dimensionality.class).intValue();
- final double readEps = i.getNamedInstance(Eps.class).doubleValue();
- assertEquals(eps, readEps, 1e-12);
- assertEquals(d, readD);
- }
+ final Injector parent4 =
+ Tang.Factory.getTang().newInjector(Tang.Factory.getTang().newConfigurationBuilder().build());
+ final JavaConfigurationBuilder roundTrip4 = Tang.Factory.getTang().newConfigurationBuilder();
+ ConfigurationFile.addConfiguration(roundTrip4,
+ ConfigurationFile.toConfigurationString(conf));
+ final Injector i4 = parent4.forkInjector(roundTrip4.build());
+ final int readD4 = i4.getNamedInstance(Dimensionality.class).intValue();
+ final double readEps4 = i4.getNamedInstance(Eps.class).doubleValue();
+
+ assertEquals(eps, readEps4, 1e-12);
+ assertEquals(d, readD4);
}
@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/TestTang.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTang.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTang.java
index 21e8efb..0503aff 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTang.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTang.java
@@ -127,14 +127,16 @@ public class TestTang {
@Test
public void testOneNamedFailArgs() throws InjectionException {
thrown.expect(InjectionException.class);
- thrown.expectMessage("Cannot inject org.apache.reef.tang.OneNamedSingletonArgs: org.apache.reef.tang.OneNamedSingletonArgs missing argument org.apache.reef.tang.OneNamedSingletonArgs$A");
+ thrown.expectMessage("Cannot inject org.apache.reef.tang.OneNamedSingletonArgs: " +
+ "org.apache.reef.tang.OneNamedSingletonArgs missing argument org.apache.reef.tang.OneNamedSingletonArgs$A");
tang.newInjector().getInstance(OneNamedSingletonArgs.class);
}
@Test
public void testOneNamedOKArgs() throws InjectionException {
thrown.expect(InjectionException.class);
- thrown.expectMessage("Cannot inject org.apache.reef.tang.OneNamedSingletonArgs: org.apache.reef.tang.OneNamedSingletonArgs missing argument org.apache.reef.tang.OneNamedSingletonArgs$A");
+ thrown.expectMessage("Cannot inject org.apache.reef.tang.OneNamedSingletonArgs: " +
+ "org.apache.reef.tang.OneNamedSingletonArgs missing argument org.apache.reef.tang.OneNamedSingletonArgs$A");
tang.newInjector().getInstance(OneNamedSingletonArgs.class);
}
@@ -142,7 +144,8 @@ public class TestTang {
@Test
public void testOneNamedSingletonFailArgs() throws InjectionException {
thrown.expect(InjectionException.class);
- thrown.expectMessage("Cannot inject org.apache.reef.tang.OneNamedSingletonArgs: org.apache.reef.tang.OneNamedSingletonArgs missing argument org.apache.reef.tang.OneNamedSingletonArgs$A");
+ thrown.expectMessage("Cannot inject org.apache.reef.tang.OneNamedSingletonArgs: " +
+ "org.apache.reef.tang.OneNamedSingletonArgs missing argument org.apache.reef.tang.OneNamedSingletonArgs$A");
tang.newInjector().getInstance(OneNamedSingletonArgs.class);
}
@@ -189,7 +192,8 @@ public class TestTang {
public void testOneNamedStringArgCantRebind() throws BindException,
InjectionException {
thrown.expect(BindException.class);
- thrown.expectMessage("Attempt to re-bind named parameter org.apache.reef.tang.OneNamedStringArg$A. Old value was [not default] new value is [volatile]");
+ thrown.expectMessage("Attempt to re-bind named parameter org.apache.reef.tang.OneNamedStringArg$A. " +
+ " Old value was [not default] new value is [volatile]");
JavaConfigurationBuilder cb = tang.newConfigurationBuilder();
OneNamedStringArg a = tang.newInjector(cb.build()).getInstance(
OneNamedStringArg.class);
@@ -265,7 +269,8 @@ public class TestTang {
public void testTwoNamedStringArgsReBindVolatileFail() throws BindException,
InjectionException {
thrown.expect(BindException.class);
- thrown.expectMessage("Attempt to re-bind named parameter org.apache.reef.tang.TwoNamedStringArgs$A. Old value was [not defaultA] new value is [not defaultA]");
+ thrown.expectMessage("Attempt to re-bind named parameter org.apache.reef.tang.TwoNamedStringArgs$A. " +
+ " Old value was [not defaultA] new value is [not defaultA]");
JavaConfigurationBuilder cb = tang.newConfigurationBuilder();
TwoNamedStringArgs a = tang.newInjector(cb.build()).getInstance(
TwoNamedStringArgs.class);
@@ -344,7 +349,8 @@ public class TestTang {
@Test
public void testWrongNamedImpl() throws BindException {
thrown.expect(BindException.class);
- thrown.expectMessage("Name<org.apache.reef.tang.NamedImpl$A> org.apache.reef.tang.NamedImpl$AImplName cannot take non-subclass org.apache.reef.tang.NamedImpl$Cimpl");
+ thrown.expectMessage("Name<org.apache.reef.tang.NamedImpl$A> " +
+ "org.apache.reef.tang.NamedImpl$AImplName cannot take non-subclass org.apache.reef.tang.NamedImpl$Cimpl");
JavaConfigurationBuilder cb = tang.newConfigurationBuilder();
cb.bindNamedParameter((Class) NamedImpl.AImplName.class, (Class) NamedImpl.Cimpl.class);
}
@@ -360,7 +366,8 @@ public class TestTang {
@Test
public void testMissedUnit() throws BindException, InjectionException {
thrown.expect(InjectionException.class);
- thrown.expectMessage("Cannot inject org.apache.reef.tang.MissOuterUnit$InA: No known implementations / injectable constructors for org.apache.reef.tang.MissOuterUnit$InA");
+ thrown.expectMessage("Cannot inject org.apache.reef.tang.MissOuterUnit$InA: " +
+ "No known implementations / injectable constructors for org.apache.reef.tang.MissOuterUnit$InA");
Injector inj = tang.newInjector();
MissOuterUnit.InA a = inj.getInstance(MissOuterUnit.InA.class);
}
@@ -368,7 +375,8 @@ public class TestTang {
@Test
public void testMissedUnitButWithInjectInnerClass() throws BindException, InjectionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("Cannot @Inject non-static member class unless the enclosing class an @Unit. Nested class is:org.apache.reef.tang.MissOuterUnit$InB");
+ thrown.expectMessage("Cannot @Inject non-static member class unless the enclosing class an @Unit. " +
+ " Nested class is:org.apache.reef.tang.MissOuterUnit$InB");
Injector inj = tang.newInjector();
MissOuterUnit.InB b = inj.getInstance(MissOuterUnit.InB.class);
}
@@ -405,8 +413,8 @@ public class TestTang {
@Test
public void testThreeConstructorsAmbiguous() throws BindException, InjectionException {
thrown.expect(InjectionException.class);
- thrown.expectMessage("Cannot inject org.apache.reef.tang.ThreeConstructors Ambigous subplan org.apache.reef.tang.ThreeConstructors");
-// thrown.expectMessage("Cannot inject org.apache.reef.tang.ThreeConstructors Multiple ways to inject org.apache.reef.tang.ThreeConstructors");
+ thrown.expectMessage("Cannot inject org.apache.reef.tang.ThreeConstructors " +
+ "Ambiguous subplan org.apache.reef.tang.ThreeConstructors");
final JavaConfigurationBuilder cb = tang.newConfigurationBuilder();
cb.bindNamedParameter(TCString.class, "s");
@@ -420,7 +428,8 @@ public class TestTang {
@Test
public void testTwoConstructorsAmbiguous() throws BindException, InjectionException {
thrown.expect(InjectionException.class);
- thrown.expectMessage("Cannot inject org.apache.reef.tang.TwoConstructors: Multiple infeasible plans: org.apache.reef.tang.TwoConstructors:");
+ thrown.expectMessage("Cannot inject org.apache.reef.tang.TwoConstructors: " +
+ "Multiple infeasible plans: org.apache.reef.tang.TwoConstructors:");
final JavaConfigurationBuilder cb = tang.newConfigurationBuilder();
cb.bindNamedParameter(TCString.class, "s");
cb.bindNamedParameter(TCInt.class, "1");
@@ -439,7 +448,8 @@ public class TestTang {
@Test
public void testCantGetInstanceOfNamedParameter() throws BindException, InjectionException {
thrown.expect(InjectionException.class);
- thrown.expectMessage("getInstance() called on Name org.apache.reef.tang.IfaceWithDefaultName Did you mean to call getNamedInstance() instead?");
+ thrown.expectMessage("getInstance() called on Name org.apache.reef.tang.IfaceWithDefaultName " +
+ "Did you mean to call getNamedInstance() instead?");
ConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder();
Injector i = Tang.Factory.getTang().newInjector(cb.build());
@SuppressWarnings("unused")
@@ -523,7 +533,8 @@ public class TestTang {
@Test
public void testGenericEventHandlerDefaultsBadTreeIndirection() throws BindException, InjectionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("class org.apache.reef.tang.XNameDAA defines a default class org.apache.reef.tang.XCC with a raw type that does not extend of its target's raw type class org.apache.reef.tang.XBB");
+ thrown.expectMessage("class org.apache.reef.tang.XNameDAA defines a default class org.apache.reef.tang.XCC " +
+ "with a raw type that does not extend of its target's raw type class org.apache.reef.tang.XBB");
JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder();
Tang.Factory.getTang().newInjector(cba.build()).getNamedInstance(XNameDAA.class);
@@ -538,7 +549,9 @@ public class TestTang {
@Test
public void testGenericUnrelatedGenericTypeParameters() throws BindException, InjectionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("class org.apache.reef.tang.WaterBottleName defines a default class org.apache.reef.tang.GasCan with a type that does not extend its target's type org.apache.reef.tang.Bottle<org.apache.reef.tang.Water");
+ thrown.expectMessage("class org.apache.reef.tang.WaterBottleName defines a default class " +
+ "org.apache.reef.tang.GasCan with a type that does not extend its target's type " +
+ "org.apache.reef.tang.Bottle<org.apache.reef.tang.Water");
JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder();
Tang.Factory.getTang().newInjector(cba.build()).getNamedInstance(WaterBottleName.class);
@@ -559,7 +572,8 @@ public class TestTang {
@Test
public void testGenericInterfaceUnboundTypeParametersIface() throws BindException, InjectionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("interface org.apache.reef.tang.MyEventHandlerIface declares its default implementation to be non-subclass class org.apache.reef.tang.MyEventHandler");
+ thrown.expectMessage("interface org.apache.reef.tang.MyEventHandlerIface declares its default implementation " +
+ "to be non-subclass class org.apache.reef.tang.MyEventHandler");
JavaConfigurationBuilder cba = Tang.Factory.getTang().newConfigurationBuilder();
Tang.Factory.getTang().newInjector(cba.build()).isInjectable(MyEventHandlerIface.class);
@@ -613,7 +627,8 @@ public class TestTang {
@Test
public void testUnitMixedCantInject() throws BindException, InjectionException {
thrown.expect(InjectionException.class);
- thrown.expectMessage("Cannot inject org.apache.reef.tang.OuterUnitWithStatic$InnerStaticClass: No known implementations / injectable constructors for org.apache.reef.tang.OuterUnitWithStatic$InnerStaticClass");
+ thrown.expectMessage("Cannot inject org.apache.reef.tang.OuterUnitWithStatic$InnerStaticClass: No known " +
+ "implementations / injectable constructors for org.apache.reef.tang.OuterUnitWithStatic$InnerStaticClass");
//testing that you should be able to have @Unit and also static inner classes not included
JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder();
@@ -678,7 +693,8 @@ public class TestTang {
/**
* This is to test multiple inheritance case.
* When CheckChildImplImpl is bound to an interface, the CheckChildImplImpl instance will be created in injection
- * When CheckChildImpl is then bound to the same interface, even class hierarchy already knows it has an subclass CheckChildImplImpl,
+ * When CheckChildImpl is then bound to the same interface, even class hierarchy already knows
+ * it has an subclass CheckChildImplImpl,
* Tang will only look at the constructors in CheckChildImpl
*
* @throws BindException
@@ -713,6 +729,7 @@ class Pass {
}
}
+@SuppressWarnings("checkstyle:hideutilityclassconstructor")
class IsFuture {
static boolean instantiated;
@@ -789,6 +806,7 @@ class Impl implements Interf {
}
}
+@SuppressWarnings("checkstyle:hideutilityclassconstructor")
class MustBeSingleton {
static boolean alreadyInstantiated;
@@ -946,10 +964,10 @@ class LegacyConstructor {
}
class NamedImpl {
- static interface A {
+ interface A {
}
- static interface C {
+ interface C {
}
@@ -1280,7 +1298,8 @@ class WantSomeFutureHandlers {
class WantSomeFutureHandlersUnit {
@Inject
- WantSomeFutureHandlersUnit(InjectionFuture<DefaultHandlerUnit.AHandler> a, InjectionFuture<DefaultHandlerUnit.BHandler> b) {
+ WantSomeFutureHandlersUnit(InjectionFuture<DefaultHandlerUnit.AHandler> a,
+ InjectionFuture<DefaultHandlerUnit.BHandler> b) {
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTweetExample.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTweetExample.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTweetExample.java
index 721b004..a378702 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTweetExample.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTweetExample.java
@@ -29,7 +29,7 @@ import org.junit.*;
import javax.inject.Inject;
public class TestTweetExample {
- Tang tang;
+ private Tang tang;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
@@ -50,16 +50,17 @@ public class TestTweetExample {
@Test
public void test() throws Exception {
- Tweeter tw = (Tweeter) tang.newInjector(TweetConfig.CONF.set(TweetConfig.PHONE_NUMBER, new Long(867 - 5309)).build()).getInstance(Tweeter.class);
+ Tweeter tw = (Tweeter) tang.newInjector(TweetConfig.CONF.set(TweetConfig.PHONE_NUMBER,
+ new Long(867 - 5309)).build()).getInstance(Tweeter.class);
tw.sendMessage();
}
- static interface TweetFactory {
- public String getTweet();
+ interface TweetFactory {
+ String getTweet();
}
- static interface SMS {
- public void sendSMS(String msg, long phoneNumber);
+ interface SMS {
+ void sendSMS(String msg, long phoneNumber);
}
static class MockTweetFactory implements TweetFactory {
@@ -88,9 +89,9 @@ public class TestTweetExample {
}
static class Tweeter {
- final TweetFactory tw;
- final SMS sms;
- final long phoneNumber;
+ private final TweetFactory tw;
+ private final SMS sms;
+ private final long phoneNumber;
@Inject
public Tweeter(TweetFactory tw, SMS sms,
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerAvroRoundtripTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerAvroRoundtripTest.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerAvroRoundtripTest.java
index 80727ec..db05bd5 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerAvroRoundtripTest.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerAvroRoundtripTest.java
@@ -34,7 +34,8 @@ public final class AvroConfigurationSerializerAvroRoundtripTest extends RoundTri
}
@Override
- public Configuration roundTrip(final Configuration configuration, final ClassHierarchy classHierarchy) throws Exception {
+ public Configuration roundTrip(final Configuration configuration, final ClassHierarchy classHierarchy)
+ throws Exception {
final AvroConfiguration aConf = new AvroConfigurationSerializer().toAvro(configuration);
return new AvroConfigurationSerializer().fromAvro(aConf, classHierarchy);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerStringRoundtripTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerStringRoundtripTest.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerStringRoundtripTest.java
index db55193..0ef97f9 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerStringRoundtripTest.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/AvroConfigurationSerializerStringRoundtripTest.java
@@ -33,7 +33,8 @@ public class AvroConfigurationSerializerStringRoundtripTest extends RoundTripTes
}
@Override
- public Configuration roundTrip(final Configuration configuration, final ClassHierarchy classHierarchy) throws Exception {
+ public Configuration roundTrip(final Configuration configuration, final ClassHierarchy classHierarchy)
+ throws Exception {
final AvroConfigurationSerializer serializer = new AvroConfigurationSerializer();
return serializer.fromString(serializer.toString(configuration), classHierarchy);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/ConfigurationFileTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/ConfigurationFileTest.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/ConfigurationFileTest.java
index d68cc91..a793a11 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/ConfigurationFileTest.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/ConfigurationFileTest.java
@@ -43,7 +43,8 @@ public final class ConfigurationFileTest extends RoundTripTest {
}
@Override
- public Configuration roundTrip(final Configuration configuration, final ClassHierarchy classHierarchy) throws Exception {
+ public Configuration roundTrip(final Configuration configuration, final ClassHierarchy classHierarchy)
+ throws Exception {
final File tempFile = java.io.File.createTempFile("TangTest", "txt");
final ConfigurationSerializer serializer = new AvroConfigurationSerializer();
serializer.toTextFile(configuration, tempFile);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestCommandLine.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestCommandLine.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestCommandLine.java
index 0c518c8..03bbe95 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestCommandLine.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestCommandLine.java
@@ -45,7 +45,7 @@ public final class TestCommandLine {
}
/**
- * Tests for parseToConfiguration() with a named parameter that is set
+ * Tests for parseToConfiguration() with a named parameter that is set.
*
* @throws ParseException
* @throws InjectionException
@@ -62,7 +62,7 @@ public final class TestCommandLine {
}
/**
- * Tests for parseToConfiguration() with a named parameter that is not set
+ * Tests for parseToConfiguration() with a named parameter that is not set.
*
* @throws ParseException
* @throws InjectionException
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestConfigurationModule.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestConfigurationModule.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestConfigurationModule.java
index d895a07..3e432fd 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestConfigurationModule.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestConfigurationModule.java
@@ -224,7 +224,8 @@ public class TestConfigurationModule {
@Test
public void foreignSetTest() throws Throwable {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("Unknown Impl/Param when setting RequiredImpl. Did you pass in a field from some other module?");
+ thrown.expectMessage("Unknown Impl/Param when setting RequiredImpl. " +
+ " Did you pass in a field from some other module?");
try {
// Pass in something from the wrong module, watch it fail.
MultiBindConfigurationModule.CONF.set(MyConfigurationModule.THE_FOO, FooImpl.class);
@@ -236,7 +237,8 @@ public class TestConfigurationModule {
@Test
public void foreignBindTest() throws Throwable {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("Unknown Impl/Param when binding RequiredImpl. Did you pass in a field from some other module?");
+ thrown.expectMessage("Unknown Impl/Param when binding RequiredImpl. " +
+ " Did you pass in a field from some other module?");
try {
// Pass in something from the wrong module, watch it fail.
new MyConfigurationModule().bindImplementation(Object.class, MultiBindConfigurationModule.THE_FOO);
@@ -346,8 +348,8 @@ public class TestConfigurationModule {
}
- static interface Foo {
- public int getFooness();
+ interface Foo {
+ int getFooness();
}
static class FooImpl implements Foo {
@@ -406,7 +408,7 @@ class SetName implements Name<Set<String>> {
}
class SetConfigurationModule extends ConfigurationModuleBuilder {
- public final static RequiredParameter<String> P = new RequiredParameter<>();
+ public static final RequiredParameter<String> P = new RequiredParameter<>();
public static final ConfigurationModule CONF = new SetConfigurationModule()
.bindSetEntry(SetName.class, SetConfigurationModule.P)
@@ -418,7 +420,7 @@ class SetClass implements Name<Set<Super>> {
}
class SetClassConfigurationModule extends ConfigurationModuleBuilder {
- public final static RequiredParameter<Super> P = new RequiredParameter<>();
+ public static final RequiredParameter<Super> P = new RequiredParameter<>();
public static final ConfigurationModule CONF = new SetClassConfigurationModule()
.bindSetEntry(SetClass.class, SetClassConfigurationModule.P)
.build();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/package-info.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/package-info.java
new file mode 100644
index 0000000..48c003e
--- /dev/null
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/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.tang.formats;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/TestClassHierarchy.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/TestClassHierarchy.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/TestClassHierarchy.java
index d5a5821..ed859a5 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/TestClassHierarchy.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/TestClassHierarchy.java
@@ -92,7 +92,7 @@ public class TestClassHierarchy {
public void testSimpleConstructors() throws NameResolutionException {
ClassNode<?> cls = (ClassNode<?>) ns.getNode(s(SimpleConstructors.class));
Assert.assertTrue(cls.getChildren().size() == 0);
- ConstructorDef<?> def[] = cls.getInjectableConstructors();
+ ConstructorDef<?>[] def = cls.getInjectableConstructors();
Assert.assertEquals(3, def.length);
}
@@ -111,14 +111,17 @@ public class TestClassHierarchy {
@Test
public void testRepeatConstructorArg() throws NameResolutionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("Repeated constructor parameter detected. Cannot inject constructor org.apache.reef.tang.implementation.RepeatConstructorArg(int,int)");
+ thrown.expectMessage("Repeated constructor parameter detected. " +
+ " Cannot inject constructor org.apache.reef.tang.implementation.RepeatConstructorArg(int,int)");
ns.getNode(s(RepeatConstructorArg.class));
}
@Test
public void testRepeatConstructorArgClasses() throws NameResolutionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("Repeated constructor parameter detected. Cannot inject constructor org.apache.reef.tang.implementation.RepeatConstructorArgClasses(org.apache.reef.tang.implementation.A,org.apache.reef.tang.implementation.A)");
+ thrown.expectMessage("Repeated constructor parameter detected. " +
+ " Cannot inject constructor org.apache.reef.tang.implementation.RepeatConstructorArgClasses" +
+ "(org.apache.reef.tang.implementation.A,org.apache.reef.tang.implementation.A)");
ns.getNode(s(RepeatConstructorArgClasses.class));
}
@@ -147,14 +150,17 @@ public class TestClassHierarchy {
@Test
public void testNamedParameterTypeMismatch() throws NameResolutionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("Named parameter type mismatch in org.apache.reef.tang.implementation.NamedParameterTypeMismatch. Constructor expects a java.lang.String but Foo is a java.lang.Integer");
+ thrown.expectMessage("Named parameter type mismatch in " +
+ "org.apache.reef.tang.implementation.NamedParameterTypeMismatch. " +
+ " Constructor expects a java.lang.String but Foo is a java.lang.Integer");
ns.getNode(s(NamedParameterTypeMismatch.class));
}
@Test
public void testUnannotatedName() throws NameResolutionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("Named parameter org.apache.reef.tang.implementation.UnannotatedName is missing its @NamedParameter annotation.");
+ thrown.expectMessage("Named parameter org.apache.reef.tang.implementation.UnannotatedName " +
+ "is missing its @NamedParameter annotation.");
ns.getNode(s(UnannotatedName.class));
}
@@ -162,49 +168,56 @@ public class TestClassHierarchy {
@Test
public void testAnnotatedNotName() throws NameResolutionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("Found illegal @NamedParameter org.apache.reef.tang.implementation.AnnotatedNotName does not implement Name<?>");
+ thrown.expectMessage("Found illegal @NamedParameter org.apache.reef.tang.implementation.AnnotatedNotName " +
+ "does not implement Name<?>");
ns.getNode(s(AnnotatedNotName.class));
}
@Test
public void testAnnotatedNameWrongInterface() throws NameResolutionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("Found illegal @NamedParameter org.apache.reef.tang.implementation.AnnotatedNameWrongInterface does not implement Name<?>");
+ thrown.expectMessage("Found illegal @NamedParameter " +
+ "org.apache.reef.tang.implementation.AnnotatedNameWrongInterface does not implement Name<?>");
ns.getNode(s(AnnotatedNameWrongInterface.class));
}
@Test
public void testAnnotatedNameNotGenericInterface() throws NameResolutionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("Found illegal @NamedParameter org.apache.reef.tang.implementation.AnnotatedNameNotGenericInterface does not implement Name<?>");
+ thrown.expectMessage("Found illegal @NamedParameter " +
+ "org.apache.reef.tang.implementation.AnnotatedNameNotGenericInterface does not implement Name<?>");
ns.getNode(s(AnnotatedNameNotGenericInterface.class));
}
@Test
public void testAnnotatedNameMultipleInterfaces() throws NameResolutionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("Named parameter org.apache.reef.tang.implementation.AnnotatedNameMultipleInterfaces implements multiple interfaces. It is only allowed to implement Name<T>");
+ thrown.expectMessage("Named parameter org.apache.reef.tang.implementation.AnnotatedNameMultipleInterfaces " +
+ "implements multiple interfaces. It is only allowed to implement Name<T>");
ns.getNode(s(AnnotatedNameMultipleInterfaces.class));
}
@Test
public void testUnAnnotatedNameMultipleInterfaces() throws NameResolutionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("Named parameter org.apache.reef.tang.implementation.UnAnnotatedNameMultipleInterfaces is missing its @NamedParameter annotation.");
+ thrown.expectMessage("Named parameter org.apache.reef.tang.implementation.UnAnnotatedNameMultipleInterfaces " +
+ "is missing its @NamedParameter annotation.");
ns.getNode(s(UnAnnotatedNameMultipleInterfaces.class));
}
@Test
public void testNameWithConstructor() throws NameResolutionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("Named parameter org.apache.reef.tang.implementation.NameWithConstructor has a constructor. Named parameters must not declare any constructors.");
+ thrown.expectMessage("Named parameter org.apache.reef.tang.implementation.NameWithConstructor has a constructor. " +
+ " Named parameters must not declare any constructors.");
ns.getNode(s(NameWithConstructor.class));
}
@Test
public void testNameWithZeroArgInject() throws NameResolutionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("Named parameter org.apache.reef.tang.implementation.NameWithZeroArgInject has an injectable constructor. Named parameters must not declare any constructors.");
+ thrown.expectMessage("Named parameter org.apache.reef.tang.implementation.NameWithZeroArgInject has " +
+ "an injectable constructor. Named parameters must not declare any constructors.");
ns.getNode(s(NameWithZeroArgInject.class));
}
@@ -315,7 +328,8 @@ public class TestClassHierarchy {
@Test
public void testBadUnitDecl() throws NameResolutionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("Detected explicit constructor in class enclosed in @Unit org.apache.reef.tang.implementation.OuterUnitBad$InA Such constructors are disallowed.");
+ thrown.expectMessage("Detected explicit constructor in class enclosed in @Unit " +
+ "org.apache.reef.tang.implementation.OuterUnitBad$InA Such constructors are disallowed.");
ns.getNode(s(OuterUnitBad.class));
}
@@ -323,7 +337,8 @@ public class TestClassHierarchy {
@Test
public void nameCantBindWrongSubclassAsDefault() throws NameResolutionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("class org.apache.reef.tang.implementation.BadName defines a default class java.lang.Integer with a raw type that does not extend of its target's raw type class java.lang.String");
+ thrown.expectMessage("class org.apache.reef.tang.implementation.BadName defines a default class " +
+ "java.lang.Integer with a raw type that does not extend of its target's raw type class java.lang.String");
ns.getNode(s(BadName.class));
}
@@ -331,21 +346,24 @@ public class TestClassHierarchy {
@Test
public void ifaceCantBindWrongImplAsDefault() throws NameResolutionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("interface org.apache.reef.tang.implementation.BadIfaceDefault declares its default implementation to be non-subclass class java.lang.String");
+ thrown.expectMessage("interface org.apache.reef.tang.implementation.BadIfaceDefault declares " +
+ "its default implementation to be non-subclass class java.lang.String");
ns.getNode(s(BadIfaceDefault.class));
}
@Test
public void testParseableDefaultClassNotOK() throws NameResolutionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("Named parameter org.apache.reef.tang.implementation.BadParsableDefaultClass defines default implementation for parsable type java.lang.String");
+ thrown.expectMessage("Named parameter org.apache.reef.tang.implementation.BadParsableDefaultClass " +
+ "defines default implementation for parsable type java.lang.String");
ns.getNode(s(BadParsableDefaultClass.class));
}
@Test
public void testDanglingUnit() throws NameResolutionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("Class org.apache.reef.tang.implementation.DanglingUnit has an @Unit annotation, but no non-static inner classes. Such @Unit annotations would have no effect, and are therefore disallowed.");
+ thrown.expectMessage("Class org.apache.reef.tang.implementation.DanglingUnit has an @Unit annotation, " +
+ "but no non-static inner classes. Such @Unit annotations would have no effect, and are therefore disallowed.");
ns.getNode(s(DanglingUnit.class));
@@ -354,7 +372,8 @@ public class TestClassHierarchy {
@Test
public void testNonInjectableParam() throws NameResolutionException {
thrown.expect(ClassHierarchyException.class);
- thrown.expectMessage("public org.apache.reef.tang.implementation.NonInjectableParam(int) is not injectable, but it has an @Parameter annotation.");
+ thrown.expectMessage("public org.apache.reef.tang.implementation.NonInjectableParam(int) is not injectable, " +
+ "but it has an @Parameter annotation.");
ns.getNode(s(NonInjectableParam.class));
}
@@ -392,17 +411,14 @@ class NamedParameterConstructors {
public NamedParameterConstructors(String x, @Parameter(X.class) String y) {
}
- ;
-
@NamedParameter()
class X implements Name<String> {
}
}
class RepeatConstructorArg {
- public
@Inject
- RepeatConstructorArg(int x, int y) {
+ public RepeatConstructorArg(int x, int y) {
}
}
@@ -410,9 +426,8 @@ class A {
}
class RepeatConstructorArgClasses {
- public
@Inject
- RepeatConstructorArgClasses(A x, A y) {
+ public RepeatConstructorArgClasses(A x, A y) {
}
}
@@ -444,10 +459,9 @@ class BB implements Name<A> {
}
class NamedRepeatConstructorArgClasses {
- public
@Inject
- NamedRepeatConstructorArgClasses(@Parameter(AA.class) A x,
- @Parameter(BB.class) A y) {
+ public NamedRepeatConstructorArgClasses(@Parameter(AA.class) A x,
+ @Parameter(BB.class) A y) {
}
}
@@ -497,7 +511,7 @@ class AnnotatedNameMultipleInterfaces implements Name<Object>, I1 {
}
@NamedParameter()
-class NameWithConstructor implements Name<Object> {
+final class NameWithConstructor implements Name<Object> {
private NameWithConstructor(int i) {
}
}
@@ -591,6 +605,7 @@ class Nested {
}
}
+@SuppressWarnings("checkstyle:hideutilityclassconstructor")
class AnonNested {
static X x = new X() {
@SuppressWarnings("unused")
@@ -601,7 +616,7 @@ class AnonNested {
int j;
};
- static interface X {
+ interface X {
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/avro/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/avro/package-info.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/avro/package-info.java
new file mode 100644
index 0000000..ef641be
--- /dev/null
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/avro/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.tang.implementation.avro;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestConfigurationBuilder.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestConfigurationBuilder.java
index 8e13f55..e644ebb 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestConfigurationBuilder.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestConfigurationBuilder.java
@@ -29,7 +29,7 @@ import org.junit.rules.ExpectedException;
import javax.inject.Inject;
/**
- * TestConfigurationBuilder
+ * TestConfigurationBuilder.
*/
public class TestConfigurationBuilder {
@Rule
@@ -38,7 +38,8 @@ public class TestConfigurationBuilder {
@Test
public void nullStringVaueTest() {
thrown.expect(IllegalStateException.class);
- thrown.expectMessage("The value null set to the named parameter is illegal: class org.apache.reef.tang.implementation.java.TestConfigurationBuilder$NamedParamterNoDefault$NamedString");
+ thrown.expectMessage("The value null set to the named parameter is illegal: class " +
+ "org.apache.reef.tang.implementation.java.TestConfigurationBuilder$NamedParamterNoDefault$NamedString");
Tang.Factory.getTang().newConfigurationBuilder()
.bindNamedParameter(NamedParamterNoDefault.NamedString.class, (String) null)
@@ -46,7 +47,7 @@ public class TestConfigurationBuilder {
}
static class NamedParamterNoDefault {
- final private String str;
+ private final String str;
@Inject
NamedParamterNoDefault(@Parameter(NamedString.class) String str) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestParameterParser.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestParameterParser.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestParameterParser.java
index 9101a0d..a521f47 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestParameterParser.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestParameterParser.java
@@ -89,7 +89,10 @@ public class TestParameterParser {
@Test
public void testBadMerge() throws BindException {
thrown.expect(IllegalArgumentException.class);
- thrown.expectMessage("Conflict detected when merging parameter parsers! To parse org.apache.reef.tang.implementation.java.TestParameterParser$Foo I have a: org.apache.reef.tang.implementation.java.TestParameterParser$FooParser the other instance has a: org.apache.reef.tang.implementation.java.TestParameterParser$BarParser");
+ thrown.expectMessage("Conflict detected when merging parameter parsers! To parse " +
+ "org.apache.reef.tang.implementation.java.TestParameterParser$Foo I have a: " +
+ "org.apache.reef.tang.implementation.java.TestParameterParser$FooParser the other instance has a: " +
+ "org.apache.reef.tang.implementation.java.TestParameterParser$BarParser");
ParameterParser old = new ParameterParser();
old.addParser(BarParser.class);
ParameterParser nw = new ParameterParser();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/package-info.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/package-info.java
new file mode 100644
index 0000000..669dd6d
--- /dev/null
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/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.tang.implementation.java;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/package-info.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/package-info.java
new file mode 100644
index 0000000..be446fd
--- /dev/null
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/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.tang.implementation;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a5cc9729/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/package-info.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/package-info.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/package-info.java
new file mode 100644
index 0000000..626ed1e
--- /dev/null
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/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.tang;
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/AnInterface.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/AnInterface.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/AnInterface.java
index 257a5c9..4e27cb2 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/AnInterface.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/AnInterface.java
@@ -21,7 +21,7 @@ package org.apache.reef.tang.test;
import org.apache.reef.tang.annotations.DefaultImplementation;
/**
- * An interface with a default implementation
+ * An interface with a default implementation.
*/
@DefaultImplementation(AnInterfaceImplementation.class)
interface AnInterface {
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/AnInterfaceImplementation.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/AnInterfaceImplementation.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/AnInterfaceImplementation.java
index 06565ea..18b6e86 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/AnInterfaceImplementation.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/AnInterfaceImplementation.java
@@ -35,12 +35,18 @@ final class AnInterfaceImplementation implements AnInterface {
@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;
+ }
AnInterfaceImplementation that = (AnInterfaceImplementation) o;
- if (aMagicNumber != that.aMagicNumber) return false;
+ if (aMagicNumber != that.aMagicNumber) {
+ 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/CyclicDependency.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependency.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependency.java
index 670eb1d..4e2789a 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependency.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependency.java
@@ -21,7 +21,7 @@ package org.apache.reef.tang.test;
import javax.inject.Inject;
/**
- * Part of a cyclic dependency
+ * Part of a cyclic dependency.
*/
final class CyclicDependency {
private final CyclicDependencyClassOne one;
@@ -36,13 +36,21 @@ final class CyclicDependency {
@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;
+ }
CyclicDependency that = (CyclicDependency) o;
- if (!one.equals(that.one)) return false;
- if (!two.equals(that.two)) return false;
+ if (!one.equals(that.one)) {
+ return false;
+ }
+ if (!two.equals(that.two)) {
+ 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/CyclicDependencyClassOne.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependencyClassOne.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependencyClassOne.java
index a0aa74e..1c56a6e 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependencyClassOne.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependencyClassOne.java
@@ -21,7 +21,7 @@ package org.apache.reef.tang.test;
import javax.inject.Inject;
/**
- * Part of a cyclic dependency
+ * Part of a cyclic dependency.
*/
final class CyclicDependencyClassOne {
private final CyclicDependencyClassTwo other;
@@ -33,12 +33,18 @@ final class CyclicDependencyClassOne {
@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;
+ }
CyclicDependencyClassOne that = (CyclicDependencyClassOne) o;
- if (!other.equals(that.other)) return false;
+ if (!other.equals(that.other)) {
+ 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/CyclicDependencyClassTwo.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependencyClassTwo.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependencyClassTwo.java
index 81d2eac..8823f97 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependencyClassTwo.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/CyclicDependencyClassTwo.java
@@ -35,8 +35,12 @@ final class CyclicDependencyClassTwo {
@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;
+ }
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/Handler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/Handler.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/Handler.java
index e7dff97..9a750fb 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/Handler.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/Handler.java
@@ -25,6 +25,6 @@ package org.apache.reef.tang.test;
*/
interface Handler<T> {
- public void process(final T value);
+ void process(final T 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/InjectableClass.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/InjectableClass.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/InjectableClass.java
index fefb91c..c0e9392 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/InjectableClass.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/InjectableClass.java
@@ -30,12 +30,18 @@ final class InjectableClass {
@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;
+ }
InjectableClass that = (InjectableClass) 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/ListOfBaseTypes.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListOfBaseTypes.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListOfBaseTypes.java
index fc94db0..b93ead5 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListOfBaseTypes.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListOfBaseTypes.java
@@ -44,14 +44,24 @@ final class ListOfBaseTypes {
@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;
+ }
ListOfBaseTypes that = (ListOfBaseTypes) 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/ListOfImplementations.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListOfImplementations.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListOfImplementations.java
index c8fd118..fb8e826 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListOfImplementations.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ListOfImplementations.java
@@ -34,12 +34,18 @@ public class ListOfImplementations {
@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;
+ }
ListOfImplementations that = (ListOfImplementations) 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/ObjectTreeTest.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ObjectTreeTest.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ObjectTreeTest.java
index 98ba7ca..8aebdaa 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ObjectTreeTest.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/ObjectTreeTest.java
@@ -53,8 +53,10 @@ public class ObjectTreeTest {
@Test
public void testTwoInstantiations() throws BindException, InjectionException {
- final RootInterface firstRoot = Tang.Factory.getTang().newInjector(getConfiguration()).getInstance(RootInterface.class);
- final RootInterface secondRoot = Tang.Factory.getTang().newInjector(getConfiguration()).getInstance(RootInterface.class);
+ final RootInterface firstRoot =
+ Tang.Factory.getTang().newInjector(getConfiguration()).getInstance(RootInterface.class);
+ final RootInterface secondRoot =
+ Tang.Factory.getTang().newInjector(getConfiguration()).getInstance(RootInterface.class);
Assert.assertNotSame("Two instantiations of the object tree should not be the same", firstRoot, secondRoot);
Assert.assertEquals("Two instantiations of the object tree should be equal", firstRoot, secondRoot);
}
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/RootImplementation.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootImplementation.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootImplementation.java
index 02ed14b..efd4c07 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootImplementation.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootImplementation.java
@@ -115,35 +115,59 @@ final class RootImplementation implements RootInterface {
@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;
+ }
RootImplementation that = (RootImplementation) o;
- if (Double.compare(that.aDouble, aDouble) != 0) return false;
- if (anInt != that.anInt) return false;
- if (anInterface != null ? !anInterface.equals(that.anInterface) : that.anInterface != null) return false;
- if (integerHandler != null ? !integerHandler.equals(that.integerHandler) : that.integerHandler != null)
+ if (Double.compare(that.aDouble, aDouble) != 0) {
+ return false;
+ }
+ if (anInt != that.anInt) {
+ return false;
+ }
+ if (anInterface != null ? !anInterface.equals(that.anInterface) : that.anInterface != null) {
+ return false;
+ }
+ if (integerHandler != null ? !integerHandler.equals(that.integerHandler) : that.integerHandler != null) {
+ return false;
+ }
+ if (optionalString != null ? !optionalString.equals(that.optionalString) : that.optionalString != null) {
return false;
- if (optionalString != null ? !optionalString.equals(that.optionalString) : that.optionalString != null)
+ }
+ if (requiredString != null ? !requiredString.equals(that.requiredString) : that.requiredString != null) {
return false;
- if (requiredString != null ? !requiredString.equals(that.requiredString) : that.requiredString != null)
+ }
+ if (stringHandler != null ? !stringHandler.equals(that.stringHandler) : that.stringHandler != null) {
return false;
- if (stringHandler != null ? !stringHandler.equals(that.stringHandler) : that.stringHandler != null) return false;
- if (unit != null ? !unit.equals(that.unit) : that.unit != null) return false;
- if (injectableClass != null ? !injectableClass.equals(that.injectableClass) : that.injectableClass != null)
+ }
+ if (unit != null ? !unit.equals(that.unit) : that.unit != null) {
return false;
- if (setOfImplementations != null ? !setOfImplementations.equals(that.setOfImplementations) : that.setOfImplementations != null)
+ }
+ if (injectableClass != null ? !injectableClass.equals(that.injectableClass) : that.injectableClass != null) {
return false;
- if (setOfBaseTypes != null ? !setOfBaseTypes.equals(that.setOfBaseTypes) : that.setOfBaseTypes != null)
+ }
+ if (setOfImplementations != null ? !setOfImplementations.equals(that.setOfImplementations)
+ : that.setOfImplementations != null) {
return false;
- if (listOfImplementations != null ? !listOfImplementations.equals(that.listOfImplementations) : that
- .listOfImplementations != null)
+ }
+ if (setOfBaseTypes != null ? !setOfBaseTypes.equals(that.setOfBaseTypes) : that.setOfBaseTypes != null) {
return false;
- if (listOfBaseTypes != null ? !listOfBaseTypes.equals(that.listOfBaseTypes) : that.listOfBaseTypes != null)
+ }
+ if (listOfImplementations != null ? !listOfImplementations.equals(that.listOfImplementations)
+ : that.listOfImplementations != null) {
return false;
- if (cyclicDependency != null ? !cyclicDependency.equals(that.cyclicDependency) : that.cyclicDependency != null)
+ }
+ if (listOfBaseTypes != null ? !listOfBaseTypes.equals(that.listOfBaseTypes) : that.listOfBaseTypes != null) {
return false;
+ }
+ if (cyclicDependency != null ? !cyclicDependency.equals(that.cyclicDependency) : that.cyclicDependency != null) {
+ 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/RootImplementationWithoutList.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootImplementationWithoutList.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootImplementationWithoutList.java
index e90221e..cc2a474 100644
--- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootImplementationWithoutList.java
+++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/test/RootImplementationWithoutList.java
@@ -23,7 +23,7 @@ import org.apache.reef.tang.annotations.Parameter;
import javax.inject.Inject;
/**
- * The root of the object graph without list
+ * The root of the object graph without list.
*
* @see org.apache.reef.tang.test.RootImplementation
*/
@@ -109,30 +109,52 @@ public class RootImplementationWithoutList implements RootInterface {
@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;
+ }
RootImplementationWithoutList that = (RootImplementationWithoutList) o;
- if (Double.compare(that.aDouble, aDouble) != 0) return false;
- if (anInt != that.anInt) return false;
- if (anInterface != null ? !anInterface.equals(that.anInterface) : that.anInterface != null) return false;
- if (integerHandler != null ? !integerHandler.equals(that.integerHandler) : that.integerHandler != null)
+ if (Double.compare(that.aDouble, aDouble) != 0) {
+ return false;
+ }
+ if (anInt != that.anInt) {
+ return false;
+ }
+ if (anInterface != null ? !anInterface.equals(that.anInterface) : that.anInterface != null) {
+ return false;
+ }
+ if (integerHandler != null ? !integerHandler.equals(that.integerHandler) : that.integerHandler != null) {
+ return false;
+ }
+ if (optionalString != null ? !optionalString.equals(that.optionalString) : that.optionalString != null) {
return false;
- if (optionalString != null ? !optionalString.equals(that.optionalString) : that.optionalString != null)
+ }
+ if (requiredString != null ? !requiredString.equals(that.requiredString) : that.requiredString != null) {
return false;
- if (requiredString != null ? !requiredString.equals(that.requiredString) : that.requiredString != null)
+ }
+ if (stringHandler != null ? !stringHandler.equals(that.stringHandler) : that.stringHandler != null) {
+ return false;
+ }
+ if (unit != null ? !unit.equals(that.unit) : that.unit != null) {
return false;
- if (stringHandler != null ? !stringHandler.equals(that.stringHandler) : that.stringHandler != null) return false;
- if (unit != null ? !unit.equals(that.unit) : that.unit != null) return false;
- if (injectableClass != null ? !injectableClass.equals(that.injectableClass) : that.injectableClass != null)
+ }
+ if (injectableClass != null ? !injectableClass.equals(that.injectableClass) : that.injectableClass != null) {
return false;
- if (setOfImplementations != null ? !setOfImplementations.equals(that.setOfImplementations) : that.setOfImplementations != null)
+ }
+ if (setOfImplementations != null ? !setOfImplementations.equals(that.setOfImplementations)
+ : that.setOfImplementations != null) {
return false;
- if (setOfBaseTypes != null ? !setOfBaseTypes.equals(that.setOfBaseTypes) : that.setOfBaseTypes != null)
+ }
+ if (setOfBaseTypes != null ? !setOfBaseTypes.equals(that.setOfBaseTypes) : that.setOfBaseTypes != null) {
return false;
- if (cyclicDependency != null ? !cyclicDependency.equals(that.cyclicDependency) : that.cyclicDependency != null)
+ }
+ if (cyclicDependency != null ? !cyclicDependency.equals(that.cyclicDependency) : that.cyclicDependency != null) {
return false;
+ }
return true;
}
[2/4] incubator-reef git commit: [REEF-487] Enable checkstyle for
test source directories
Posted by we...@apache.org.
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>());