From 993df541aa9a330c858d02970be28056a3469f03 Mon Sep 17 00:00:00 2001
From: Mike Cifelli <macifell@us.ibm.com>
Date: Mon, 6 Feb 2017 13:44:35 -0500
Subject: [PATCH] Organized imports in several files

---
 src/util/Characters.java                               | 3 +--
 test/file/FilePositionTrackerTester.java               | 3 +--
 test/function/UserDefinedFunctionTester.java           | 2 +-
 test/function/builtin/predicate/ATOMTester.java        | 2 +-
 test/parser/LispParserTester.java                      | 6 ++----
 test/scanner/LispCommentRemovingInputStreamTester.java | 6 ++----
 test/scanner/LispScannerTypeTester.java                | 9 +++------
 test/token/TokenFactoryTester.java                     | 3 +--
 8 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/util/Characters.java b/src/util/Characters.java
index 4363812..d6b5f45 100644
--- a/src/util/Characters.java
+++ b/src/util/Characters.java
@@ -1,7 +1,6 @@
 package util;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 
 public final class Characters {
 
diff --git a/test/file/FilePositionTrackerTester.java b/test/file/FilePositionTrackerTester.java
index 7f22503..767c9de 100644
--- a/test/file/FilePositionTrackerTester.java
+++ b/test/file/FilePositionTrackerTester.java
@@ -4,8 +4,7 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.Objects;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 
 public class FilePositionTrackerTester {
 
diff --git a/test/function/UserDefinedFunctionTester.java b/test/function/UserDefinedFunctionTester.java
index fa32469..d17036b 100644
--- a/test/function/UserDefinedFunctionTester.java
+++ b/test/function/UserDefinedFunctionTester.java
@@ -1,7 +1,7 @@
 package function;
 
 import static org.junit.Assert.assertEquals;
-import static testutil.TestUtilities.*;
+import static testutil.TestUtilities.assertSExpressionsMatch;
 
 import org.junit.Test;
 
diff --git a/test/function/builtin/predicate/ATOMTester.java b/test/function/builtin/predicate/ATOMTester.java
index f866805..3ab28d4 100644
--- a/test/function/builtin/predicate/ATOMTester.java
+++ b/test/function/builtin/predicate/ATOMTester.java
@@ -1,6 +1,6 @@
 package function.builtin.predicate;
 
-import static testutil.TestUtilities.*;
+import static testutil.TestUtilities.evaluateString;
 import static testutil.TypeAssertions.*;
 
 import org.junit.Test;
diff --git a/test/parser/LispParserTester.java b/test/parser/LispParserTester.java
index 2eefd1f..a683df2 100644
--- a/test/parser/LispParserTester.java
+++ b/test/parser/LispParserTester.java
@@ -1,16 +1,14 @@
 package parser;
 
 import static org.junit.Assert.*;
+import static testutil.TestUtilities.*;
 import static testutil.TypeAssertions.*;
-import static testutil.TestUtilities.createIOExceptionThrowingInputStream;
-import static testutil.TestUtilities.createInputStreamFromString;
 
 import java.io.InputStream;
 
 import org.junit.Test;
 
-import error.ErrorManager;
-import error.LispException;
+import error.*;
 import scanner.LispInputStream.UncheckedIOException;
 import scanner.LispScanner.UnterminatedStringException;
 import token.Eof.EofEncounteredException;
diff --git a/test/scanner/LispCommentRemovingInputStreamTester.java b/test/scanner/LispCommentRemovingInputStreamTester.java
index f95c0e5..73c9590 100644
--- a/test/scanner/LispCommentRemovingInputStreamTester.java
+++ b/test/scanner/LispCommentRemovingInputStreamTester.java
@@ -1,16 +1,14 @@
 package scanner;
 
 import static org.junit.Assert.*;
-import static testutil.TestUtilities.createIOExceptionThrowingInputStream;
-import static testutil.TestUtilities.createInputStreamFromString;
+import static testutil.TestUtilities.*;
 
 import java.io.InputStream;
 
 import org.junit.Test;
 
 import error.ErrorManager;
-import scanner.LispInputStream.MaximumUnreadsExceededException;
-import scanner.LispInputStream.UncheckedIOException;
+import scanner.LispInputStream.*;
 
 public class LispCommentRemovingInputStreamTester {
 
diff --git a/test/scanner/LispScannerTypeTester.java b/test/scanner/LispScannerTypeTester.java
index 9539cc1..b4cced8 100644
--- a/test/scanner/LispScannerTypeTester.java
+++ b/test/scanner/LispScannerTypeTester.java
@@ -1,15 +1,12 @@
 package scanner;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 import static testutil.TestUtilities.createInputStreamFromString;
 
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 
 import error.ErrorManager;
 import scanner.LispScanner.UnterminatedStringException;
diff --git a/test/token/TokenFactoryTester.java b/test/token/TokenFactoryTester.java
index 6b72630..dfec019 100644
--- a/test/token/TokenFactoryTester.java
+++ b/test/token/TokenFactoryTester.java
@@ -2,8 +2,7 @@ package token;
 
 import static org.junit.Assert.assertTrue;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 
 import file.FilePosition;
 import token.TokenFactory.BadCharacterException;