skywalker3200/MobArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimize imports in things package.

Browse Source 
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.
This commit is contained in:
Andreas Troelsen
2021-08-07 12:20:45 +02:00
parent 9fec49cc58
commit cad2eef8ba
10 changed files with 29 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/garbagemule/MobArena/things/CommandThingParserTest.java
+3 -5
View File
@@ -1,15 +1,13 @@
package com.garbagemule.MobArena.things; 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.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.*;
public class CommandThingParserTest { public class CommandThingParserTest {
private CommandThingParser subject; private CommandThingParser subject;
src/test/java/com/garbagemule/MobArena/things/ItemStackThingParserTest.java
+4 -10
View File
@@ -1,21 +1,15 @@
package com.garbagemule.MobArena.things; 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.Material;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.mockito.InOrder; import org.mockito.InOrder;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.*;
import static org.mockito.Mockito.*;
public class ItemStackThingParserTest { public class ItemStackThingParserTest {
private ItemStackThingParser subject; private ItemStackThingParser subject;
src/test/java/com/garbagemule/MobArena/things/MoneyThingParserTest.java
+5 -9
View File
@@ -1,14 +1,5 @@
package com.garbagemule.MobArena.things; 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 com.garbagemule.MobArena.MobArena;
import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.Economy;
import org.junit.Before; import org.junit.Before;
@@ -18,6 +9,11 @@ import org.junit.rules.ExpectedException;
import java.util.logging.Logger; 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 { public class MoneyThingParserTest {
private MoneyThingParser subject; private MoneyThingParser subject;
src/test/java/com/garbagemule/MobArena/things/ParserUtilTest.java
+2 -3
View File
@@ -1,6 +1,5 @@
package com.garbagemule.MobArena.things; package com.garbagemule.MobArena.things;
import org.hamcrest.collection.IsEmptyCollection;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
@@ -9,8 +8,8 @@ import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.collection.IsEmptyCollection.empty; import static org.hamcrest.collection.IsEmptyCollection.empty;
public class ParserUtilTest { public class ParserUtilTest {
src/test/java/com/garbagemule/MobArena/things/PermissionThingParserTest.java
+4 -6
View File
@@ -1,15 +1,13 @@
package com.garbagemule.MobArena.things; 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 com.garbagemule.MobArena.MobArena;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.*;
import static org.mockito.Mockito.*;
public class PermissionThingParserTest { public class PermissionThingParserTest {
private PermissionThingParser subject; private PermissionThingParser subject;
src/test/java/com/garbagemule/MobArena/things/RandomThingPickerParserTest.java
+3 -8
View File
@@ -7,14 +7,9 @@ import org.junit.rules.ExpectedException;
import java.util.Random; import java.util.Random;
import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.CoreMatchers.nullValue; import static org.mockito.Mockito.*;
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;
public class RandomThingPickerParserTest { public class RandomThingPickerParserTest {
src/test/java/com/garbagemule/MobArena/things/RandomThingPickerTest.java
+1 -5
View File
@@ -7,11 +7,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.*;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
public class RandomThingPickerTest { public class RandomThingPickerTest {
src/test/java/com/garbagemule/MobArena/things/ThingGroupPickerParserTest.java
+3 -8
View File
@@ -5,14 +5,9 @@ import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.CoreMatchers.nullValue; import static org.mockito.Mockito.*;
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;
public class ThingGroupPickerParserTest { public class ThingGroupPickerParserTest {
src/test/java/com/garbagemule/MobArena/things/ThingManagerTest.java
+3 -7
View File
@@ -1,12 +1,5 @@
package com.garbagemule.MobArena.things; 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 com.garbagemule.MobArena.MobArena;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
@@ -14,6 +7,9 @@ import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import org.mockito.InOrder; import org.mockito.InOrder;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
public class ThingManagerTest { public class ThingManagerTest {
private ThingManager subject; private ThingManager subject;
src/test/java/com/garbagemule/MobArena/things/ThingPickerManagerTest.java
+1 -5
View File
@@ -3,11 +3,7 @@ package com.garbagemule.MobArena.things;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.*;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
public class ThingPickerManagerTest { public class ThingPickerManagerTest {