From 2e2707862abfd9c49786b8883e70eca5c07eabd3 Mon Sep 17 00:00:00 2001 From: Jeroen Meulemeester Date: Tue, 29 Dec 2015 21:05:53 +0100 Subject: [PATCH] Fixed checkstyle code quality issues --- .../java/com/iluwatar/nullobject/TreeTest.java | 14 +++++++------- .../com/iluwatar/poison/pill/ConsumerTest.java | 8 ++++---- .../com/iluwatar/privateclassdata/StewTest.java | 4 ++-- .../iluwatar/producer/consumer/ConsumerTest.java | 2 +- .../com/iluwatar/proxy/WizardTowerProxyTest.java | 8 ++++---- .../java/com/iluwatar/proxy/WizardTowerTest.java | 8 ++++---- .../servicelocator/ServiceLocatorTest.java | 8 ++++++-- .../src/test/java/com/iluwatar/state/AppTest.java | 4 +--- 8 files changed, 29 insertions(+), 27 deletions(-) diff --git a/null-object/src/test/java/com/iluwatar/nullobject/TreeTest.java b/null-object/src/test/java/com/iluwatar/nullobject/TreeTest.java index 3599dd4c4..5d7968584 100644 --- a/null-object/src/test/java/com/iluwatar/nullobject/TreeTest.java +++ b/null-object/src/test/java/com/iluwatar/nullobject/TreeTest.java @@ -32,13 +32,13 @@ public class TreeTest extends StdOutTest { private static final Node TREE_ROOT; static { - final NodeImpl level1_b = new NodeImpl("level1_b", NullNode.getInstance(), NullNode.getInstance()); - final NodeImpl level2_b = new NodeImpl("level2_b", NullNode.getInstance(), NullNode.getInstance()); - final NodeImpl level3_a = new NodeImpl("level3_a", NullNode.getInstance(), NullNode.getInstance()); - final NodeImpl level3_b = new NodeImpl("level3_b", NullNode.getInstance(), NullNode.getInstance()); - final NodeImpl level2_a = new NodeImpl("level2_a", level3_a, level3_b); - final NodeImpl level1_a = new NodeImpl("level1_a", level2_a, level2_b); - TREE_ROOT = new NodeImpl("root", level1_a, level1_b); + final NodeImpl level1B = new NodeImpl("level1_b", NullNode.getInstance(), NullNode.getInstance()); + final NodeImpl level2B = new NodeImpl("level2_b", NullNode.getInstance(), NullNode.getInstance()); + final NodeImpl level3A = new NodeImpl("level3_a", NullNode.getInstance(), NullNode.getInstance()); + final NodeImpl level3B = new NodeImpl("level3_b", NullNode.getInstance(), NullNode.getInstance()); + final NodeImpl level2A = new NodeImpl("level2_a", level3A, level3B); + final NodeImpl level1A = new NodeImpl("level1_a", level2A, level2B); + TREE_ROOT = new NodeImpl("root", level1A, level1B); } /** diff --git a/poison-pill/src/test/java/com/iluwatar/poison/pill/ConsumerTest.java b/poison-pill/src/test/java/com/iluwatar/poison/pill/ConsumerTest.java index 1c92f10d7..c152fbbd2 100644 --- a/poison-pill/src/test/java/com/iluwatar/poison/pill/ConsumerTest.java +++ b/poison-pill/src/test/java/com/iluwatar/poison/pill/ConsumerTest.java @@ -17,10 +17,10 @@ public class ConsumerTest extends StdOutTest { @Test public void testConsume() throws Exception { final Message[] messages = new Message[]{ - createMessage("you", "Hello!"), - createMessage("me", "Hi!"), - Message.POISON_PILL, - createMessage("late_for_the_party", "Hello? Anyone here?"), + createMessage("you", "Hello!"), + createMessage("me", "Hi!"), + Message.POISON_PILL, + createMessage("late_for_the_party", "Hello? Anyone here?"), }; final MessageQueue queue = new SimpleMessageQueue(messages.length); diff --git a/private-class-data/src/test/java/com/iluwatar/privateclassdata/StewTest.java b/private-class-data/src/test/java/com/iluwatar/privateclassdata/StewTest.java index d6b67a35e..8e0452fab 100644 --- a/private-class-data/src/test/java/com/iluwatar/privateclassdata/StewTest.java +++ b/private-class-data/src/test/java/com/iluwatar/privateclassdata/StewTest.java @@ -18,8 +18,8 @@ public class StewTest extends StdOutTest { @Test public void testMix() { final ImmutableStew stew = new ImmutableStew(1, 2, 3, 4); - final String expectedMessage = "Mixing the immutable stew we find: 1 potatoes, " + - "2 carrots, 3 meat and 4 peppers"; + final String expectedMessage = "Mixing the immutable stew we find: 1 potatoes, " + + "2 carrots, 3 meat and 4 peppers"; final InOrder inOrder = inOrder(getStdOutMock()); for (int i = 0; i < 20; i++) { diff --git a/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ConsumerTest.java b/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ConsumerTest.java index e7b60a063..4ff203d42 100644 --- a/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ConsumerTest.java +++ b/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ConsumerTest.java @@ -30,7 +30,7 @@ public class ConsumerTest extends StdOutTest { for (int id = 0; id < ITEM_COUNT; id++) { consumer.consume(); inOrder.verify(getStdOutMock()) - .println("Consumer [consumer] consume item [" + id + "] produced by [producer]"); + .println("Consumer [consumer] consume item [" + id + "] produced by [producer]"); } inOrder.verifyNoMoreInteractions(); diff --git a/proxy/src/test/java/com/iluwatar/proxy/WizardTowerProxyTest.java b/proxy/src/test/java/com/iluwatar/proxy/WizardTowerProxyTest.java index f4deb192e..dcde88f8c 100644 --- a/proxy/src/test/java/com/iluwatar/proxy/WizardTowerProxyTest.java +++ b/proxy/src/test/java/com/iluwatar/proxy/WizardTowerProxyTest.java @@ -15,10 +15,10 @@ public class WizardTowerProxyTest extends StdOutTest { @Test public void testEnter() throws Exception { final Wizard[] wizards = new Wizard[]{ - new Wizard("Gandalf"), - new Wizard("Dumbledore"), - new Wizard("Oz"), - new Wizard("Merlin") + new Wizard("Gandalf"), + new Wizard("Dumbledore"), + new Wizard("Oz"), + new Wizard("Merlin") }; final WizardTowerProxy tower = new WizardTowerProxy(); diff --git a/proxy/src/test/java/com/iluwatar/proxy/WizardTowerTest.java b/proxy/src/test/java/com/iluwatar/proxy/WizardTowerTest.java index 5ddb7ddac..007b92a33 100644 --- a/proxy/src/test/java/com/iluwatar/proxy/WizardTowerTest.java +++ b/proxy/src/test/java/com/iluwatar/proxy/WizardTowerTest.java @@ -15,10 +15,10 @@ public class WizardTowerTest extends StdOutTest { @Test public void testEnter() throws Exception { final Wizard[] wizards = new Wizard[]{ - new Wizard("Gandalf"), - new Wizard("Dumbledore"), - new Wizard("Oz"), - new Wizard("Merlin") + new Wizard("Gandalf"), + new Wizard("Dumbledore"), + new Wizard("Oz"), + new Wizard("Merlin") }; final WizardTower tower = new WizardTower(); diff --git a/service-locator/src/test/java/com/iluwatar/servicelocator/ServiceLocatorTest.java b/service-locator/src/test/java/com/iluwatar/servicelocator/ServiceLocatorTest.java index e50dbe029..ce54e054f 100644 --- a/service-locator/src/test/java/com/iluwatar/servicelocator/ServiceLocatorTest.java +++ b/service-locator/src/test/java/com/iluwatar/servicelocator/ServiceLocatorTest.java @@ -2,7 +2,11 @@ package com.iluwatar.servicelocator; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; /** * Date: 12/29/15 - 19:07 PM @@ -26,7 +30,7 @@ public class ServiceLocatorTest { @Test public void testServiceCache() { final String[] serviceNames = new String[]{ - "jndi/serviceA", "jndi/serviceB" + "jndi/serviceA", "jndi/serviceB" }; for (final String serviceName : serviceNames) { diff --git a/state/src/test/java/com/iluwatar/state/AppTest.java b/state/src/test/java/com/iluwatar/state/AppTest.java index 37422e4e3..d03592739 100644 --- a/state/src/test/java/com/iluwatar/state/AppTest.java +++ b/state/src/test/java/com/iluwatar/state/AppTest.java @@ -1,17 +1,15 @@ package com.iluwatar.state; -import org.junit.Ignore; import org.junit.Test; /** - * + * * Application test * */ public class AppTest { @Test - @Ignore public void test() { String[] args = {}; App.main(args);