mike
/
transcendental-lisp
1
1
Fork 0
Code Issues 10 Pull Requests Packages Projects Releases Wiki Activity

Switch from ant to maven

This commit is contained in:
Mike Cifelli 2017-03-15 13:37:39 -04:00
parent a21114ac7c
commit a86832f9cb
73 changed files with 176 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.classpath
View File

@ -1,14 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" 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">
<classpathentry kind="src" output="target/classes" path="src">
<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 kind="lib" path="lib/recursion.jar"/>
<classpathentry kind="lib" path="fitnesse/fitnesse-standalone.jar"/>
<classpathentry kind="output" path="build/classes"/>
<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="test">
<attributes>
<attribute name="optional" value="true"/>
<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>

26
.externalToolBuilders/Ant_Builder.launch
View File

@ -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>

7
.gitignore vendored
View File

@ -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

7
.project
View File

@ -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>

1
.settings/org.eclipse.jdt.core.prefs
View File

@ -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

4
.settings/org.eclipse.m2e.core.prefs Normal file
View File

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

31
build.xml
View File

@ -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>

BIN
lib/recursion.jar
View File

Binary file not shown.

65
pom.xml Normal file
View File

@ -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>

2
test/acceptance/AcceptanceTester.java → test/acceptance/AcceptanceTest.java
View File

@ -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 {}

4
test/environment/RuntimeEnvironmentTester.java → test/environment/RuntimeEnvironmentTest.java
View File

@ -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();
}

4
test/error/ErrorManagerTester.java → test/error/ErrorManagerTest.java
View File

@ -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();
}

2
test/file/FilePositionTrackerTester.java → test/file/FilePositionTrackerTest.java
View File

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

2
test/function/ArgumentValidatorTester.java → test/function/ArgumentValidatorTest.java
View File

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

2
test/function/LispFunctionTester.java → test/function/LispFunctionTest.java
View File

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

2
test/function/LispSpecialFunctionTester.java → test/function/LispSpecialFunctionTest.java
View File

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

2
test/function/UserDefinedFunctionTester.java → test/function/UserDefinedFunctionTest.java
View File

@ -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";

2
test/function/builtin/APPLYTester.java → test/function/builtin/APPLYTest.java
View File

@ -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() {

2
test/function/builtin/BackquoteEvaluatorTester.java → test/function/builtin/BackquoteEvaluatorTest.java
View File

@ -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));

2
test/function/builtin/EVALTester.java → test/function/builtin/EVALTest.java
View File

@ -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() {

4
test/function/builtin/EXITTester.java → test/function/builtin/EXITTest.java
View File

@ -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();
}

2
test/function/builtin/FUNCALLTester.java → test/function/builtin/FUNCALLTest.java
View File

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

2
test/function/builtin/GENSYMTester.java → test/function/builtin/GENSYMTest.java
View File

@ -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() {

4
test/function/builtin/LOADTester.java → test/function/builtin/LOADTest.java
View File

@ -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();
}

4
test/function/builtin/PRINTTester.java → test/function/builtin/PRINTTest.java
View File

@ -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();
}

4
test/function/builtin/SETTester.java → test/function/builtin/SETTest.java
View File

@ -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();
}

2
test/function/builtin/SYMBOL_FUNCTIONTester.java → test/function/builtin/SYMBOL_FUNCTIONTest.java
View File

