Browse Source

Fix some stupidly wrong imports.

Change-Id: Iaa32f068930bee751e17e2f22136e571e5afa081
Reviewed-on: http://gerrit.dmdirc.com/3853
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
pull/1/head
Chris Smith 9 years ago
parent
commit
969ddc596c

+ 2
- 2
test/com/dmdirc/ui/core/aliases/NewAliasValidatorTest.java View File

25
 import com.dmdirc.commandparser.aliases.Alias;
25
 import com.dmdirc.commandparser.aliases.Alias;
26
 import com.dmdirc.interfaces.ui.AliasDialogModel;
26
 import com.dmdirc.interfaces.ui.AliasDialogModel;
27
 
27
 
28
+import com.google.common.collect.Lists;
29
+
28
 import org.junit.Before;
30
 import org.junit.Before;
29
 import org.junit.Test;
31
 import org.junit.Test;
30
 import org.junit.runner.RunWith;
32
 import org.junit.runner.RunWith;
31
 import org.mockito.Mock;
33
 import org.mockito.Mock;
32
 import org.mockito.runners.MockitoJUnitRunner;
34
 import org.mockito.runners.MockitoJUnitRunner;
33
 
35
 
34
-import clover.com.google.common.collect.Lists;
35
-
36
 import static org.junit.Assert.assertFalse;
36
 import static org.junit.Assert.assertFalse;
37
 import static org.junit.Assert.assertTrue;
37
 import static org.junit.Assert.assertTrue;
38
 import static org.mockito.Mockito.when;
38
 import static org.mockito.Mockito.when;

+ 1
- 2
test/com/dmdirc/ui/core/aliases/RenameAliasValidatorTest.java View File

26
 import com.dmdirc.interfaces.ui.AliasDialogModel;
26
 import com.dmdirc.interfaces.ui.AliasDialogModel;
27
 
27
 
28
 import com.google.common.base.Optional;
28
 import com.google.common.base.Optional;
29
+import com.google.common.collect.Lists;
29
 
30
 
30
 import org.junit.Before;
31
 import org.junit.Before;
31
 import org.junit.Test;
32
 import org.junit.Test;
33
 import org.mockito.Mock;
34
 import org.mockito.Mock;
34
 import org.mockito.runners.MockitoJUnitRunner;
35
 import org.mockito.runners.MockitoJUnitRunner;
35
 
36
 
36
-import clover.com.google.common.collect.Lists;
37
-
38
 import static org.junit.Assert.assertFalse;
37
 import static org.junit.Assert.assertFalse;
39
 import static org.junit.Assert.assertTrue;
38
 import static org.junit.Assert.assertTrue;
40
 import static org.mockito.Mockito.when;
39
 import static org.mockito.Mockito.when;

+ 1
- 2
test/com/dmdirc/ui/core/profiles/AddNicknameValidatorTest.java View File

26
 import com.dmdirc.interfaces.ui.ProfilesDialogModel;
26
 import com.dmdirc.interfaces.ui.ProfilesDialogModel;
27
 
27
 
28
 import com.google.common.base.Optional;
28
 import com.google.common.base.Optional;
29
+import com.google.common.collect.Lists;
29
 
30
 
30
 import java.util.List;
31
 import java.util.List;
31
 
32
 
35
 import org.mockito.Mock;
36
 import org.mockito.Mock;
36
 import org.mockito.runners.MockitoJUnitRunner;
37
 import org.mockito.runners.MockitoJUnitRunner;
37
 
38
 
38
-import clover.com.google.common.collect.Lists;
39
-
40
 import static org.junit.Assert.assertFalse;
39
 import static org.junit.Assert.assertFalse;
41
 import static org.junit.Assert.assertTrue;
40
 import static org.junit.Assert.assertTrue;
42
 import static org.mockito.Mockito.when;
41
 import static org.mockito.Mockito.when;

+ 1
- 2
test/com/dmdirc/ui/core/profiles/CoreProfilesDialogModelTest.java View File

29
 import com.dmdirc.interfaces.ui.ProfilesDialogModelListener;
29
 import com.dmdirc.interfaces.ui.ProfilesDialogModelListener;
30
 
30
 
31
 import com.google.common.base.Optional;
