Switch from ant to maven

.classpath

@@ -1,14 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="target/classes" path="src">
-	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="test">
-	<classpathentry kind="lib" path="lib/recursion.jar"/>
+		<attributes>
-	<classpathentry kind="lib" path="fitnesse/fitnesse-standalone.jar"/>
+			<attribute name="optional" value="true"/>
-	<classpathentry kind="output" path="build/classes"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.externalToolBuilders/Ant_Builder.launch

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="jar,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="jar,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="jar,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/Transcendental Lisp"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Transcendental Lisp"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Transcendental Lisp/build.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,clean"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-</launchConfiguration>

.gitignore

@@ -1,8 +1,7 @@
-build/
-doc/
-FitNesseRoot/FitNesse/UserGuide/
 fitnesse/FitNesseRoot/files
+fitnesse/FitNesseRoot/FitNesse/UserGuide/
 fitnesse/fitnesse-results
-jar/
+target/
 *.zip
 *.swp
+dependency-reduced-pom.xml

.project

@@ -16,16 +16,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/Ant_Builder.launch</value>
-				</dictionary>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>

.settings/org.eclipse.jdt.core.prefs

@@ -9,4 +9,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.source=1.8

.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

build.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="TranscendentalLisp" basedir="." default="compile">
-  <property name="src.dir" value="src" />
-  <property name="build.dir" value="build" />
-  <property name="classes.dir" value="${build.dir}/classes" />
-  <property name="jar.dir" value="jar" />
-  <property name="jar-file" value="${jar.dir}/TranscendentalLisp.jar" />
-  <property name="main-class" value="main.LispMain" />
-
-  <target name="clean">
-    <delete dir="${build.dir}" />
-    <delete dir="${jar.dir}" />
-  </target>
-
-  <target name="compile">
-    <mkdir dir="${classes.dir}" />
-    <javac srcdir="${src.dir}" destdir="${classes.dir}"
-      includeantruntime="false" />
-  </target>
-
-  <target name="jar" depends="compile">
-    <jar destfile="${jar-file}" basedir="${classes.dir}">
-      <manifest>
-        <attribute name="Main-Class" value="${main-class}" />
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="clean-jar" depends="clean, jar" />
-</project>

pom.xml

@@ -0,0 +1,65 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.bitbucket</groupId>
+  <artifactId>transcendental-lisp</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+    <testSourceDirectory>test</testSourceDirectory>
+    <testResources>
+      <testResource>
+        <directory>test</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </testResource>
+    </testResources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.5.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.3</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>main.LispMain</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.fitnesse</groupId>
+      <artifactId>fitnesse</artifactId>
+      <version>20161106</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+</project>

test/acceptance/AcceptanceTest.java

@@ -8,4 +8,4 @@ import fitnesse.junit.FitNesseRunner;
 @FitNesseRunner.Suite("TranscendentalLisp")
 @FitNesseRunner.FitnesseDir("fitnesse")
 @FitNesseRunner.OutputDir("fitnesse/fitnesse-results")
-public class AcceptanceTester {}
+public class AcceptanceTest {}

test/environment/RuntimeEnvironmentTest.java

@@ -8,7 +8,7 @@ import org.junit.*;
 
 import error.ErrorManager;
 