@ -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() {

2
test/function/builtin/cons/CONSTester.java → test/function/builtin/cons/CONSTest.java
View File

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

2
test/function/builtin/cons/FIRSTTester.java → test/function/builtin/cons/FIRSTTest.java
View File

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

2
test/function/builtin/cons/LENGTHTester.java → test/function/builtin/cons/LENGTHTest.java
View File

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

2
test/function/builtin/cons/LISTTester.java → test/function/builtin/cons/LISTTest.java
View File

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

2
test/function/builtin/cons/RESTTester.java → test/function/builtin/cons/RESTTest.java
View File

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

2
test/function/builtin/math/DIVIDETester.java → test/function/builtin/math/DIVIDETest.java
View File

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

2
test/function/builtin/math/MINUSTester.java → test/function/builtin/math/MINUSTest.java
View File

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

2
test/function/builtin/math/MULTIPLYTester.java → test/function/builtin/math/MULTIPLYTest.java
View File

@ -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() {

2
test/function/builtin/math/PLUSTester.java → test/function/builtin/math/PLUSTest.java
View File

@ -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() {

2
test/function/builtin/predicate/ATOMTester.java → test/function/builtin/predicate/ATOMTest.java
View File

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

2
test/function/builtin/predicate/EQTester.java → test/function/builtin/predicate/EQTest.java
View File

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

2
test/function/builtin/predicate/EQUALTester.java → test/function/builtin/predicate/EQUALTest.java
View File

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

2
test/function/builtin/predicate/GENSYM_EQUALTester.java → test/function/builtin/predicate/GENSYM_EQUALTest.java
View File

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

2
test/function/builtin/predicate/LISTPTester.java → test/function/builtin/predicate/LISTPTest.java
View File

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

2
test/function/builtin/predicate/NULLTester.java → test/function/builtin/predicate/NULLTest.java
View File

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

2
test/function/builtin/predicate/NUMERIC_EQUALTester.java → test/function/builtin/predicate/NUMERIC_EQUALTest.java
View File

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

2
test/function/builtin/predicate/NUMERIC_GREATERTester.java → test/function/builtin/predicate/NUMERIC_GREATERTest.java
View File

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

2
test/function/builtin/predicate/NUMERIC_LESSTester.java → test/function/builtin/predicate/NUMERIC_LESSTest.java
View File

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

4
test/function/builtin/special/ANDTester.java → test/function/builtin/special/ANDTest.java
View File

@ -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();
}

4
test/function/builtin/special/CASETester.java → test/function/builtin/special/CASETest.java
View File

@ -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();
}

2
test/function/builtin/special/CONDTester.java → test/function/builtin/special/CONDTest.java
View File

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

4
test/function/builtin/special/DEFINE_SPECIALTester.java → test/function/builtin/special/DEFINE_SPECIALTest.java
View File

@ -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();
}

4
test/function/builtin/special/DEFMACROTester.java → test/function/builtin/special/DEFMACROTest.java
View File

@ -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();
}

4
test/function/builtin/special/DEFUNTester.java → test/function/builtin/special/DEFUNTest.java
View File

@ -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();
}

4
test/function/builtin/special/IFTester.java → test/function/builtin/special/IFTest.java
View File

@ -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();
}

2
test/function/builtin/special/LAMBDATester.java → test/function/builtin/special/LAMBDATest.java
View File

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

4
test/function/builtin/special/LETTester.java → test/function/builtin/special/LETTest.java
View File

@ -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();
}

4
test/function/builtin/special/LET_STARTester.java → test/function/builtin/special/LET_STARTest.java
View File

@ -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();
}

4
test/function/builtin/special/ORTester.java → test/function/builtin/special/ORTest.java
View File

@ -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();
}

2
test/function/builtin/special/PROGNTester.java → test/function/builtin/special/PROGNTest.java
View File

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

2
test/function/builtin/special/QUOTETester.java → test/function/builtin/special/QUOTETest.java
View File

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

4
test/function/builtin/special/SETQTester.java → test/function/builtin/special/SETQTest.java
View File

@ -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();
}

2
test/interpreter/LispInterpreterBuilderTester.java → test/interpreter/LispInterpreterBuilderTest.java
View File

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

2
test/main/MainTester.java → test/main/MainTest.java
View File

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

2
test/parser/LispParserTester.java → test/parser/LispParserTest.java
View File

@ -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);

2
test/scanner/LispCommentRemovingInputStreamTester.java → test/scanner/LispCommentRemovingInputStreamTest.java
View File

@ -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));

2
test/scanner/LispScannerLineColumnTester.java → test/scanner/LispScannerLineColumnTest.java
View File

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

2
test/scanner/LispScannerTextTester.java → test/scanner/LispScannerTextTest.java
View File

@ -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);

2
test/scanner/LispScannerTypeTester.java → test/scanner/LispScannerTypeTest.java
View File

@ -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;

2
test/sexpression/SExpressionTester.java → test/sexpression/SExpressionTest.java
View File

@ -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());

4
test/table/ExecutionContextTester.java → test/table/ExecutionContextTest.java
View File

@ -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();
}

2
test/table/FunctionTableTester.java → test/table/FunctionTableTest.java
View File

@ -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 {

2
test/table/SymbolTableTester.java → test/table/SymbolTableTest.java
View File

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

2
test/token/TokenFactoryTester.java → test/token/TokenFactoryTest.java
View File

@ -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;

2
test/util/CharactersTester.java → test/util/CharactersTest.java
View File

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

2
test/util/PathTester.java → test/util/PathTest.java
View File

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