31
 import com.google.common.base.Optional;
32
+import com.google.common.collect.Lists;
32
 
33
 
33
 import java.util.List;
34
 import java.util.List;
34
 
35
 
38
 import org.mockito.Mock;
39
 import org.mockito.Mock;
39
 import org.mockito.runners.MockitoJUnitRunner;
40
 import org.mockito.runners.MockitoJUnitRunner;
40
 
41
 
41
-import clover.com.google.common.collect.Lists;
42
-
43
 import static org.junit.Assert.assertEquals;
42
 import static org.junit.Assert.assertEquals;
44
 import static org.junit.Assert.assertFalse;
43
 import static org.junit.Assert.assertFalse;
45
 import static org.junit.Assert.assertTrue;
44
 import static org.junit.Assert.assertTrue;

+ 1
- 2
test/com/dmdirc/ui/core/profiles/EditSelectedNicknameValidatorTest.java View File

26
 import com.dmdirc.interfaces.ui.ProfilesDialogModel;
26
 import com.dmdirc.interfaces.ui.ProfilesDialogModel;
27
 
27
 
28
 import com.google.common.base.Optional;
28
 import com.google.common.base.Optional;
29
+import com.google.common.collect.Lists;
29
 
30
 
30
 import java.util.List;
31
 import java.util.List;
31
 
32
 
35
 import org.mockito.Mock;
36
 import org.mockito.Mock;
36
 import org.mockito.runners.MockitoJUnitRunner;
37
 import org.mockito.runners.MockitoJUnitRunner;
37
 
38
 
38
-import clover.com.google.common.collect.Lists;
39
-
40
 import static org.junit.Assert.assertFalse;
39
 import static org.junit.Assert.assertFalse;
41
 import static org.junit.Assert.assertTrue;
40
 import static org.junit.Assert.assertTrue;
42
 import static org.mockito.Mockito.when;
41
 import static org.mockito.Mockito.when;

+ 1
- 2
test/com/dmdirc/ui/core/profiles/EditSelectedProfileNameValidatorTest.java View File

26
 import com.dmdirc.interfaces.ui.ProfilesDialogModel;
26
 import com.dmdirc.interfaces.ui.ProfilesDialogModel;
27
 
27
 
28
 import com.google.common.base.Optional;
28
 import com.google.common.base.Optional;
29
+import com.google.common.collect.Lists;
29
 
30
 
30
 import java.util.List;
31
 import java.util.List;
31
 
32
 
35
 import org.mockito.Mock;
36
 import org.mockito.Mock;
36
 import org.mockito.runners.MockitoJUnitRunner;
37
 import org.mockito.runners.MockitoJUnitRunner;
37
 
38
 
38
-import clover.com.google.common.collect.Lists;
39
-
40
 import static org.junit.Assert.assertFalse;
39
 import static org.junit.Assert.assertFalse;
41
 import static org.junit.Assert.assertTrue;
40
 import static org.junit.Assert.assertTrue;
42
 import static org.mockito.Mockito.when;
41
 import static org.mockito.Mockito.when;

+ 1
- 2
test/com/dmdirc/ui/core/profiles/NewProfileNameValidatorTest.java View File

26
 import com.dmdirc.interfaces.ui.ProfilesDialogModel;
26
 import com.dmdirc.interfaces.ui.ProfilesDialogModel;
27
 
27
 
28
 import com.google.common.base.Optional;
28
 import com.google.common.base.Optional;
29
+import com.google.common.collect.Lists;
29
 
30
 
30
 import java.util.List;
31
 import java.util.List;
31
 
32
 
35
 import org.mockito.Mock;
36
 import org.mockito.Mock;
36
 import org.mockito.runners.MockitoJUnitRunner;
37
 import org.mockito.runners.MockitoJUnitRunner;
37
 
38
 
38
-import clover.com.google.common.collect.Lists;
39
-
40
 import static org.junit.Assert.assertFalse;
39
 import static org.junit.Assert.assertFalse;
41
 import static org.junit.Assert.assertTrue;
40
 import static org.junit.Assert.assertTrue;
42
 import static org.mockito.Mockito.when;
41
 import static org.mockito.Mockito.when;

Loading…
Cancel
Save