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>
