From 0eb8db36a889167970850fd2e7596e9b3339b7b9 Mon Sep 17 00:00:00 2001
From: Mike Cifelli <macifell@us.ibm.com>
Date: Thu, 2 Mar 2017 15:26:21 -0500
Subject: [PATCH] Acceptance tests now run with JUnit

---
 .classpath                                            |  2 +-
 .gitignore                                            |  1 +
 fitnesse/FitNesseRoot/LispInterpreter/SetUp.wiki      |  4 ++--
 fitnesse/FitNesseRoot/RecentChanges.wiki              |  2 +-
 src/function/ArgumentValidator.java                   |  4 ++--
 test/acceptance/FitNesseRunnerTester.java             | 11 +++++++++++
 .../acceptance}/fixture/LispInterpreterFixture.java   |  2 +-
 7 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 test/acceptance/FitNesseRunnerTester.java
 rename {acctest => test/acceptance}/fixture/LispInterpreterFixture.java (97%)

diff --git a/.classpath b/.classpath
index 1b824bc..9f6d4ec 100644
--- a/.classpath
+++ b/.classpath
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="src" path="acctest"/>
 	<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"/>
@@ -10,5 +9,6 @@
 	</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"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
index b778d78..836b004 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ build/
 doc/
 FitNesseRoot/FitNesse/UserGuide/
 fitnesse/FitNesseRoot/files
+fitnesse/fitnesse-results
 jar/
 *.zip
 *.swp
diff --git a/fitnesse/FitNesseRoot/LispInterpreter/SetUp.wiki b/fitnesse/FitNesseRoot/LispInterpreter/SetUp.wiki
index 71d1164..efb4cee 100644
--- a/fitnesse/FitNesseRoot/LispInterpreter/SetUp.wiki
+++ b/fitnesse/FitNesseRoot/LispInterpreter/SetUp.wiki
@@ -1,8 +1,8 @@
 ---
 Test
 ---
-| import  |
-| fixture |
+| import             |
+| acceptance.fixture |
 
 | script | lisp interpreter fixture |
 | reset                             |
diff --git a/fitnesse/FitNesseRoot/RecentChanges.wiki b/fitnesse/FitNesseRoot/RecentChanges.wiki
index d3421b5..ede3c2c 100644
--- a/fitnesse/FitNesseRoot/RecentChanges.wiki
+++ b/fitnesse/FitNesseRoot/RecentChanges.wiki
@@ -1,5 +1,5 @@
+|LispInterpreter.SetUp||15:09:12 Thu, Mar 02, 2017|
 |LispInterpreter.MultipleMethodClosure||16:02:22 Wed, Mar 01, 2017|
-|LispInterpreter.SetUp||11:04:36 Wed, Mar 01, 2017|
 |LispInterpreter.LexicalClosures||12:10:13 Mon, Feb 27, 2017|
 |LispInterpreter.TestClosure||11:24:27 Mon, Feb 27, 2017|
 |LispInterpreter.TestOne||09:26:08 Fri, Feb 24, 2017|
diff --git a/src/function/ArgumentValidator.java b/src/function/ArgumentValidator.java
index 96a1a78..79628dd 100644
--- a/src/function/ArgumentValidator.java
+++ b/src/function/ArgumentValidator.java
@@ -40,7 +40,7 @@ public class ArgumentValidator {
         this.firstArgumentType = argumentType;
         this.trailingArgumentType = argumentType;
     }
-    
+
     public void setFirstArgumentExcludedType(Class<? extends SExpression> argumentType) {
         this.excludedFirstArgumentType = argumentType;
     }
@@ -52,7 +52,7 @@ public class ArgumentValidator {
     public void setEveryArgumentExcludedType(Class<? extends SExpression> argumentType) {
         this.excludedFirstArgumentType = argumentType;
         this.excludedTrailingArgumentType = argumentType;
-    } 
+    }
 
     public void setMaximumNumberOfArguments(int maximumNumberOfArguments) {
         this.maximumNumberOfArguments = BigInteger.valueOf(maximumNumberOfArguments);
diff --git a/test/acceptance/FitNesseRunnerTester.java b/test/acceptance/FitNesseRunnerTester.java
new file mode 100644
index 0000000..49c3426
--- /dev/null
+++ b/test/acceptance/FitNesseRunnerTester.java
@@ -0,0 +1,11 @@
+package acceptance;
+
+import org.junit.runner.RunWith;
+
+import fitnesse.junit.FitNesseRunner;
+
+@RunWith(FitNesseRunner.class)
+@FitNesseRunner.Suite("LispInterpreter")
+@FitNesseRunner.FitnesseDir("fitnesse")
+@FitNesseRunner.OutputDir("fitnesse/fitnesse-results")
+public class FitNesseRunnerTester {}
diff --git a/acctest/fixture/LispInterpreterFixture.java b/test/acceptance/fixture/LispInterpreterFixture.java
similarity index 97%
rename from acctest/fixture/LispInterpreterFixture.java
rename to test/acceptance/fixture/LispInterpreterFixture.java
index 0449d42..e6fb6b5 100644
--- a/acctest/fixture/LispInterpreterFixture.java
+++ b/test/acceptance/fixture/LispInterpreterFixture.java
@@ -1,4 +1,4 @@
-package fixture;
+package acceptance.fixture;
 
 import java.io.*;