diff --git a/.classpath b/.classpath index 9f6d4ec..c373700 100644 --- a/.classpath +++ b/.classpath @@ -1,14 +1,26 @@ - - - + - + + - - - - + + + + + + + + + + + + + + + + + diff --git a/.externalToolBuilders/Ant_Builder.launch b/.externalToolBuilders/Ant_Builder.launch deleted file mode 100644 index eff9777..0000000 --- a/.externalToolBuilders/Ant_Builder.launch +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.gitignore b/.gitignore index 836b004..8817c1b 100644 --- a/.gitignore +++ b/.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 \ No newline at end of file diff --git a/.project b/.project index 4f7c8bb..d3d6477 100644 --- a/.project +++ b/.project @@ -16,16 +16,13 @@ - org.eclipse.ui.externaltools.ExternalToolBuilder + org.eclipse.m2e.core.maven2Builder - - LaunchConfigHandle - <project>/.externalToolBuilders/Ant_Builder.launch - + org.eclipse.m2e.core.maven2Nature org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index a698e59..13b3428 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.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 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/build.xml b/build.xml deleted file mode 100644 index 309504a..0000000 --- a/build.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/recursion.jar b/lib/recursion.jar deleted file mode 100644 index 22e201e..0000000 Binary files a/lib/recursion.jar and /dev/null differ diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..58120c1 --- /dev/null +++ b/pom.xml @@ -0,0 +1,65 @@ + + 4.0.0 + org.bitbucket + transcendental-lisp + 0.0.1-SNAPSHOT + + src + test + + + test + + **/*.java + + + + + + maven-compiler-plugin + 3.5.1 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-shade-plugin + 2.3 + + + package + + shade + + + + + main.LispMain + + + + + + + + + + + junit + junit + 4.12 + test + + + org.fitnesse + fitnesse + 20161106 + test + + + + UTF-8 + + \ No newline at end of file diff --git a/test/acceptance/AcceptanceTester.java b/test/acceptance/AcceptanceTest.java similarity index 88% rename from test/acceptance/AcceptanceTester.java rename to test/acceptance/AcceptanceTest.java index 1ee2a2f..52abf41 100644 --- a/test/acceptance/AcceptanceTester.java +++ b/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 {} diff --git a/test/environment/RuntimeEnvironmentTester.java b/test/environment/RuntimeEnvironmentTest.java similarity index 98% rename from test/environment/RuntimeEnvironmentTester.java rename to test/environment/RuntimeEnvironmentTest.java index 7df140a..6628e3b 100644 --- a/test/environment/RuntimeEnvironmentTester.java +++ b/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 indicatorSet; - public RuntimeEnvironmentTester() { + public RuntimeEnvironmentTest() { this.environment = RuntimeEnvironment.getInstance(); } diff --git a/test/error/ErrorManagerTester.java b/test/error/ErrorManagerTest.java similarity index 98% rename from test/error/ErrorManagerTester.java rename to test/error/ErrorManagerTest.java index 62d3527..10f70c4 100644 --- a/test/error/ErrorManagerTester.java +++ b/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(); } diff --git a/test/file/FilePositionTrackerTester.java b/test/file/FilePositionTrackerTest.java similarity index 97% rename from test/file/FilePositionTrackerTester.java rename to test/file/FilePositionTrackerTest.java index 767c9de..3af06c0 100644 --- a/test/file/FilePositionTrackerTester.java +++ b/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"; diff --git a/test/function/ArgumentValidatorTester.java b/test/function/ArgumentValidatorTest.java similarity index 99% rename from test/function/ArgumentValidatorTester.java rename to test/function/ArgumentValidatorTest.java index 4239e61..4c42637 100644 --- a/test/function/ArgumentValidatorTester.java +++ b/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; diff --git a/test/function/LispFunctionTester.java b/test/function/LispFunctionTest.java similarity index 92% rename from test/function/LispFunctionTester.java rename to test/function/LispFunctionTest.java index b71be65..c23febb 100644 --- a/test/function/LispFunctionTester.java +++ b/test/function/LispFunctionTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import sexpression.*; -public class LispFunctionTester { +public class LispFunctionTest { @Test public void evaluateArguments() { diff --git a/test/function/LispSpecialFunctionTester.java b/test/function/LispSpecialFunctionTest.java similarity index 91% rename from test/function/LispSpecialFunctionTester.java rename to test/function/LispSpecialFunctionTest.java index 6073fc6..88e8ca0 100644 --- a/test/function/LispSpecialFunctionTester.java +++ b/test/function/LispSpecialFunctionTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import sexpression.*; -public class LispSpecialFunctionTester { +public class LispSpecialFunctionTest { @Test public void evaluateArguments() { diff --git a/test/function/UserDefinedFunctionTester.java b/test/function/UserDefinedFunctionTest.java similarity index 98% rename from test/function/UserDefinedFunctionTester.java rename to test/function/UserDefinedFunctionTest.java index e93736f..50776c1 100644 --- a/test/function/UserDefinedFunctionTester.java +++ b/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"; diff --git a/test/function/builtin/APPLYTester.java b/test/function/builtin/APPLYTest.java similarity index 98% rename from test/function/builtin/APPLYTester.java rename to test/function/builtin/APPLYTest.java index d88ca4e..5d1c9df 100644 --- a/test/function/builtin/APPLYTester.java +++ b/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() { diff --git a/test/function/builtin/BackquoteEvaluatorTester.java b/test/function/builtin/BackquoteEvaluatorTest.java similarity index 99% rename from test/function/builtin/BackquoteEvaluatorTester.java rename to test/function/builtin/BackquoteEvaluatorTest.java index 571b3c4..c857e71 100644 --- a/test/function/builtin/BackquoteEvaluatorTester.java +++ b/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)); diff --git a/test/function/builtin/EVALTester.java b/test/function/builtin/EVALTest.java similarity index 99% rename from test/function/builtin/EVALTester.java rename to test/function/builtin/EVALTest.java index 445abe5..70daedf 100644 --- a/test/function/builtin/EVALTester.java +++ b/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() { diff --git a/test/function/builtin/EXITTester.java b/test/function/builtin/EXITTest.java similarity index 96% rename from test/function/builtin/EXITTester.java rename to test/function/builtin/EXITTest.java index 140659d..c739c55 100644 --- a/test/function/builtin/EXITTester.java +++ b/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 indicatorSet; - public EXITTester() { + public EXITTest() { this.environment = RuntimeEnvironment.getInstance(); } diff --git a/test/function/builtin/FUNCALLTester.java b/test/function/builtin/FUNCALLTest.java similarity index 97% rename from test/function/builtin/FUNCALLTester.java rename to test/function/builtin/FUNCALLTest.java index 8d7e19f..02ab7e7 100644 --- a/test/function/builtin/FUNCALLTester.java +++ b/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() { diff --git a/test/function/builtin/GENSYMTester.java b/test/function/builtin/GENSYMTest.java similarity index 97% rename from test/function/builtin/GENSYMTester.java rename to test/function/builtin/GENSYMTest.java index 815594f..a716584 100644 --- a/test/function/builtin/GENSYMTester.java +++ b/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() { diff --git a/test/function/builtin/LOADTester.java b/test/function/builtin/LOADTest.java similarity index 98% rename from test/function/builtin/LOADTester.java rename to test/function/builtin/LOADTest.java index dc55fa6..e82fd32 100644 --- a/test/function/builtin/LOADTester.java +++ b/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(); } diff --git a/test/function/builtin/PRINTTester.java b/test/function/builtin/PRINTTest.java similarity index 96% rename from test/function/builtin/PRINTTester.java rename to test/function/builtin/PRINTTest.java index f5e2f24..b4df62b 100644 --- a/test/function/builtin/PRINTTester.java +++ b/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(); } diff --git a/test/function/builtin/SETTester.java b/test/function/builtin/SETTest.java similarity index 98% rename from test/function/builtin/SETTester.java rename to test/function/builtin/SETTest.java index 9db08ab..9e27296 100644 --- a/test/function/builtin/SETTester.java +++ b/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(); } diff --git a/test/function/builtin/SYMBOL_FUNCTIONTester.java b/test/function/builtin/SYMBOL_FUNCTIONTest.java similarity index 98% rename from test/function/builtin/SYMBOL_FUNCTIONTester.java rename to test/function/builtin/SYMBOL_FUNCTIONTest.java index 6fd5cab..b161b70 100644 --- a/test/function/builtin/SYMBOL_FUNCTIONTester.java +++ b/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() { diff --git a/test/function/builtin/cons/CONSTester.java b/test/function/builtin/cons/CONSTest.java similarity index 98% rename from test/function/builtin/cons/CONSTester.java rename to test/function/builtin/cons/CONSTest.java index c6ecaa9..dba2a1c 100644 --- a/test/function/builtin/cons/CONSTester.java +++ b/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() { diff --git a/test/function/builtin/cons/FIRSTTester.java b/test/function/builtin/cons/FIRSTTest.java similarity index 97% rename from test/function/builtin/cons/FIRSTTester.java rename to test/function/builtin/cons/FIRSTTest.java index 5809f94..7491fb1 100644 --- a/test/function/builtin/cons/FIRSTTester.java +++ b/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() { diff --git a/test/function/builtin/cons/LENGTHTester.java b/test/function/builtin/cons/LENGTHTest.java similarity index 97% rename from test/function/builtin/cons/LENGTHTester.java rename to test/function/builtin/cons/LENGTHTest.java index acd53b6..16fa3d4 100644 --- a/test/function/builtin/cons/LENGTHTester.java +++ b/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() { diff --git a/test/function/builtin/cons/LISTTester.java b/test/function/builtin/cons/LISTTest.java similarity index 98% rename from test/function/builtin/cons/LISTTester.java rename to test/function/builtin/cons/LISTTest.java index a6cb4d8..4711eb5 100644 --- a/test/function/builtin/cons/LISTTester.java +++ b/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() { diff --git a/test/function/builtin/cons/RESTTester.java b/test/function/builtin/cons/RESTTest.java similarity index 97% rename from test/function/builtin/cons/RESTTester.java rename to test/function/builtin/cons/RESTTest.java index aaa71c1..78e3d40 100644 --- a/test/function/builtin/cons/RESTTester.java +++ b/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() { diff --git a/test/function/builtin/math/DIVIDETester.java b/test/function/builtin/math/DIVIDETest.java similarity index 98% rename from test/function/builtin/math/DIVIDETester.java rename to test/function/builtin/math/DIVIDETest.java index 41c9775..9d55b3a 100644 --- a/test/function/builtin/math/DIVIDETester.java +++ b/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() { diff --git a/test/function/builtin/math/MINUSTester.java b/test/function/builtin/math/MINUSTest.java similarity index 97% rename from test/function/builtin/math/MINUSTester.java rename to test/function/builtin/math/MINUSTest.java index 35184c9..bdc71fd 100644 --- a/test/function/builtin/math/MINUSTester.java +++ b/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() { diff --git a/test/function/builtin/math/MULTIPLYTester.java b/test/function/builtin/math/MULTIPLYTest.java similarity index 97% rename from test/function/builtin/math/MULTIPLYTester.java rename to test/function/builtin/math/MULTIPLYTest.java index 397dad6..0048303 100644 --- a/test/function/builtin/math/MULTIPLYTester.java +++ b/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() { diff --git a/test/function/builtin/math/PLUSTester.java b/test/function/builtin/math/PLUSTest.java similarity index 97% rename from test/function/builtin/math/PLUSTester.java rename to test/function/builtin/math/PLUSTest.java index 8f2a496..3290cae 100644 --- a/test/function/builtin/math/PLUSTester.java +++ b/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() { diff --git a/test/function/builtin/predicate/ATOMTester.java b/test/function/builtin/predicate/ATOMTest.java similarity index 96% rename from test/function/builtin/predicate/ATOMTester.java rename to test/function/builtin/predicate/ATOMTest.java index 23e982e..29fdde7 100644 --- a/test/function/builtin/predicate/ATOMTester.java +++ b/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() { diff --git a/test/function/builtin/predicate/EQTester.java b/test/function/builtin/predicate/EQTest.java similarity index 98% rename from test/function/builtin/predicate/EQTester.java rename to test/function/builtin/predicate/EQTest.java index f3678fe..f284d97 100644 --- a/test/function/builtin/predicate/EQTester.java +++ b/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() { diff --git a/test/function/builtin/predicate/EQUALTester.java b/test/function/builtin/predicate/EQUALTest.java similarity index 98% rename from test/function/builtin/predicate/EQUALTester.java rename to test/function/builtin/predicate/EQUALTest.java index 1dc077d..0b99c96 100644 --- a/test/function/builtin/predicate/EQUALTester.java +++ b/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() { diff --git a/test/function/builtin/predicate/GENSYM_EQUALTester.java b/test/function/builtin/predicate/GENSYM_EQUALTest.java similarity index 99% rename from test/function/builtin/predicate/GENSYM_EQUALTester.java rename to test/function/builtin/predicate/GENSYM_EQUALTest.java index 92d023b..55269b3 100644 --- a/test/function/builtin/predicate/GENSYM_EQUALTester.java +++ b/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() { diff --git a/test/function/builtin/predicate/LISTPTester.java b/test/function/builtin/predicate/LISTPTest.java similarity index 96% rename from test/function/builtin/predicate/LISTPTester.java rename to test/function/builtin/predicate/LISTPTest.java index e057c1b..46c2eb7 100644 --- a/test/function/builtin/predicate/LISTPTester.java +++ b/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() { diff --git a/test/function/builtin/predicate/NULLTester.java b/test/function/builtin/predicate/NULLTest.java similarity index 96% rename from test/function/builtin/predicate/NULLTester.java rename to test/function/builtin/predicate/NULLTest.java index 691419b..7cf9bfa 100644 --- a/test/function/builtin/predicate/NULLTester.java +++ b/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() { diff --git a/test/function/builtin/predicate/NUMERIC_EQUALTester.java b/test/function/builtin/predicate/NUMERIC_EQUALTest.java similarity index 97% rename from test/function/builtin/predicate/NUMERIC_EQUALTester.java rename to test/function/builtin/predicate/NUMERIC_EQUALTest.java index 8aa4f36..29bf47d 100644 --- a/test/function/builtin/predicate/NUMERIC_EQUALTester.java +++ b/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() { diff --git a/test/function/builtin/predicate/NUMERIC_GREATERTester.java b/test/function/builtin/predicate/NUMERIC_GREATERTest.java similarity index 97% rename from test/function/builtin/predicate/NUMERIC_GREATERTester.java rename to test/function/builtin/predicate/NUMERIC_GREATERTest.java index 43162a7..039796e 100644 --- a/test/function/builtin/predicate/NUMERIC_GREATERTester.java +++ b/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() { diff --git a/test/function/builtin/predicate/NUMERIC_LESSTester.java b/test/function/builtin/predicate/NUMERIC_LESSTest.java similarity index 97% rename from test/function/builtin/predicate/NUMERIC_LESSTester.java rename to test/function/builtin/predicate/NUMERIC_LESSTest.java index 74c186a..03156a2 100644 --- a/test/function/builtin/predicate/NUMERIC_LESSTester.java +++ b/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() { diff --git a/test/function/builtin/special/ANDTester.java b/test/function/builtin/special/ANDTest.java similarity index 97% rename from test/function/builtin/special/ANDTester.java rename to test/function/builtin/special/ANDTest.java index 11fe4b4..3f28446 100644 --- a/test/function/builtin/special/ANDTester.java +++ b/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(); } diff --git a/test/function/builtin/special/CASETester.java b/test/function/builtin/special/CASETest.java similarity index 99% rename from test/function/builtin/special/CASETester.java rename to test/function/builtin/special/CASETest.java index 7344b70..6ed5cd6 100644 --- a/test/function/builtin/special/CASETester.java +++ b/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(); } diff --git a/test/function/builtin/special/CONDTester.java b/test/function/builtin/special/CONDTest.java similarity index 98% rename from test/function/builtin/special/CONDTester.java rename to test/function/builtin/special/CONDTest.java index 3e1ea94..e7c9742 100644 --- a/test/function/builtin/special/CONDTester.java +++ b/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() { diff --git a/test/function/builtin/special/DEFINE_SPECIALTester.java b/test/function/builtin/special/DEFINE_SPECIALTest.java similarity index 98% rename from test/function/builtin/special/DEFINE_SPECIALTester.java rename to test/function/builtin/special/DEFINE_SPECIALTest.java index 1114290..3cd2dfa 100644 --- a/test/function/builtin/special/DEFINE_SPECIALTester.java +++ b/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(); } diff --git a/test/function/builtin/special/DEFMACROTester.java b/test/function/builtin/special/DEFMACROTest.java similarity index 98% rename from test/function/builtin/special/DEFMACROTester.java rename to test/function/builtin/special/DEFMACROTest.java index a1d2cb5..46d2bd1 100644 --- a/test/function/builtin/special/DEFMACROTester.java +++ b/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(); } diff --git a/test/function/builtin/special/DEFUNTester.java b/test/function/builtin/special/DEFUNTest.java similarity index 99% rename from test/function/builtin/special/DEFUNTester.java rename to test/function/builtin/special/DEFUNTest.java index 77bb706..d0db053 100644 --- a/test/function/builtin/special/DEFUNTester.java +++ b/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(); } diff --git a/test/function/builtin/special/IFTester.java b/test/function/builtin/special/IFTest.java similarity index 97% rename from test/function/builtin/special/IFTester.java rename to test/function/builtin/special/IFTest.java index 0dbbf65..58715af 100644 --- a/test/function/builtin/special/IFTester.java +++ b/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(); } diff --git a/test/function/builtin/special/LAMBDATester.java b/test/function/builtin/special/LAMBDATest.java similarity index 99% rename from test/function/builtin/special/LAMBDATester.java rename to test/function/builtin/special/LAMBDATest.java index c3ab9f0..7f1e7a6 100644 --- a/test/function/builtin/special/LAMBDATester.java +++ b/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() { diff --git a/test/function/builtin/special/LETTester.java b/test/function/builtin/special/LETTest.java similarity index 99% rename from test/function/builtin/special/LETTester.java rename to test/function/builtin/special/LETTest.java index e3269ba..0e3b115 100644 --- a/test/function/builtin/special/LETTester.java +++ b/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(); } diff --git a/test/function/builtin/special/LET_STARTester.java b/test/function/builtin/special/LET_STARTest.java similarity index 98% rename from test/function/builtin/special/LET_STARTester.java rename to test/function/builtin/special/LET_STARTest.java index 7a6911c..960d23a 100644 --- a/test/function/builtin/special/LET_STARTester.java +++ b/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(); } diff --git a/test/function/builtin/special/ORTester.java b/test/function/builtin/special/ORTest.java similarity index 97% rename from test/function/builtin/special/ORTester.java rename to test/function/builtin/special/ORTest.java index 44aac42..b8f7bad 100644 --- a/test/function/builtin/special/ORTester.java +++ b/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(); } diff --git a/test/function/builtin/special/PROGNTester.java b/test/function/builtin/special/PROGNTest.java similarity index 97% rename from test/function/builtin/special/PROGNTester.java rename to test/function/builtin/special/PROGNTest.java index 88a6c16..dacae16 100644 --- a/test/function/builtin/special/PROGNTester.java +++ b/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() { diff --git a/test/function/builtin/special/QUOTETester.java b/test/function/builtin/special/QUOTETest.java similarity index 96% rename from test/function/builtin/special/QUOTETester.java rename to test/function/builtin/special/QUOTETest.java index 01d51d6..e0b163d 100644 --- a/test/function/builtin/special/QUOTETester.java +++ b/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() { diff --git a/test/function/builtin/special/SETQTester.java b/test/function/builtin/special/SETQTest.java similarity index 98% rename from test/function/builtin/special/SETQTester.java rename to test/function/builtin/special/SETQTest.java index 30561e3..e2fb02c 100644 --- a/test/function/builtin/special/SETQTester.java +++ b/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(); } diff --git a/test/interpreter/LispInterpreterBuilderTester.java b/test/interpreter/LispInterpreterBuilderTest.java similarity index 98% rename from test/interpreter/LispInterpreterBuilderTester.java rename to test/interpreter/LispInterpreterBuilderTest.java index 3ff46de..f896cea 100644 --- a/test/interpreter/LispInterpreterBuilderTester.java +++ b/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() { diff --git a/test/main/MainTester.java b/test/main/MainTest.java similarity index 85% rename from test/main/MainTester.java rename to test/main/MainTest.java index db401e4..1647c34 100644 --- a/test/main/MainTester.java +++ b/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 {} diff --git a/test/parser/LispParserTester.java b/test/parser/LispParserTest.java similarity index 99% rename from test/parser/LispParserTester.java rename to test/parser/LispParserTest.java index ce2cab5..3b93b07 100644 --- a/test/parser/LispParserTester.java +++ b/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); diff --git a/test/scanner/LispCommentRemovingInputStreamTester.java b/test/scanner/LispCommentRemovingInputStreamTest.java similarity index 99% rename from test/scanner/LispCommentRemovingInputStreamTester.java rename to test/scanner/LispCommentRemovingInputStreamTest.java index 9aa3fc9..249107a 100644 --- a/test/scanner/LispCommentRemovingInputStreamTester.java +++ b/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)); diff --git a/test/scanner/LispScannerLineColumnTester.java b/test/scanner/LispScannerLineColumnTest.java similarity index 99% rename from test/scanner/LispScannerLineColumnTester.java rename to test/scanner/LispScannerLineColumnTest.java index 82c7422..78d55b8 100644 --- a/test/scanner/LispScannerLineColumnTester.java +++ b/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 { diff --git a/test/scanner/LispScannerTextTester.java b/test/scanner/LispScannerTextTest.java similarity index 98% rename from test/scanner/LispScannerTextTester.java rename to test/scanner/LispScannerTextTest.java index 601a639..42ab768 100644 --- a/test/scanner/LispScannerTextTester.java +++ b/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); diff --git a/test/scanner/LispScannerTypeTester.java b/test/scanner/LispScannerTypeTest.java similarity index 99% rename from test/scanner/LispScannerTypeTester.java rename to test/scanner/LispScannerTypeTest.java index f437db5..7f08bdd 100644 --- a/test/scanner/LispScannerTypeTester.java +++ b/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> expectedTypes; diff --git a/test/sexpression/SExpressionTester.java b/test/sexpression/SExpressionTest.java similarity index 99% rename from test/sexpression/SExpressionTester.java rename to test/sexpression/SExpressionTest.java index fafab3d..5f6530f 100644 --- a/test/sexpression/SExpressionTester.java +++ b/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()); diff --git a/test/table/ExecutionContextTester.java b/test/table/ExecutionContextTest.java similarity index 96% rename from test/table/ExecutionContextTester.java rename to test/table/ExecutionContextTest.java index c875de0..1dd22e4 100644 --- a/test/table/ExecutionContextTester.java +++ b/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(); } diff --git a/test/table/FunctionTableTester.java b/test/table/FunctionTableTest.java similarity index 99% rename from test/table/FunctionTableTester.java rename to test/table/FunctionTableTest.java index 996ba10..09b87e8 100644 --- a/test/table/FunctionTableTester.java +++ b/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 { diff --git a/test/table/SymbolTableTester.java b/test/table/SymbolTableTest.java similarity index 97% rename from test/table/SymbolTableTester.java rename to test/table/SymbolTableTest.java index f5291ce..f569e7e 100644 --- a/test/table/SymbolTableTester.java +++ b/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; diff --git a/test/token/TokenFactoryTester.java b/test/token/TokenFactoryTest.java similarity index 98% rename from test/token/TokenFactoryTester.java rename to test/token/TokenFactoryTest.java index 21d264d..b5c4609 100644 --- a/test/token/TokenFactoryTester.java +++ b/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; diff --git a/test/util/CharactersTester.java b/test/util/CharactersTest.java similarity index 92% rename from test/util/CharactersTester.java rename to test/util/CharactersTest.java index 4f413e3..7e0115c 100644 --- a/test/util/CharactersTester.java +++ b/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 { diff --git a/test/util/PathTester.java b/test/util/PathTest.java similarity index 94% rename from test/util/PathTester.java rename to test/util/PathTest.java index b3a5877..6d9bd4f 100644 --- a/test/util/PathTester.java +++ b/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 {