Clean up imports

* Same package classes are always implicitly imported
* Remove unused imports

Author: ullenius

src/main/java/org/junit/experimental/results/ResultMatchers.java

@@ -4,7 +4,6 @@
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
-import org.junit.runner.notification.Failure;
 
 /**
  * Matchers on a PrintableResult, to enable JUnit self-tests.

src/main/java/org/junit/runners/model/FrameworkField.java

@@ -2,7 +2,6 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
-import java.util.List;
 
 import org.junit.runners.BlockJUnit4ClassRunner;
 

src/test/java/junit/tests/runner/ResultTest.java

@@ -2,8 +2,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;

src/test/java/org/junit/experimental/categories/CategoriesAndParameterizedTest.java

@@ -6,9 +6,7 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.experimental.categories.Categories;
 import org.junit.experimental.categories.Categories.IncludeCategory;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 import org.junit.runner.RunWith;

src/test/java/org/junit/experimental/categories/CategoryTest.java

@@ -1,28 +1,27 @@
 package org.junit.experimental.categories;
 
+import static java.lang.String.format;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.AnyOf.anyOf;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.experimental.results.PrintableResult.testResult;
-import static org.junit.experimental.results.ResultMatchers.isSuccessful;
 import static org.junit.experimental.results.ResultMatchers.failureCountIs;
-import static org.hamcrest.core.AnyOf.anyOf;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static java.lang.String.format;
+import static org.junit.experimental.results.ResultMatchers.isSuccessful;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
+
 import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.experimental.categories.Categories;
 import org.junit.experimental.categories.Categories.CategoryFilter;
 import org.junit.experimental.categories.Categories.ExcludeCategory;
 import org.junit.experimental.categories.Categories.IncludeCategory;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Request;
 import org.junit.runner.Result;

src/test/java/org/junit/experimental/categories/CategoryValidatorTest.java

@@ -10,8 +10,6 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.experimental.categories.CategoryValidator;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.TestClass;
 

src/test/java/org/junit/experimental/categories/JavadocTest.java

@@ -1,18 +1,16 @@
 package org.junit.experimental.categories;
 
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import org.junit.Test;
-import org.junit.experimental.categories.Categories;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 /**
  * @author tibor17
  * @version 4.12

src/test/java/org/junit/experimental/categories/MultiCategoryTest.java

@@ -1,19 +1,17 @@
 package org.junit.experimental.categories;
 
-import org.junit.Test;
-import org.junit.experimental.categories.Categories;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Result;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
+import org.junit.Test;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
 /**
  * @author tibor17
  * @version 4.12

src/test/java/org/junit/rules/RuleChainTest.java

@@ -10,8 +10,6 @@
 import static org.junit.experimental.results.PrintableResult.testResult;
 import static org.junit.rules.RuleChain.outerRule;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
 

src/test/java/org/junit/rules/TestRuleTest.java

@@ -1,11 +1,9 @@
 package org.junit.rules;
 
-import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import static org.junit.experimental.results.PrintableResult.testResult;
 import static org.junit.experimental.results.ResultMatchers.hasSingleFailureContaining;
 import static org.junit.experimental.results.ResultMatchers.isSuccessful;
@@ -14,11 +12,9 @@
 import java.util.List;
 
 import org.junit.After;
-import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.internal.AssumptionViolatedException;
 import org.junit.runner.Description;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;

src/test/java/org/junit/runners/AllRunnersTests.java

@@ -1,7 +1,6 @@
 package org.junit.runners;
 
 import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 import org.junit.runners.model.AllModelTests;
 import org.junit.runners.parameterized.AllParameterizedTests;

src/test/java/org/junit/runners/RuleContainerTest.java

@@ -2,8 +2,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.Arrays;
-
 import org.junit.Test;
 import org.junit.rules.MethodRule;
 import org.junit.rules.TestRule;

src/test/java/org/junit/tests/running/classes/parent/ParentRunnerClassLoaderTest.java

@@ -1,5 +1,10 @@
 package org.junit.tests.running.classes.parent;
 
+import static org.junit.Assert.assertEquals;
+
+import java.lang.reflect.Field;
+import java.net.URL;
+import java.net.URLClassLoader;
 
 import org.junit.Test;
 import org.junit.runner.Description;
@@ -9,13 +14,6 @@
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;
 
-import java.lang.reflect.Field;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-
 public class ParentRunnerClassLoaderTest {
     @Test
     public void testClassRuleAccessToClassInAnotherClassLoader() throws Exception {