From 08c4202852b1b1a157fa77620f0d66d343ffe9c5 Mon Sep 17 00:00:00 2001 From: SrdjanPaunovic Date: Wed, 3 May 2017 22:08:04 +0200 Subject: [PATCH] #541 fix checkstyle errors --- execute-around/pom.xml | 4 +++- extension-objects/src/main/java/units/CommanderUnit.java | 1 - extension-objects/src/main/java/units/SergeantUnit.java | 1 - extension-objects/src/main/java/units/SoldierUnit.java | 1 - extension-objects/src/test/java/AppTest.java | 2 -- .../src/test/java/concreteextensions/CommanderTest.java | 2 -- .../src/test/java/concreteextensions/SergeantTest.java | 2 -- .../src/test/java/concreteextensions/SoldierTest.java | 2 -- .../src/test/java/units/CommanderUnitTest.java | 5 +++-- .../src/test/java/units/SergeantUnitTest.java | 5 +++-- .../src/test/java/units/SoldierUnitTest.java | 5 +++-- extension-objects/src/test/java/units/UnitTest.java | 9 ++++----- 12 files changed, 16 insertions(+), 23 deletions(-) diff --git a/execute-around/pom.xml b/execute-around/pom.xml index 765b52846..59f9b3dea 100644 --- a/execute-around/pom.xml +++ b/execute-around/pom.xml @@ -23,7 +23,9 @@ THE SOFTWARE. --> - 4.0.0 diff --git a/extension-objects/src/main/java/units/CommanderUnit.java b/extension-objects/src/main/java/units/CommanderUnit.java index 836d29487..a5ed60a76 100644 --- a/extension-objects/src/main/java/units/CommanderUnit.java +++ b/extension-objects/src/main/java/units/CommanderUnit.java @@ -1,6 +1,5 @@ package units; -import abstractextensions.CommanderExtension; import abstractextensions.UnitExtension; import concreteextensions.Commander; diff --git a/extension-objects/src/main/java/units/SergeantUnit.java b/extension-objects/src/main/java/units/SergeantUnit.java index d1a477ee8..876a50db5 100644 --- a/extension-objects/src/main/java/units/SergeantUnit.java +++ b/extension-objects/src/main/java/units/SergeantUnit.java @@ -1,6 +1,5 @@ package units; -import abstractextensions.SergeantExtension; import abstractextensions.UnitExtension; import concreteextensions.Sergeant; diff --git a/extension-objects/src/main/java/units/SoldierUnit.java b/extension-objects/src/main/java/units/SoldierUnit.java index 749e3aa8d..9e566796b 100644 --- a/extension-objects/src/main/java/units/SoldierUnit.java +++ b/extension-objects/src/main/java/units/SoldierUnit.java @@ -1,6 +1,5 @@ package units; -import abstractextensions.SoldierExtension; import abstractextensions.UnitExtension; import concreteextensions.Soldier; diff --git a/extension-objects/src/test/java/AppTest.java b/extension-objects/src/test/java/AppTest.java index 88ba70da9..287ffc131 100644 --- a/extension-objects/src/test/java/AppTest.java +++ b/extension-objects/src/test/java/AppTest.java @@ -1,7 +1,5 @@ import org.junit.Test; -import static org.junit.Assert.*; - /** * Created by Srdjan on 03-May-17. */ diff --git a/extension-objects/src/test/java/concreteextensions/CommanderTest.java b/extension-objects/src/test/java/concreteextensions/CommanderTest.java index a5ac7b506..82079c69a 100644 --- a/extension-objects/src/test/java/concreteextensions/CommanderTest.java +++ b/extension-objects/src/test/java/concreteextensions/CommanderTest.java @@ -3,8 +3,6 @@ package concreteextensions; import org.junit.Test; import units.CommanderUnit; -import static org.junit.Assert.*; - /** * Created by Srdjan on 03-May-17. */ diff --git a/extension-objects/src/test/java/concreteextensions/SergeantTest.java b/extension-objects/src/test/java/concreteextensions/SergeantTest.java index 163d5c1fc..7b29057f6 100644 --- a/extension-objects/src/test/java/concreteextensions/SergeantTest.java +++ b/extension-objects/src/test/java/concreteextensions/SergeantTest.java @@ -3,8 +3,6 @@ package concreteextensions; import org.junit.Test; import units.SergeantUnit; -import static org.junit.Assert.*; - /** * Created by Srdjan on 03-May-17. */ diff --git a/extension-objects/src/test/java/concreteextensions/SoldierTest.java b/extension-objects/src/test/java/concreteextensions/SoldierTest.java index dde222d61..02a3144c2 100644 --- a/extension-objects/src/test/java/concreteextensions/SoldierTest.java +++ b/extension-objects/src/test/java/concreteextensions/SoldierTest.java @@ -3,8 +3,6 @@ package concreteextensions; import org.junit.Test; import units.SoldierUnit; -import static org.junit.Assert.*; - /** * Created by Srdjan on 03-May-17. */ diff --git a/extension-objects/src/test/java/units/CommanderUnitTest.java b/extension-objects/src/test/java/units/CommanderUnitTest.java index 1ec498d91..75bf5f4fc 100644 --- a/extension-objects/src/test/java/units/CommanderUnitTest.java +++ b/extension-objects/src/test/java/units/CommanderUnitTest.java @@ -3,7 +3,8 @@ package units; import abstractextensions.CommanderExtension; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; /** * Created by Srdjan on 03-May-17. @@ -16,7 +17,7 @@ public class CommanderUnitTest { assertNull(unit.getUnitExtension("SoldierExtension")); assertNull(unit.getUnitExtension("SergeantExtension")); - assertNotNull((CommanderExtension)unit.getUnitExtension("CommanderExtension")); + assertNotNull((CommanderExtension) unit.getUnitExtension("CommanderExtension")); } } \ No newline at end of file diff --git a/extension-objects/src/test/java/units/SergeantUnitTest.java b/extension-objects/src/test/java/units/SergeantUnitTest.java index 8fe62298c..af2eca7cc 100644 --- a/extension-objects/src/test/java/units/SergeantUnitTest.java +++ b/extension-objects/src/test/java/units/SergeantUnitTest.java @@ -3,7 +3,8 @@ package units; import abstractextensions.SergeantExtension; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; /** * Created by Srdjan on 03-May-17. @@ -15,7 +16,7 @@ public class SergeantUnitTest { final Unit unit = new SergeantUnit("SergeantUnitName"); assertNull(unit.getUnitExtension("SoldierExtension")); - assertNotNull((SergeantExtension)unit.getUnitExtension("SergeantExtension")); + assertNotNull((SergeantExtension) unit.getUnitExtension("SergeantExtension")); assertNull(unit.getUnitExtension("CommanderExtension")); } diff --git a/extension-objects/src/test/java/units/SoldierUnitTest.java b/extension-objects/src/test/java/units/SoldierUnitTest.java index 8d1fe5667..19b0c2923 100644 --- a/extension-objects/src/test/java/units/SoldierUnitTest.java +++ b/extension-objects/src/test/java/units/SoldierUnitTest.java @@ -3,7 +3,8 @@ package units; import abstractextensions.SoldierExtension; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; /** * Created by Srdjan on 03-May-17. @@ -14,7 +15,7 @@ public class SoldierUnitTest { final Unit unit = new SoldierUnit("SoldierUnitName"); - assertNotNull((SoldierExtension)unit.getUnitExtension("SoldierExtension")); + assertNotNull((SoldierExtension) unit.getUnitExtension("SoldierExtension")); assertNull(unit.getUnitExtension("SergeantExtension")); assertNull(unit.getUnitExtension("CommanderExtension")); diff --git a/extension-objects/src/test/java/units/UnitTest.java b/extension-objects/src/test/java/units/UnitTest.java index 42cb1037f..773b485ce 100644 --- a/extension-objects/src/test/java/units/UnitTest.java +++ b/extension-objects/src/test/java/units/UnitTest.java @@ -1,10 +1,9 @@ package units; -import org.junit.After; -import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; /** * Created by Srdjan on 03-May-17. @@ -15,11 +14,11 @@ public class UnitTest { public void testConstGetSet() throws Exception { final String name = "testName"; final Unit unit = new Unit(name); - assertEquals(name,unit.getName()); + assertEquals(name, unit.getName()); final String newName = "newName"; unit.setName(newName); - assertEquals(newName,unit.getName()); + assertEquals(newName, unit.getName()); assertNull(unit.getUnitExtension(""));