From cad2eef8ba0a498f336a09ecb24de70f61cb7124 Mon Sep 17 00:00:00 2001 From: Andreas Troelsen Date: Sat, 7 Aug 2021 12:20:45 +0200 Subject: [PATCH] Optimize imports in `things` package. We're good with on-demand imports for the static Hamcrest and Mockito functions in test code, because the arrange and assert steps of unit tests all make use of them, so it's known where they come from. --- .../MobArena/things/CommandThingParserTest.java | 8 +++----- .../MobArena/things/ItemStackThingParserTest.java | 14 ++++---------- .../MobArena/things/MoneyThingParserTest.java | 14 +++++--------- .../MobArena/things/ParserUtilTest.java | 5 ++--- .../MobArena/things/PermissionThingParserTest.java | 10 ++++------ .../things/RandomThingPickerParserTest.java | 11 +++-------- .../MobArena/things/RandomThingPickerTest.java | 6 +----- .../things/ThingGroupPickerParserTest.java | 11 +++-------- .../MobArena/things/ThingManagerTest.java | 10 +++------- .../MobArena/things/ThingPickerManagerTest.java | 6 +----- 10 files changed, 29 insertions(+), 66 deletions(-) diff --git a/src/test/java/com/garbagemule/MobArena/things/CommandThingParserTest.java b/src/test/java/com/garbagemule/MobArena/things/CommandThingParserTest.java index fffa4f9..a5ad58d 100644 --- a/src/test/java/com/garbagemule/MobArena/things/CommandThingParserTest.java +++ b/src/test/java/com/garbagemule/MobArena/things/CommandThingParserTest.java @@ -1,15 +1,13 @@ package com.garbagemule.MobArena.things; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.MatcherAssert.*; + public class CommandThingParserTest { private CommandThingParser subject; diff --git a/src/test/java/com/garbagemule/MobArena/things/ItemStackThingParserTest.java b/src/test/java/com/garbagemule/MobArena/things/ItemStackThingParserTest.java index 4daefba..ddb6b89 100644 --- a/src/test/java/com/garbagemule/MobArena/things/ItemStackThingParserTest.java +++ b/src/test/java/com/garbagemule/MobArena/things/ItemStackThingParserTest.java @@ -1,21 +1,15 @@ package com.garbagemule.MobArena.things; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Mockito.inOrder; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; -import static org.mockito.Mockito.when; - import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.junit.Before; import org.junit.Test; import org.mockito.InOrder; +import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.MatcherAssert.*; +import static org.mockito.Mockito.*; + public class ItemStackThingParserTest { private ItemStackThingParser subject; diff --git a/src/test/java/com/garbagemule/MobArena/things/MoneyThingParserTest.java b/src/test/java/com/garbagemule/MobArena/things/MoneyThingParserTest.java index afb1881..926a617 100644 --- a/src/test/java/com/garbagemule/MobArena/things/MoneyThingParserTest.java +++ b/src/test/java/com/garbagemule/MobArena/things/MoneyThingParserTest.java @@ -1,14 +1,5 @@ package com.garbagemule.MobArena.things; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import com.garbagemule.MobArena.MobArena; import net.milkbowl.vault.economy.Economy; import org.junit.Before; @@ -18,6 +9,11 @@ import org.junit.rules.ExpectedException; import java.util.logging.Logger; +import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.MatcherAssert.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; + public class MoneyThingParserTest { private MoneyThingParser subject; diff --git a/src/test/java/com/garbagemule/MobArena/things/ParserUtilTest.java b/src/test/java/com/garbagemule/MobArena/things/ParserUtilTest.java index 882af8d..c877881 100644 --- a/src/test/java/com/garbagemule/MobArena/things/ParserUtilTest.java +++ b/src/test/java/com/garbagemule/MobArena/things/ParserUtilTest.java @@ -1,6 +1,5 @@ package com.garbagemule.MobArena.things; -import org.hamcrest.collection.IsEmptyCollection; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -9,8 +8,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.collection.IsEmptyCollection.empty; public class ParserUtilTest { diff --git a/src/test/java/com/garbagemule/MobArena/things/PermissionThingParserTest.java b/src/test/java/com/garbagemule/MobArena/things/PermissionThingParserTest.java index 41b1690..6920ee9 100644 --- a/src/test/java/com/garbagemule/MobArena/things/PermissionThingParserTest.java +++ b/src/test/java/com/garbagemule/MobArena/things/PermissionThingParserTest.java @@ -1,15 +1,13 @@ package com.garbagemule.MobArena.things; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Mockito.mock; - import com.garbagemule.MobArena.MobArena; import org.junit.Before; import org.junit.Test; +import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.MatcherAssert.*; +import static org.mockito.Mockito.*; + public class PermissionThingParserTest { private PermissionThingParser subject; diff --git a/src/test/java/com/garbagemule/MobArena/things/RandomThingPickerParserTest.java b/src/test/java/com/garbagemule/MobArena/things/RandomThingPickerParserTest.java index 0e73727..7850d24 100644 --- a/src/test/java/com/garbagemule/MobArena/things/RandomThingPickerParserTest.java +++ b/src/test/java/com/garbagemule/MobArena/things/RandomThingPickerParserTest.java @@ -7,14 +7,9 @@ import org.junit.rules.ExpectedException; import java.util.Random; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.MatcherAssert.*; +import static org.mockito.Mockito.*; public class RandomThingPickerParserTest { diff --git a/src/test/java/com/garbagemule/MobArena/things/RandomThingPickerTest.java b/src/test/java/com/garbagemule/MobArena/things/RandomThingPickerTest.java index c1fd0b0..c820273 100644 --- a/src/test/java/com/garbagemule/MobArena/things/RandomThingPickerTest.java +++ b/src/test/java/com/garbagemule/MobArena/things/RandomThingPickerTest.java @@ -7,11 +7,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; public class RandomThingPickerTest { diff --git a/src/test/java/com/garbagemule/MobArena/things/ThingGroupPickerParserTest.java b/src/test/java/com/garbagemule/MobArena/things/ThingGroupPickerParserTest.java index c0c78c7..0d98de7 100644 --- a/src/test/java/com/garbagemule/MobArena/things/ThingGroupPickerParserTest.java +++ b/src/test/java/com/garbagemule/MobArena/things/ThingGroupPickerParserTest.java @@ -5,14 +5,9 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.MatcherAssert.*; +import static org.mockito.Mockito.*; public class ThingGroupPickerParserTest { diff --git a/src/test/java/com/garbagemule/MobArena/things/ThingManagerTest.java b/src/test/java/com/garbagemule/MobArena/things/ThingManagerTest.java index 28f033d..9414e07 100644 --- a/src/test/java/com/garbagemule/MobArena/things/ThingManagerTest.java +++ b/src/test/java/com/garbagemule/MobArena/things/ThingManagerTest.java @@ -1,12 +1,5 @@ package com.garbagemule.MobArena.things; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.inOrder; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; -import static org.mockito.Mockito.when; - import com.garbagemule.MobArena.MobArena; import org.junit.Before; import org.junit.Rule; @@ -14,6 +7,9 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.InOrder; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; + public class ThingManagerTest { private ThingManager subject; diff --git a/src/test/java/com/garbagemule/MobArena/things/ThingPickerManagerTest.java b/src/test/java/com/garbagemule/MobArena/things/ThingPickerManagerTest.java index 099f515..7a576dc 100644 --- a/src/test/java/com/garbagemule/MobArena/things/ThingPickerManagerTest.java +++ b/src/test/java/com/garbagemule/MobArena/things/ThingPickerManagerTest.java @@ -3,11 +3,7 @@ package com.garbagemule.MobArena.things; import org.junit.Before; import org.junit.Test; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; public class ThingPickerManagerTest {