-public class RuntimeEnvironmentTester {
+public class RuntimeEnvironmentTest {
 
     private static final String TERMINATED_SUCCESSFULLY = "TERMINATED_SUCCESSFULLY";
     private static final String TERMINATED_EXCEPTIONALLY = "TERMINATED_EXCEPTIONALLY";
@@ -16,7 +16,7 @@ public class RuntimeEnvironmentTester {
     private RuntimeEnvironment environment;
     private Set<String> indicatorSet;
 
-    public RuntimeEnvironmentTester() {
+    public RuntimeEnvironmentTest() {
         this.environment = RuntimeEnvironment.getInstance();
     }
 

test/error/ErrorManagerTest.java

@@ -11,7 +11,7 @@ import org.junit.*;
 import environment.RuntimeEnvironment;
 import error.ErrorManager.Severity;
 
-public class ErrorManagerTester {
+public class ErrorManagerTest {
 
     private static final String TERMINATED = "terminated";
     private static final String MESSAGE = "message";
@@ -21,7 +21,7 @@ public class ErrorManagerTester {
     private ByteArrayOutputStream outputStream;
     private RuntimeEnvironment environment;
 
-    public ErrorManagerTester() {
+    public ErrorManagerTest() {
         this.environment = RuntimeEnvironment.getInstance();
     }
 

test/file/FilePositionTrackerTest.java

@@ -6,7 +6,7 @@ import java.util.Objects;
 
 import org.junit.*;
 
-public class FilePositionTrackerTester {
+public class FilePositionTrackerTest {
 
     public static final String FILE_NAME = "testFile";
 

test/function/ArgumentValidatorTest.java

@@ -10,7 +10,7 @@ import org.junit.*;
 import function.ArgumentValidator.*;
 import sexpression.*;
 
-public class ArgumentValidatorTester {
+public class ArgumentValidatorTest {
 
     private ArgumentValidator validator;
 

test/function/LispFunctionTest.java

@@ -6,7 +6,7 @@ import org.junit.Test;
 
 import sexpression.*;
 
-public class LispFunctionTester {
+public class LispFunctionTest {
 
     @Test
     public void evaluateArguments() {

test/function/LispSpecialFunctionTest.java

@@ -6,7 +6,7 @@ import org.junit.Test;
 
 import sexpression.*;
 
-public class LispSpecialFunctionTester {
+public class LispSpecialFunctionTest {
 
     @Test
     public void evaluateArguments() {

test/function/UserDefinedFunctionTest.java

@@ -11,7 +11,7 @@ import function.ArgumentValidator.*;
 import function.UserDefinedFunction.IllegalKeywordRestPositionException;
 import sexpression.*;
 
-public class UserDefinedFunctionTester {
+public class UserDefinedFunctionTest {
 
     private static final String FUNCTION_NAME = "TEST";
 

test/function/builtin/APPLYTest.java

@@ -9,7 +9,7 @@ import function.ArgumentValidator.*;
 import function.builtin.EVAL.UndefinedFunctionException;
 import sexpression.Cons;
 
-public class APPLYTester {
+public class APPLYTest {
 
     @Test
     public void applyWithSymbol() {

test/function/builtin/BackquoteEvaluatorTest.java

@@ -10,7 +10,7 @@ import function.ArgumentValidator.DottedArgumentListException;
 import function.builtin.BackquoteEvaluator.*;
 import sexpression.*;
 
-public class BackquoteEvaluatorTester {
+public class BackquoteEvaluatorTest {
 
     private BackquoteEvaluator createBackquoteEvaluator(SExpression expression) {
         return new BackquoteEvaluator(new BackquoteExpression(expression));

test/function/builtin/EVALTest.java

@@ -11,7 +11,7 @@ import function.ArgumentValidator.*;
 import function.builtin.BackquoteEvaluator.AtSignNotInCommaException;
 import function.builtin.EVAL.*;
 
-public class EVALTester {
+public class EVALTest {
 
     @Test
     public void evalNumber() {

test/function/builtin/EXITTest.java

@@ -10,13 +10,13 @@ import org.junit.*;
 import environment.RuntimeEnvironment;
 import function.ArgumentValidator.TooManyArgumentsException;
 
-public class EXITTester {
+public class EXITTest {
 
     private static final String TERMINATED = "terminated";
     private RuntimeEnvironment environment;
     private Set<String> indicatorSet;
 
-    public EXITTester() {
+    public EXITTest() {
         this.environment = RuntimeEnvironment.getInstance();
     }
 

test/function/builtin/FUNCALLTest.java

@@ -7,7 +7,7 @@ import org.junit.*;
 
 import function.ArgumentValidator.TooFewArgumentsException;
 
-public class FUNCALLTester {
+public class FUNCALLTest {
 
     @Before
     public void setUp() {

test/function/builtin/GENSYMTest.java

@@ -9,7 +9,7 @@ import org.junit.Test;
 import function.ArgumentValidator.TooManyArgumentsException;
 import token.TokenFactory.BadCharacterException;
 
-public class GENSYMTester {
+public class GENSYMTest {
 
     @Test
     public void gensymCreatesSymbol() {

test/function/builtin/LOADTest.java

@@ -12,13 +12,13 @@ import environment.RuntimeEnvironment;
 import error.ErrorManager;
 import function.ArgumentValidator.*;
 
-public class LOADTester {
+public class LOADTest {
 
     private ByteArrayOutputStream outputStream;
     private ByteArrayOutputStream errorOutputStream;
     private RuntimeEnvironment environment;
 
-    public LOADTester() {
+    public LOADTest() {
         this.environment = RuntimeEnvironment.getInstance();
     }
 

test/function/builtin/PRINTTest.java

@@ -11,12 +11,12 @@ import org.junit.*;
 import environment.RuntimeEnvironment;
 import function.ArgumentValidator.*;
 
-public class PRINTTester {
+public class PRINTTest {
 
     private RuntimeEnvironment environment;
     private ByteArrayOutputStream outputStream;
 
-    public PRINTTester() {
+    public PRINTTest() {
         this.environment = RuntimeEnvironment.getInstance();
     }
 

test/function/builtin/SETTest.java

@@ -10,11 +10,11 @@ import function.builtin.EVAL.UndefinedSymbolException;
 import sexpression.LispNumber;
 import table.*;
 
-public class SETTester {
+public class SETTest {
 
     private ExecutionContext executionContext;
 
-    public SETTester() {
+    public SETTest() {
         this.executionContext = ExecutionContext.getInstance();
     }
 

test/function/builtin/SYMBOL_FUNCTIONTest.java

@@ -11,7 +11,7 @@ import org.junit.*;
 import function.ArgumentValidator.*;
 import function.builtin.SYMBOL_FUNCTION.UndefinedSymbolFunctionException;
 
-public class SYMBOL_FUNCTIONTester {
+public class SYMBOL_FUNCTIONTest {
 
     @Before
     public void setUp() {

test/function/builtin/cons/CONSTest.java

@@ -7,7 +7,7 @@ import org.junit.Test;
 import function.ArgumentValidator.*;
 import sexpression.*;
 
-public class CONSTester {
+public class CONSTest {
 
     @Test
     public void consWithNilValues() {

test/function/builtin/cons/FIRSTTest.java

@@ -6,7 +6,7 @@ import org.junit.Test;
 
 import function.ArgumentValidator.*;
 
-public class FIRSTTester {
+public class FIRSTTest {
 
     @Test
     public void firstOfNil() {

test/function/builtin/cons/LENGTHTest.java

@@ -6,7 +6,7 @@ import org.junit.Test;
 
 import function.ArgumentValidator.*;
 
-public class LENGTHTester {
+public class LENGTHTest {
 
     @Test
     public void lengthOfNil() {

test/function/builtin/cons/LISTTest.java

@@ -5,7 +5,7 @@ import static testutil.TestUtilities.*;
 
 import org.junit.Test;
 
-public class LISTTester {
+public class LISTTest {
 
     @Test
     public void listWithNoArguments() {

test/function/builtin/cons/RESTTest.java

@@ -6,7 +6,7 @@ import org.junit.Test;
 
 import function.ArgumentValidator.*;
 
-public class RESTTester {
+public class RESTTest {
 
     @Test
     public void restOfNil() {

test/function/builtin/math/DIVIDETest.java

@@ -6,7 +6,7 @@ import org.junit.Test;
 
 import function.ArgumentValidator.*;
 
-public class DIVIDETester {
+public class DIVIDETest {
 
     @Test
     public void divideWithOne() {

test/function/builtin/math/MINUSTest.java

@@ -7,7 +7,7 @@ import org.junit.Test;
 import function.ArgumentValidator.*;
 import sexpression.LispNumber;
 
-public class MINUSTester {
+public class MINUSTest {
 
     @Test
     public void minusWithOneNumber() {

test/function/builtin/math/MULTIPLYTest.java

@@ -7,7 +7,7 @@ import org.junit.Test;
 import function.ArgumentValidator.BadArgumentTypeException;
 import sexpression.LispNumber;
 
-public class MULTIPLYTester {
+public class MULTIPLYTest {
 
     @Test
     public void multiplyWithNoArguments() {

test/function/builtin/math/PLUSTest.java

@@ -7,7 +7,7 @@ import org.junit.Test;
 import function.ArgumentValidator.BadArgumentTypeException;
 import sexpression.LispNumber;
 
-public class PLUSTester {
+public class PLUSTest {
 
     @Test
     public void plusWithNoArguments() {

test/function/builtin/predicate/ATOMTest.java

@@ -7,7 +7,7 @@ import org.junit.Test;
 
 import function.ArgumentValidator.*;
 
-public class ATOMTester {
+public class ATOMTest {
 
     @Test
     public void atomIsAtom() {

test/function/builtin/predicate/EQTest.java

@@ -7,7 +7,7 @@ import org.junit.Test;
 
 import function.ArgumentValidator.*;
 
-public class EQTester {
+public class EQTest {
 
     @Test
     public void eqWithEqualAtoms() {

test/function/builtin/predicate/EQUALTest.java

@@ -7,7 +7,7 @@ import org.junit.Test;
 
 import function.ArgumentValidator.*;
 
-public class EQUALTester {
+public class EQUALTest {
 
     @Test
     public void equalWithTwoEqualAtoms() {

test/function/builtin/predicate/GENSYM_EQUALTest.java

@@ -7,7 +7,7 @@ import org.junit.Test;
 
 import function.ArgumentValidator.*;
 
-public class GENSYM_EQUALTester {
+public class GENSYM_EQUALTest {
 
     @Test
     public void gensymEqualWithTwoEqualAtoms() {

test/function/builtin/predicate/LISTPTest.java

@@ -7,7 +7,7 @@ import org.junit.Test;
 
 import function.ArgumentValidator.*;
 
-public class LISTPTester {
+public class LISTPTest {
 
     @Test
     public void listpWithList() {

test/function/builtin/predicate/NULLTest.java

@@ -7,7 +7,7 @@ import org.junit.Test;
 
 import function.ArgumentValidator.*;
 
-public class NULLTester {
+public class NULLTest {
 
     @Test
     public void nilIsNull() {

test/function/builtin/predicate/NUMERIC_EQUALTest.java

@@ -7,7 +7,7 @@ import org.junit.Test;
 
 import function.ArgumentValidator.*;
 
-public class NUMERIC_EQUALTester {
+public class NUMERIC_EQUALTest {
 
     @Test
     public void numericEqualWithOneNumber() {

test/function/builtin/predicate/NUMERIC_GREATERTest.java

@@ -7,7 +7,7 @@ import org.junit.Test;
 
 import function.ArgumentValidator.*;
 
-public class NUMERIC_GREATERTester {
+public class NUMERIC_GREATERTest {
 
     @Test
     public void greaterThanWithOneNumber_ReturnsT() {

test/function/builtin/predicate/NUMERIC_LESSTest.java

@@ -7,7 +7,7 @@ import org.junit.Test;
 
 import function.ArgumentValidator.*;
 
-public class NUMERIC_LESSTester {
+public class NUMERIC_LESSTest {
 
     @Test
     public void lessThanWithOneNumber_ReturnsT() {

test/function/builtin/special/ANDTest.java

@@ -9,11 +9,11 @@ import function.builtin.EVAL.UndefinedSymbolException;
 import sexpression.LispNumber;
 import table.ExecutionContext;
 
-public class ANDTester {
+public class ANDTest {
 
     private ExecutionContext executionContext;
 
-    public ANDTester() {
+    public ANDTest() {
         this.executionContext = ExecutionContext.getInstance();
     }
 

test/function/builtin/special/CASETest.java

@@ -7,11 +7,11 @@ import org.junit.*;
 import function.ArgumentValidator.*;
 import table.ExecutionContext;
 
-public class CASETester {
+public class CASETest {
 
     private ExecutionContext executionContext;
 
-    public CASETester() {
+    public CASETest() {
         this.executionContext = ExecutionContext.getInstance();
     }
 

test/function/builtin/special/CONDTest.java

@@ -6,7 +6,7 @@ import org.junit.Test;
 
 import function.ArgumentValidator.*;
 
-public class CONDTester {
+public class CONDTest {
 
     @Test
     public void condWithNoArguments() {

test/function/builtin/special/DEFINE_SPECIALTest.java

@@ -13,12 +13,12 @@ import error.ErrorManager;
 import function.ArgumentValidator.*;
 import function.UserDefinedFunction.IllegalKeywordRestPositionException;
 
-public class DEFINE_SPECIALTester {
+public class DEFINE_SPECIALTest {
 
     private ByteArrayOutputStream outputStream;
     private RuntimeEnvironment environment;
 
-    public DEFINE_SPECIALTester() {
+    public DEFINE_SPECIALTest() {
         this.environment = RuntimeEnvironment.getInstance();
     }
 

test/function/builtin/special/DEFMACROTest.java

@@ -13,12 +13,12 @@ import error.ErrorManager;
 import function.ArgumentValidator.*;
 import function.UserDefinedFunction.IllegalKeywordRestPositionException;
 
-public class DEFMACROTester {
+public class DEFMACROTest {
 
     private ByteArrayOutputStream outputStream;
     private RuntimeEnvironment environment;
 
-    public DEFMACROTester() {
+    public DEFMACROTest() {
         this.environment = RuntimeEnvironment.getInstance();
     }
 

test/function/builtin/special/DEFUNTest.java

@@ -13,12 +13,12 @@ import error.ErrorManager;
 import function.ArgumentValidator.*;
 import function.UserDefinedFunction.IllegalKeywordRestPositionException;
 
-public class DEFUNTester {
+public class DEFUNTest {
 
     private ByteArrayOutputStream outputStream;
     private RuntimeEnvironment environment;
 
-    public DEFUNTester() {
+    public DEFUNTest() {
         this.environment = RuntimeEnvironment.getInstance();
     }
 

test/function/builtin/special/IFTest.java

@@ -9,11 +9,11 @@ import function.ArgumentValidator.*;
 import function.builtin.EVAL.UndefinedSymbolException;
 import table.ExecutionContext;
 
-public class IFTester {
+public class IFTest {
 
     private ExecutionContext executionContext;
 
-    public IFTester() {
+    public IFTest() {
         this.executionContext = ExecutionContext.getInstance();
     }
 

test/function/builtin/special/LAMBDATest.java

@@ -11,7 +11,7 @@ import org.junit.Test;
 import function.ArgumentValidator.*;
 import sexpression.*;
 
-public class LAMBDATester {
+public class LAMBDATest {
 
     @Test
     public void lambda() {

test/function/builtin/special/LETTest.java

@@ -10,11 +10,11 @@ import function.builtin.EVAL.UndefinedSymbolException;
 import sexpression.*;
 import table.ExecutionContext;
 
-public class LETTester {
+public class LETTest {
 
     private ExecutionContext executionContext;
 
-    public LETTester() {
+    public LETTest() {
         this.executionContext = ExecutionContext.getInstance();
     }
 

test/function/builtin/special/LET_STARTest.java

@@ -10,11 +10,11 @@ import function.builtin.EVAL.UndefinedSymbolException;
 import sexpression.*;
 import table.ExecutionContext;
 
-public class LET_STARTester {
+public class LET_STARTest {
 
     private ExecutionContext executionContext;
 
-    public LET_STARTester() {
+    public LET_STARTest() {
         this.executionContext = ExecutionContext.getInstance();
     }
 

test/function/builtin/special/ORTest.java

@@ -9,11 +9,11 @@ import function.builtin.EVAL.UndefinedSymbolException;
 import sexpression.LispNumber;
 import table.ExecutionContext;
 
-public class ORTester {
+public class ORTest {
 
     private ExecutionContext executionContext;
 
-    public ORTester() {
+    public ORTest() {
         this.executionContext = ExecutionContext.getInstance();
     }
 

test/function/builtin/special/PROGNTest.java

@@ -5,7 +5,7 @@ import static testutil.TypeAssertions.assertNil;
 
 import org.junit.Test;
 
-public class PROGNTester {
+public class PROGNTest {
 
     @Test
     public void prognWithNoArguments() {

test/function/builtin/special/QUOTETest.java

@@ -6,7 +6,7 @@ import org.junit.Test;
 
 import function.ArgumentValidator.*;
 
-public class QUOTETester {
+public class QUOTETest {
 
     @Test
     public void quoteSymbol() {

test/function/builtin/special/SETQTest.java

@@ -10,11 +10,11 @@ import function.builtin.EVAL.UndefinedSymbolException;
 import sexpression.LispNumber;
 import table.*;
 
-public class SETQTester {
+public class SETQTest {
 
     private ExecutionContext executionContext;
 
-    public SETQTester() {
+    public SETQTest() {
         this.executionContext = ExecutionContext.getInstance();
     }
 

test/interpreter/LispInterpreterBuilderTest.java

@@ -9,7 +9,7 @@ import org.junit.*;
 
 import interpreter.LispInterpreterBuilderImpl.InterpreterAlreadyBuiltException;
 
-public class LispInterpreterBuilderTester {
+public class LispInterpreterBuilderTest {
 
     private LispInterpreterBuilder builder = new LispInterpreterBuilderImpl() {
 

test/main/MainTest.java

@@ -2,7 +2,7 @@ package main;
 
 import org.junit.*;
 
-public class MainTester {
+public class MainTest {
 
     @Before
     public void setUp() throws Exception {}

test/parser/LispParserTest.java

@@ -16,7 +16,7 @@ import token.Eof.EofEncounteredException;
 import token.RightParenthesis.StartsWithRightParenthesisException;
 import token.TokenFactory.BadCharacterException;
 
-public class LispParserTester {
+public class LispParserTest {
 
     private LispParser createLispParser(String input) {
         InputStream stringInputStream = createInputStreamFromString(input);

test/scanner/LispCommentRemovingInputStreamTest.java

@@ -10,7 +10,7 @@ import org.junit.Test;
 
 import scanner.LispInputStream.*;
 
-public class LispCommentRemovingInputStreamTester {
+public class LispCommentRemovingInputStreamTest {
 
     private String getLispCommentRemovingInputStreamResult(String inputString) {
         return readInputStreamIntoString(createLispInputStream(inputString));

test/scanner/LispScannerLineColumnTest.java

@@ -10,7 +10,7 @@ import org.junit.Test;
 import file.FilePosition;
 import token.Token;
 
-public class LispScannerLineColumnTester {
+public class LispScannerLineColumnTest {
 
     private static class LineColumn {
 

test/scanner/LispScannerTextTest.java

@@ -9,7 +9,7 @@ import org.junit.Test;
 
 import file.FilePosition;
 
-public class LispScannerTextTester {
+public class LispScannerTextTest {
 
     private void assertTokenTextMatches(String input, String[] expectedTextList) {
         LispScanner lispScanner = createLispScanner(input);

test/scanner/LispScannerTypeTest.java

@@ -14,7 +14,7 @@ import token.*;
 import token.Number;
 import token.TokenFactory.BadCharacterException;
 
-public class LispScannerTypeTester {
+public class LispScannerTypeTest {
 
     private List<Class<? extends Token>> expectedTypes;
 

test/sexpression/SExpressionTest.java

@@ -12,7 +12,7 @@ import org.junit.*;
 import function.UserDefinedFunction;
 import sexpression.LispNumber.InvalidNumberException;
 
-public class SExpressionTester {
+public class SExpressionTest {
 
     private void assertSExpressionMatchesString(String expected, SExpression sExpression) {
         assertEquals(expected, sExpression.toString());

test/table/ExecutionContextTest.java

@@ -6,11 +6,11 @@ import static sexpression.Symbol.T;
 
 import org.junit.*;
 
-public class ExecutionContextTester {
+public class ExecutionContextTest {
 
     private ExecutionContext executionContext;
 
-    public ExecutionContextTester() {
+    public ExecutionContextTest() {
         this.executionContext = ExecutionContext.getInstance();
     }
 

test/table/FunctionTableTest.java

@@ -14,7 +14,7 @@ import function.*;
 import sexpression.*;
 import table.FunctionTable.LispFunctionInstantiationException;
 
-public class FunctionTableTester {
+public class FunctionTableTest {
 
     @FunctionNames({ "GOOD" })
     public static class GoodFunction extends LispFunction {

test/table/SymbolTableTest.java

@@ -6,7 +6,7 @@ import static sexpression.Symbol.T;
 
 import org.junit.*;
 
-public class SymbolTableTester {
+public class SymbolTableTest {
 
     private SymbolTable symbolTable;
 

test/token/TokenFactoryTest.java

@@ -8,7 +8,7 @@ import org.junit.*;
 import file.FilePosition;
 import token.TokenFactory.*;
 
-public class TokenFactoryTester {
+public class TokenFactoryTest {
 
     private TokenFactory tokenFactory;
     private FilePosition testPosition;

test/util/CharactersTest.java

@@ -6,7 +6,7 @@ import java.lang.reflect.*;
 
 import org.junit.Test;
 
-public class CharactersTester {
+public class CharactersTest {
 
     @Test
     public void constructorIsPrivate() throws Exception {

test/util/PathTest.java

@@ -6,7 +6,7 @@ import java.lang.reflect.*;
 
 import org.junit.Test;
 
-public class PathTester {
+public class PathTest {
 
     @Test
     public void constructorIsPrivate() throws Exception {