diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAndAppendLastRow/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAndAppendLastRow/content.txt index 6d9cd40..c3b94a3 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAndAppendLastRow/content.txt +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAndAppendLastRow/content.txt @@ -1,12 +1,12 @@ -There are cases when you want to copy and append the last row of your column or row fixture certain number of times. - -For Ex: We make a query to the database and it return certain record 'n' number of times. Instead of writing the same record 'n' number of times in your fitnesse page, you can just specify that you expect the last column 'n' number of times using the !-CopyAndAppendLastRow-! decorator. - -!|Copy and Append Last Row|100|number of times| -|Division| -|numerator|denominator|quotient()| -|10|2|5| -|12.6|3|4.2| -|100|4|25| - -In the above example, we want to divide 100 by 4 101 times. +There are cases when you want to copy and append the last row of your column or row fixture certain number of times. + +For Ex: We make a query to the database and it return certain record 'n' number of times. Instead of writing the same record 'n' number of times in your fitnesse page, you can just specify that you expect the last column 'n' number of times using the !-CopyAndAppendLastRow-! decorator. + +!|Copy and Append Last Row|100|number of times| +|Division| +|numerator|denominator|quotient()| +|10|2|5| +|12.6|3|4.2| +|100|4|25| + +In the above example, we want to divide 100 by 4 101 times. diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAndAppendLastRow/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAndAppendLastRow/properties.xml index 4646681..11ec60d 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAndAppendLastRow/properties.xml +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAndAppendLastRow/properties.xml @@ -1,13 +1,13 @@ - - - - - 20061216213113 - - - - - 1166322673244 - - 524008525574625139 - + + + + + 20061216213113 + + + + + 1166322673244 + + 524008525574625139 + diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAppendLastRowAndIncrementColumnValues/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAppendLastRowAndIncrementColumnValues/content.txt index 58c220f..2f3a42e 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAppendLastRowAndIncrementColumnValues/content.txt +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAppendLastRowAndIncrementColumnValues/content.txt @@ -1,12 +1,12 @@ -What if you want to call the fixture 'n' times with the same row except you want to update one or two column's value? - -Ex: If you are using fitnesse fixtures to populate database and you want to insert a record 500 times. It would be easy to write one model record and insert that 500 times. This can be easily done with the !-CopyAndAppendLastRow-! decorator. But the database table might have a primary key. So you might want to update the primary key in each row. Now you might want to pipe !-IncrementColumnsValue-! and !-CopyAndAppendLastRow-! decorators to get the job done. - -Here is an example where I want to divide 5 by 1, 100 times, but I also want to update the numerator by 5 and denominator by 1. - -!|Copy and Append Last Row|100|times| -|Increment Columns Value|numerator|of type|int|by|5| -|Increment Columns Value|denominator|of type|int|by|1| -|Division| -|numerator|denominator|quotient()| -|5|1|5| +What if you want to call the fixture 'n' times with the same row except you want to update one or two column's value? + +Ex: If you are using fitnesse fixtures to populate database and you want to insert a record 500 times. It would be easy to write one model record and insert that 500 times. This can be easily done with the !-CopyAndAppendLastRow-! decorator. But the database table might have a primary key. So you might want to update the primary key in each row. Now you might want to pipe !-IncrementColumnsValue-! and !-CopyAndAppendLastRow-! decorators to get the job done. + +Here is an example where I want to divide 5 by 1, 100 times, but I also want to update the numerator by 5 and denominator by 1. + +!|Copy and Append Last Row|100|times| +|Increment Columns Value|numerator|of type|int|by|5| +|Increment Columns Value|denominator|of type|int|by|1| +|Division| +|numerator|denominator|quotient()| +|5|1|5| diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAppendLastRowAndIncrementColumnValues/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAppendLastRowAndIncrementColumnValues/properties.xml index 248425b..6c8103c 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAppendLastRowAndIncrementColumnValues/properties.xml +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAppendLastRowAndIncrementColumnValues/properties.xml @@ -1,13 +1,13 @@ - - - - - 20061216215829 - - - - - 1166324308994 - - -8528063939302055872 - + + + + + 20061216215829 + + + + + 1166324308994 + + -8528063939302055872 + diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/SetUp/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/SetUp/content.txt index 6bf4596..8327a35 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/SetUp/content.txt +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/SetUp/content.txt @@ -1,4 +1,4 @@ -!|Import| -|fit.decorator| -|fit.decorator.performance| -|eg| +!|Import| +|fit.decorator| +|fit.decorator.performance| +|eg| diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/SetUp/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/SetUp/properties.xml index 47bf822..e92b349 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/SetUp/properties.xml +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/SetUp/properties.xml @@ -1,14 +1,14 @@ - - - true - true - 20061216183948 - true - true - true - true - true - true - 1166312388007 - -6757238585913794424 - + + + true + true + 20061216183948 + true + true + true + true + true + true + 1166312388007 + -6757238585913794424 + diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TearDown/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TearDown/content.txt index 7931d99..c69b2ee 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TearDown/content.txt +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TearDown/content.txt @@ -1 +1 @@ -!|fit.Summary| +!|fit.Summary| diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TearDown/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TearDown/properties.xml index b7f5c22..e825712 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TearDown/properties.xml +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TearDown/properties.xml @@ -1,14 +1,14 @@ - - - true - true - 20061216141632 - true - true - true - true - true - true - 1166296592283 - -5128325404176707243 - + + + true + true + 20061216141632 + true + true + true + true + true + true + 1166296592283 + -5128325404176707243 + diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/TestPage/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/TestPage/content.txt index b10df64..4aba643 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/TestPage/content.txt +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/TestPage/content.txt @@ -1,145 +1,145 @@ -!define TEST_SYSTEM {slim} - -!| import | -| fitnesse.slim.test | - - -Test Strings by plain compare, neither custom compare nor regular expression. -In this case detailed diff is wanted. - -| Detailed Diff | -| actual string | expected string? | #comment | -| abc | abc | equal | -| abc | xyz | completly different | -| abc | xbc | first char different | -| abc | ayc | middle char different | -| abc | abz | last char different | -| | xyz | actual empty, expected filled | -| abc | | actual filled, expected empty; will be counted as ignored | -| <&> | <&> | equal with HTML special chars | -| <&> | xyz | completly different with HTML special chars | -| <&> | x&> | first char different with HTML special chars | -| <&> | | middle char different with HTML special chars | -| <&> | <&z | last char differentwith HTML special chars | -| | <&> | actual empty, expected filled with HTML special chars | -| abc | <&> | completly different with HTML special chars | -| abc | | last char different with HTML special chars | -| Hello World | Wellcome Lord | no obvious match | - -Test Strings by regular expression. -In this case no detailed diff is wanted. - -| Detailed Diff | -| actual string | expected string? | #comment | -| abc | =~/abc/ | match | -| abc | =~/a.c/ | match | -| abc | =~/\w+/ | match | -| abc | =~/\w{3}/ | match | -| abc | =~/^\w{3}$/ | match | -| abc | =~/\w{1}/ | match | -| abc | =~/^\w{1}$/ | no match | -| abc | =~/[ABC]+/ | no match | -| abc | =~/[ABC]+/i | wrong syntax, disable value comparison, use string comparison | - - -Test integers by string comparison. -In this case detailed diff ist wanted. - -| Detailed Diff | -| actual int | expected int? | #comment | -| 1 | 1 | equal | -| 1 | 2 | completly different | -| 1 | 10 | partially different | -| | 1 | completly different | - -Test integers by value comparison, see =1 | ok | -| 1 | <2 | ok | -| 1 | >1 | nok | -| 1 | =1 | ok | -| 1 | <1 | nok | -| 1 | 0<_<2 | ok | -| 1 | 2<_<0 | nok, logically wrong | -| 1 | 0>_>2 | wrong syntax, disable value comparison, use string comparison | -| 1 | 2>_>0 | wrong syntax, disable value comparison, use string comparison | - - -Test doubles by string comparison. -In this case detailed diff ist wanted. - -| Detailed Diff | -| actual double | expected double? | #comment | -| 1.0 | 1.0 | equal | -| 1.1 | 222 | completly different | -| 1.0 | 10 | partially different | -| | 1.0 | partially different | - -Test doubles by value comparison, see =1 | ok | -| 1 | <2 | ok | -| 1 | >1 | nok | -| 1 | =1 | ok | -| 1 | <1 | nok | -| 1 | 0<_<2 | ok | -| 1 | 2<_<0 | nok, logically wrong | -| 1 | 0>_>2 | wrong syntax, disable value comparison, use string comparison | -| 1 | 2>_>0 | wrong syntax, disable value comparison, use string comparison | -| 1.0 | ~=1 | ok | -| 1.1 | ~=1 | ok | -| 0.9 | ~=1 | ok | -| 1.0 | ~=1.0 | ok | -| 1.1 | ~=1.0 | nok | -| 0.9 | ~=1.0 | nok | - - -Test symbols by string comparison. - -| Detailed Diff | -| actual symbol | expected symbol? | #comment | -| abc | $symbol= | | -| $symbol | abc | | -| $symbol | xyz | | -| $symbol | xbc | | -| $symbol | ayc | | -| $symbol | abz | | -| abc | $symbol | | -| xyz | $symbol | | -| xbc | $symbol | | -| ayc | $symbol | | -| abz | $symbol | | -| | $symbol | | - - -Test custom comparator, see FitNesse.UserGuide.AdministeringFitNesse.ConfigurationFile -The inverse comparator fitnesse.slim.test.InverseComparator negates the method String.equals(String). - -| script | Detailed Diff | -| note | everything not equals to 'abc' is ok | -| check | echo | abc | inverse:xyz | -| note | everything not equals to 'abc' is ok | -| check | echo | abc | inverse:ABC | -| note | everthing not equals to 'abc' is ok | -| check | echo | abc | inverse:cba | -| note | only 'abc' is nok | -| check | echo | abc | inverse:abc | - - -Test Scenario and Script - -!| Scenario | Detailed Diff Scenario Test | -| start | Detailed Diff | -| check | echo | hello | hello | -| check | echo | hello | hallo | - -!| Script | -| Detailed Diff Scenario Test | +!define TEST_SYSTEM {slim} + +!| import | +| fitnesse.slim.test | + + +Test Strings by plain compare, neither custom compare nor regular expression. +In this case detailed diff is wanted. + +| Detailed Diff | +| actual string | expected string? | #comment | +| abc | abc | equal | +| abc | xyz | completly different | +| abc | xbc | first char different | +| abc | ayc | middle char different | +| abc | abz | last char different | +| | xyz | actual empty, expected filled | +| abc | | actual filled, expected empty; will be counted as ignored | +| <&> | <&> | equal with HTML special chars | +| <&> | xyz | completly different with HTML special chars | +| <&> | x&> | first char different with HTML special chars | +| <&> | | middle char different with HTML special chars | +| <&> | <&z | last char differentwith HTML special chars | +| | <&> | actual empty, expected filled with HTML special chars | +| abc | <&> | completly different with HTML special chars | +| abc | | last char different with HTML special chars | +| Hello World | Wellcome Lord | no obvious match | + +Test Strings by regular expression. +In this case no detailed diff is wanted. + +| Detailed Diff | +| actual string | expected string? | #comment | +| abc | =~/abc/ | match | +| abc | =~/a.c/ | match | +| abc | =~/\w+/ | match | +| abc | =~/\w{3}/ | match | +| abc | =~/^\w{3}$/ | match | +| abc | =~/\w{1}/ | match | +| abc | =~/^\w{1}$/ | no match | +| abc | =~/[ABC]+/ | no match | +| abc | =~/[ABC]+/i | wrong syntax, disable value comparison, use string comparison | + + +Test integers by string comparison. +In this case detailed diff ist wanted. + +| Detailed Diff | +| actual int | expected int? | #comment | +| 1 | 1 | equal | +| 1 | 2 | completly different | +| 1 | 10 | partially different | +| | 1 | completly different | + +Test integers by value comparison, see =1 | ok | +| 1 | <2 | ok | +| 1 | >1 | nok | +| 1 | =1 | ok | +| 1 | <1 | nok | +| 1 | 0<_<2 | ok | +| 1 | 2<_<0 | nok, logically wrong | +| 1 | 0>_>2 | wrong syntax, disable value comparison, use string comparison | +| 1 | 2>_>0 | wrong syntax, disable value comparison, use string comparison | + + +Test doubles by string comparison. +In this case detailed diff ist wanted. + +| Detailed Diff | +| actual double | expected double? | #comment | +| 1.0 | 1.0 | equal | +| 1.1 | 222 | completly different | +| 1.0 | 10 | partially different | +| | 1.0 | partially different | + +Test doubles by value comparison, see =1 | ok | +| 1 | <2 | ok | +| 1 | >1 | nok | +| 1 | =1 | ok | +| 1 | <1 | nok | +| 1 | 0<_<2 | ok | +| 1 | 2<_<0 | nok, logically wrong | +| 1 | 0>_>2 | wrong syntax, disable value comparison, use string comparison | +| 1 | 2>_>0 | wrong syntax, disable value comparison, use string comparison | +| 1.0 | ~=1 | ok | +| 1.1 | ~=1 | ok | +| 0.9 | ~=1 | ok | +| 1.0 | ~=1.0 | ok | +| 1.1 | ~=1.0 | nok | +| 0.9 | ~=1.0 | nok | + + +Test symbols by string comparison. + +| Detailed Diff | +| actual symbol | expected symbol? | #comment | +| abc | $symbol= | | +| $symbol | abc | | +| $symbol | xyz | | +| $symbol | xbc | | +| $symbol | ayc | | +| $symbol | abz | | +| abc | $symbol | | +| xyz | $symbol | | +| xbc | $symbol | | +| ayc | $symbol | | +| abz | $symbol | | +| | $symbol | | + + +Test custom comparator, see FitNesse.UserGuide.AdministeringFitNesse.ConfigurationFile +The inverse comparator fitnesse.slim.test.InverseComparator negates the method String.equals(String). + +| script | Detailed Diff | +| note | everything not equals to 'abc' is ok | +| check | echo | abc | inverse:xyz | +| note | everything not equals to 'abc' is ok | +| check | echo | abc | inverse:ABC | +| note | everthing not equals to 'abc' is ok | +| check | echo | abc | inverse:cba | +| note | only 'abc' is nok | +| check | echo | abc | inverse:abc | + + +Test Scenario and Script + +!| Scenario | Detailed Diff Scenario Test | +| start | Detailed Diff | +| check | echo | hello | hello | +| check | echo | hello | hallo | + +!| Script | +| Detailed Diff Scenario Test | diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/TestPage/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/TestPage/properties.xml index 8109798..ecd29df 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/TestPage/properties.xml +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/TestPage/properties.xml @@ -1,13 +1,13 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/content.txt index fa4783d..640ac1c 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/content.txt +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/content.txt @@ -1,230 +1,230 @@ -!define TEST_SYSTEM {slim} - -!3 Diff of failed tests - -!4 Original intentionally failing tests - -The subordinate page >TestPage collects the following tests. The page is disabled because of many tests fails intentionally. It is useful for manual tests only. - -!4 Test wrapper for test - -!*> Tests for type string - -!| script | -|given page|TestPage|with content|${SUT_PATH} !- -!define TEST_SYSTEM {slim} - -!| import | -| fitnesse.slim.test | - -Test Strings by plain compare, neither custom compare nor regular expression. -In this case detailed diff is wanted. - -| Detailed Diff | -| actual string | expected string? | #comment | -| abc | abc | equal | -| abc | xyz | completly different | -| abc | xbc | first char different | -| abc | ayc | middle char different | -| abc | abz | last char different | -| | xyz | actual empty, expected filled | -| abc | | actual filled, expected empty; will be counted as ignored | -| <&> | <&> | equal with HTML special chars | -| <&> | xyz | completly different with HTML special chars | -| <&> | x&> | first char different with HTML special chars | -| <&> | | middle char different with HTML special chars | -| <&> | <&z | last char differentwith HTML special chars | -| | <&> | actual empty, expected filled with HTML special chars | -| abc | <&> | completly different with HTML special chars | -| abc | | last char different with HTML special chars | -| Hello World | Wellcome Lord | no obvious match | - -Test Strings by regular expression. -In this case no detailed diff is wanted. - -| Detailed Diff | -| actual string | expected string? | #comment | -| abc | =~/abc/ | match | -| abc | =~/a.c/ | match | -| abc | =~/\w+/ | match | -| abc | =~/\w{3}/ | match | -| abc | =~/^\w{3}$/ | match | -| abc | =~/\w{1}/ | match | -| abc | =~/^\w{1}$/ | no match | -| abc | =~/[ABC]+/ | no match | -| abc | =~/[ABC]+/i | wrong syntax, disable value comparison, use string comparison | --!| -|test results for page|TestPage|should contain|!-abc-!| -|test results for page|TestPage|should contain|!-[abc] expected [xyz]-!| -|test results for page|TestPage|should contain|!-[abc] expected [xbc]-!| -|test results for page|TestPage|should contain|!-[abc] expected [ayc]-!| -|test results for page|TestPage|should contain|!-[abc] expected [abz]-!| -|test results for page|TestPage|should contain|!-[] expected [xyz]-!| -|test results for page|TestPage|should contain|!-[Hello World] expected [Wellcome Lord]-!| -*! - -!*> Tests for type int - -!| script | -|given page|TestPage|with content|${SUT_PATH} !- -!define TEST_SYSTEM {slim} - -!| import | -| fitnesse.slim.test | - -Test integers by string comparison. -In this case detailed diff ist wanted. - -| Detailed Diff | -| actual int | expected int? | #comment | -| 1 | 1 | equal | -| 1 | 2 | completly different | -| 1 | 10 | partially different | -| | 1 | completly different | - -Test integers by value comparison, see =1 | ok | -| 1 | <2 | ok | -| 1 | >1 | nok | -| 1 | =1 | ok | -| 1 | <1 | nok | -| 1 | 0<_<2 | ok | -| 1 | 2<_<0 | nok, logically wrong | -| 1 | 0>_>2 | wrong syntax, disable value comparison, use string comparison | -| 1 | 2>_>0 | wrong syntax, disable value comparison, use string comparison | --!| -|test results for page|TestPage|should contain|| -*! - -!*> Tests for type double - -!| script | -|given page|TestPage|with content|${SUT_PATH} !- -!define TEST_SYSTEM {slim} - -!| import | -| fitnesse.slim.test | - -Test doubles by string comparison. -In this case detailed diff ist wanted. - -| Detailed Diff | -| actual double | expected double? | #comment | -| 1.0 | 1.0 | equal | -| 1.1 | 222 | completly different | -| 1.0 | 10 | partially different | -| | 1.0 | partially different | - -Test doubles by value comparison, see =1 | ok | -| 1 | <2 | ok | -| 1 | >1 | nok | -| 1 | =1 | ok | -| 1 | <1 | nok | -| 1 | 0<_<2 | ok | -| 1 | 2<_<0 | nok, logically wrong | -| 1 | 0>_>2 | wrong syntax, disable value comparison, use string comparison | -| 1 | 2>_>0 | wrong syntax, disable value comparison, use string comparison | -| 1.0 | ~=1 | ok | -| 1.1 | ~=1 | ok | -| 0.9 | ~=1 | ok | -| 1.0 | ~=1.0 | ok | -| 1.1 | ~=1.0 | nok | -| 0.9 | ~=1.0 | nok | --!| -|test results for page|TestPage|should contain|| -*! - -!*> Tests of fitnesse symbols - -!| script | -|given page|TestPage|with content|${SUT_PATH} !- -!define TEST_SYSTEM {slim} - -!| import | -| fitnesse.slim.test | -Test symbols by string comparison. - -| Detailed Diff | -| actual symbol | expected symbol? | #comment | -| abc | $symbol= | | -| $symbol | abc | | -| $symbol | xyz | | -| $symbol | xbc | | -| $symbol | ayc | | -| $symbol | abz | | -| abc | $symbol | | -| xyz | $symbol | | -| xbc | $symbol | | -| ayc | $symbol | | -| abz | $symbol | | -| | $symbol | | --!| -|test results for page|TestPage|should contain|!-abc-!| -|test results for page|TestPage|should contain|!-[abc] expected [xyz]-!| -|test results for page|TestPage|should contain|!-[abc] expected [xbc]-!| -|test results for page|TestPage|should contain|!-[abc] expected [ayc]-!| -|test results for page|TestPage|should contain|!-[abc] expected [abz]-!| -|test results for page|TestPage|should contain|!-<span class="pass">$symbol->[abc]</span>-!| -|test results for page|TestPage|should contain|!-[xyz] expected [$symbol->[abc]]-!| -|test results for page|TestPage|should contain|!-[xbc] expected [$symbol->[abc]]-!| -|test results for page|TestPage|should contain|!-[ayc] expected [$symbol->[abc]]-!| -|test results for page|TestPage|should contain|!-[abz] expected [$symbol->[abc]]-!| -|test results for page|TestPage|should contain|!-[] expected [$symbol->[abc]]-!| -*! - -!*> Tests of custom comparator - -!| script | -|given page|TestPage|with content|${SUT_PATH} !- -!define TEST_SYSTEM {slim} - -!| import | -| fitnesse.slim.test | -Test custom comparator, see FitNesse.UserGuide.AdministeringFitNesse.ConfigurationFile -The inverse comparator fitnesse.slim.test.InverseComparator negates the method String.equals(String). - -| script | Detailed Diff | -| note | everything not equals to 'abc' is ok | -| check | echo | abc | inverse:xyz | -| note | everything not equals to 'abc' is ok | -| check | echo | abc | inverse:ABC | -| note | everthing not equals to 'abc' is ok | -| check | echo | abc | inverse:cba | -| note | only 'abc' is nok | -| check | echo | abc | inverse:abc | --!| -|test results for page|TestPage|should contain|| -*! - -!*> Tests of scenario - -!| script | -|given page|TestPage|with content|${SUT_PATH} !- -!define TEST_SYSTEM {slim} - -!| import | -| fitnesse.slim.test | -Test Scenario and Script - -!| Scenario | Detailed Diff Scenario Test | -| start | Detailed Diff | -| check | echo | hello | hello | -| check | echo | hello | hallo | - -!| Script | -| Detailed Diff Scenario Test | --!| -|test results for page|TestPage|should contain|!-hello-!| -|test results for page|TestPage|should contain|!-[hello] expected [hallo]-!| -*! +!define TEST_SYSTEM {slim} + +!3 Diff of failed tests + +!4 Original intentionally failing tests + +The subordinate page >TestPage collects the following tests. The page is disabled because of many tests fails intentionally. It is useful for manual tests only. + +!4 Test wrapper for test + +!*> Tests for type string + +!| script | +|given page|TestPage|with content|${SUT_PATH} !- +!define TEST_SYSTEM {slim} + +!| import | +| fitnesse.slim.test | + +Test Strings by plain compare, neither custom compare nor regular expression. +In this case detailed diff is wanted. + +| Detailed Diff | +| actual string | expected string? | #comment | +| abc | abc | equal | +| abc | xyz | completly different | +| abc | xbc | first char different | +| abc | ayc | middle char different | +| abc | abz | last char different | +| | xyz | actual empty, expected filled | +| abc | | actual filled, expected empty; will be counted as ignored | +| <&> | <&> | equal with HTML special chars | +| <&> | xyz | completly different with HTML special chars | +| <&> | x&> | first char different with HTML special chars | +| <&> | | middle char different with HTML special chars | +| <&> | <&z | last char differentwith HTML special chars | +| | <&> | actual empty, expected filled with HTML special chars | +| abc | <&> | completly different with HTML special chars | +| abc | | last char different with HTML special chars | +| Hello World | Wellcome Lord | no obvious match | + +Test Strings by regular expression. +In this case no detailed diff is wanted. + +| Detailed Diff | +| actual string | expected string? | #comment | +| abc | =~/abc/ | match | +| abc | =~/a.c/ | match | +| abc | =~/\w+/ | match | +| abc | =~/\w{3}/ | match | +| abc | =~/^\w{3}$/ | match | +| abc | =~/\w{1}/ | match | +| abc | =~/^\w{1}$/ | no match | +| abc | =~/[ABC]+/ | no match | +| abc | =~/[ABC]+/i | wrong syntax, disable value comparison, use string comparison | +-!| +|test results for page|TestPage|should contain|!-abc-!| +|test results for page|TestPage|should contain|!-[abc] expected [xyz]-!| +|test results for page|TestPage|should contain|!-[abc] expected [xbc]-!| +|test results for page|TestPage|should contain|!-[abc] expected [ayc]-!| +|test results for page|TestPage|should contain|!-[abc] expected [abz]-!| +|test results for page|TestPage|should contain|!-[] expected [xyz]-!| +|test results for page|TestPage|should contain|!-[Hello World] expected [Wellcome Lord]-!| +*! + +!*> Tests for type int + +!| script | +|given page|TestPage|with content|${SUT_PATH} !- +!define TEST_SYSTEM {slim} + +!| import | +| fitnesse.slim.test | + +Test integers by string comparison. +In this case detailed diff ist wanted. + +| Detailed Diff | +| actual int | expected int? | #comment | +| 1 | 1 | equal | +| 1 | 2 | completly different | +| 1 | 10 | partially different | +| | 1 | completly different | + +Test integers by value comparison, see =1 | ok | +| 1 | <2 | ok | +| 1 | >1 | nok | +| 1 | =1 | ok | +| 1 | <1 | nok | +| 1 | 0<_<2 | ok | +| 1 | 2<_<0 | nok, logically wrong | +| 1 | 0>_>2 | wrong syntax, disable value comparison, use string comparison | +| 1 | 2>_>0 | wrong syntax, disable value comparison, use string comparison | +-!| +|test results for page|TestPage|should contain|| +*! + +!*> Tests for type double + +!| script | +|given page|TestPage|with content|${SUT_PATH} !- +!define TEST_SYSTEM {slim} + +!| import | +| fitnesse.slim.test | + +Test doubles by string comparison. +In this case detailed diff ist wanted. + +| Detailed Diff | +| actual double | expected double? | #comment | +| 1.0 | 1.0 | equal | +| 1.1 | 222 | completly different | +| 1.0 | 10 | partially different | +| | 1.0 | partially different | + +Test doubles by value comparison, see =1 | ok | +| 1 | <2 | ok | +| 1 | >1 | nok | +| 1 | =1 | ok | +| 1 | <1 | nok | +| 1 | 0<_<2 | ok | +| 1 | 2<_<0 | nok, logically wrong | +| 1 | 0>_>2 | wrong syntax, disable value comparison, use string comparison | +| 1 | 2>_>0 | wrong syntax, disable value comparison, use string comparison | +| 1.0 | ~=1 | ok | +| 1.1 | ~=1 | ok | +| 0.9 | ~=1 | ok | +| 1.0 | ~=1.0 | ok | +| 1.1 | ~=1.0 | nok | +| 0.9 | ~=1.0 | nok | +-!| +|test results for page|TestPage|should contain|| +*! + +!*> Tests of fitnesse symbols + +!| script | +|given page|TestPage|with content|${SUT_PATH} !- +!define TEST_SYSTEM {slim} + +!| import | +| fitnesse.slim.test | +Test symbols by string comparison. + +| Detailed Diff | +| actual symbol | expected symbol? | #comment | +| abc | $symbol= | | +| $symbol | abc | | +| $symbol | xyz | | +| $symbol | xbc | | +| $symbol | ayc | | +| $symbol | abz | | +| abc | $symbol | | +| xyz | $symbol | | +| xbc | $symbol | | +| ayc | $symbol | | +| abz | $symbol | | +| | $symbol | | +-!| +|test results for page|TestPage|should contain|!-abc-!| +|test results for page|TestPage|should contain|!-[abc] expected [xyz]-!| +|test results for page|TestPage|should contain|!-[abc] expected [xbc]-!| +|test results for page|TestPage|should contain|!-[abc] expected [ayc]-!| +|test results for page|TestPage|should contain|!-[abc] expected [abz]-!| +|test results for page|TestPage|should contain|!-<span class="pass">$symbol->[abc]</span>-!| +|test results for page|TestPage|should contain|!-[xyz] expected [$symbol->[abc]]-!| +|test results for page|TestPage|should contain|!-[xbc] expected [$symbol->[abc]]-!| +|test results for page|TestPage|should contain|!-[ayc] expected [$symbol->[abc]]-!| +|test results for page|TestPage|should contain|!-[abz] expected [$symbol->[abc]]-!| +|test results for page|TestPage|should contain|!-[] expected [$symbol->[abc]]-!| +*! + +!*> Tests of custom comparator + +!| script | +|given page|TestPage|with content|${SUT_PATH} !- +!define TEST_SYSTEM {slim} + +!| import | +| fitnesse.slim.test | +Test custom comparator, see FitNesse.UserGuide.AdministeringFitNesse.ConfigurationFile +The inverse comparator fitnesse.slim.test.InverseComparator negates the method String.equals(String). + +| script | Detailed Diff | +| note | everything not equals to 'abc' is ok | +| check | echo | abc | inverse:xyz | +| note | everything not equals to 'abc' is ok | +| check | echo | abc | inverse:ABC | +| note | everthing not equals to 'abc' is ok | +| check | echo | abc | inverse:cba | +| note | only 'abc' is nok | +| check | echo | abc | inverse:abc | +-!| +|test results for page|TestPage|should contain|| +*! + +!*> Tests of scenario + +!| script | +|given page|TestPage|with content|${SUT_PATH} !- +!define TEST_SYSTEM {slim} + +!| import | +| fitnesse.slim.test | +Test Scenario and Script + +!| Scenario | Detailed Diff Scenario Test | +| start | Detailed Diff | +| check | echo | hello | hello | +| check | echo | hello | hallo | + +!| Script | +| Detailed Diff Scenario Test | +-!| +|test results for page|TestPage|should contain|!-hello-!| +|test results for page|TestPage|should contain|!-[hello] expected [hallo]-!| +*! diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/properties.xml index 6ca0af3..55bd9cd 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/properties.xml +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestDetailedDiff/properties.xml @@ -1,12 +1,12 @@ - - -true -true -true -true -true -true -true -true -true - + + +true +true +true +true +true +true +true +true +true + diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/content.txt index d666fa1..ed204d1 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/content.txt +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/content.txt @@ -1,33 +1,33 @@ -|import | -|fitnesse.slim.test| - - -There was a bug in the Scenario selection process that caused a scenario with no inputs to be selected when it should have been method on the driver class. This happened because the !-ScenarioTable-! class was enhanced to try all rows as parameterized. So it took "login" and tried "login _ ". This resulted in the "login" scenario being used instead of the "loginWithUsernameAndPassword" method when "connect as with" scenario was called. This page demonstrates the fix. - - -!2 Scenario with no arguments and a shared root -!|scenario |login | -|connect to server| - -!2 -!|scenario |connect as|username |with|password| -|login with username|@username |and Password|@password | - - -!2 Scenario With one argument and a shared root. -!|scenario |login with|name| -|connect to server as|@name | - - -!2 Now calling a scenario that does take arguments, but since it isn't in parameterized format, the scenario with an argument isn't called, even though it shares a common root. -!|scenario |connect as|username |with|password| -|login with username|@username |and Password|@password | - - - - -!|script | -|start |Login Dialog Driver|bob |xyzz| -|connect as|bob |with|xyzz| - - +|import | +|fitnesse.slim.test| + + +There was a bug in the Scenario selection process that caused a scenario with no inputs to be selected when it should have been method on the driver class. This happened because the !-ScenarioTable-! class was enhanced to try all rows as parameterized. So it took "login" and tried "login _ ". This resulted in the "login" scenario being used instead of the "loginWithUsernameAndPassword" method when "connect as with" scenario was called. This page demonstrates the fix. + + +!2 Scenario with no arguments and a shared root +!|scenario |login | +|connect to server| + +!2 +!|scenario |connect as|username |with|password| +|login with username|@username |and Password|@password | + + +!2 Scenario With one argument and a shared root. +!|scenario |login with|name| +|connect to server as|@name | + + +!2 Now calling a scenario that does take arguments, but since it isn't in parameterized format, the scenario with an argument isn't called, even though it shares a common root. +!|scenario |connect as|username |with|password| +|login with username|@username |and Password|@password | + + + + +!|script | +|start |Login Dialog Driver|bob |xyzz| +|connect as|bob |with|xyzz| + + diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/properties.xml index 4e908ad..e13fdf4 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/properties.xml +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/properties.xml @@ -1,12 +1,12 @@ - - - true - true - true - true - true - true - true - true - true - + + + true + true + true + true + true + true + true + true + true + diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateAbsoluteSymbolicLink/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateAbsoluteSymbolicLink/content.txt index 0c1ff96..86d613f 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateAbsoluteSymbolicLink/content.txt +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateAbsoluteSymbolicLink/content.txt @@ -1,14 +1,14 @@ -Create an absolute symbolic link from a sub-page: - -First we need to create some pages to play with. -!|Page creator.| -|Page name. |PageContents. |valid?| -|LinkingPage |LINKING PAGE |true | -|LinkingPage.LinkingChild|LINKING CHILD |true | -|LinkedPage |LINKED PAGE |true | -|LinkedPage.LinkedChild |LINKED CHILD |true | - -Now we create a symbolic link named !-SymLink-!. This links !-LinkedPage.LinkedChild-! as a child of !-LinkingPage.LinkingChild-!. -!|Response Requester.| -|uri |status?| -|LinkingPage.LinkingChild?responder=symlink&linkName=SymLink&linkPath=.LinkedPage.LinkedChild|303| +Create an absolute symbolic link from a sub-page: + +First we need to create some pages to play with. +!|Page creator.| +|Page name. |PageContents. |valid?| +|LinkingPage |LINKING PAGE |true | +|LinkingPage.LinkingChild|LINKING CHILD |true | +|LinkedPage |LINKED PAGE |true | +|LinkedPage.LinkedChild |LINKED CHILD |true | + +Now we create a symbolic link named !-SymLink-!. This links !-LinkedPage.LinkedChild-! as a child of !-LinkingPage.LinkingChild-!. +!|Response Requester.| +|uri |status?| +|LinkingPage.LinkingChild?responder=symlink&linkName=SymLink&linkPath=.LinkedPage.LinkedChild|303| diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateAbsoluteSymbolicLink/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateAbsoluteSymbolicLink/properties.xml index 321f386..40a15d7 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateAbsoluteSymbolicLink/properties.xml +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateAbsoluteSymbolicLink/properties.xml @@ -1,10 +1,10 @@ - - - - - 20071209231745 - - - 1197255276583 - -2802271540647210678 - + + + + + 20071209231745 + + + 1197255276583 + -2802271540647210678 + diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateBackwardSymbolicLink/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateBackwardSymbolicLink/content.txt index 236e215..46107f7 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateBackwardSymbolicLink/content.txt +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateBackwardSymbolicLink/content.txt @@ -1,13 +1,13 @@ -Create an absolute symbolic link from a sub-page: - -First we need to create some pages to play with. -!|Page creator.| -|Page name. |PageContents. |valid?| -|LinkingPage |LINKING PAGE |true | -|LinkingPage.LinkingChild|LINKING CHILD |true | -|LinkingPage.LinkedChild |LINKED CHILD |true | - -Now we create a symbolic link named !-SymLink-!. This links !-LinkedPage.LinkedChild-! as a child of !-LinkingPage.LinkingChild-!. -!|Response Requester.| -|uri |status?| -|LinkingPage.LinkingChild?responder=symlink&linkName=SymLink&linkPath= - - - - 20071209231818 - - - 1197255523311 - -2905294764201163185 - + + + + + 20071209231818 + + + 1197255523311 + -2905294764201163185 + diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateNestedBackSymbolicLink/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateNestedBackSymbolicLink/content.txt index 0666d27..2c6e161 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateNestedBackSymbolicLink/content.txt +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateNestedBackSymbolicLink/content.txt @@ -1,15 +1,15 @@ -Create an nested backward symbolic link from a sub-page: - -First we need to create some pages to play with. -!|Page creator.| -|Page name. |PageContents. |valid?| -|LinkingPage |LINKING PAGE |true | -|LinkingPage.LinkingChild |LINKING CHILD |true | -|LinkingPage.LinkingChild.LinkingGrandChild |LINKING GRAND CHILD |true | -|LinkingPage.LinkingChild.LinkingGrandChild.LinkingGreatGrandChild|LINKING GREAT GRAND CHILD |true | -|LinkingPage.LinkingChild.LinkedChild |LINKED CHILD |true | - -Now we create a symbolic link named !-SymLink-!. This links !-LinkedPage.LinkedChild-! as a child of !-LinkingPage.LinkingChild-!. -!|Response Requester.| -|uri |status?| -|LinkingPage.LinkingChild.LinkingGrandChild.LinkingGreatGrandChild?responder=symlink&linkName=SymLink&linkPath= - - - - 20071212153458 - - - 1197318232254 - -6614712250920689672 - + + + + + 20071212153458 + + + 1197318232254 + -6614712250920689672 + diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateRelativeSymbolicLink/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateRelativeSymbolicLink/content.txt index 78d3ef3..0db90fc 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateRelativeSymbolicLink/content.txt +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateRelativeSymbolicLink/content.txt @@ -1,15 +1,15 @@ -Creating a symbolic link is done in the properties view of the page that will contain the link. There is a form where a user supplies a name for the link and a path for the linked page. When submitted the URL has the following form: - -!-http://host/PathToPage?responder=symlink&linkName=&linkPath=-! - -First we need to create some pages to play with. -!|Page creator.| -|Page name.|valid?| -|LinkingPage|true| -|LinkedPage|true| - -Now we create a symbolic link named !-SymLink-!. This links !-LinkedPage-! as a child of !-LinkingPage-!. -!|Response Requester.| -|uri |status?| -|LinkingPage?responder=symlink&linkName=SymLink&linkPath=LinkedPage|303| - +Creating a symbolic link is done in the properties view of the page that will contain the link. There is a form where a user supplies a name for the link and a path for the linked page. When submitted the URL has the following form: + +!-http://host/PathToPage?responder=symlink&linkName=&linkPath=-! + +First we need to create some pages to play with. +!|Page creator.| +|Page name.|valid?| +|LinkingPage|true| +|LinkedPage|true| + +Now we create a symbolic link named !-SymLink-!. This links !-LinkedPage-! as a child of !-LinkingPage-!. +!|Response Requester.| +|uri |status?| +|LinkingPage?responder=symlink&linkName=SymLink&linkPath=LinkedPage|303| + diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateRelativeSymbolicLink/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateRelativeSymbolicLink/properties.xml index cccf3d6..397f67b 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateRelativeSymbolicLink/properties.xml +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateRelativeSymbolicLink/properties.xml @@ -1,10 +1,10 @@ - - - - - 20071209231838 - - - 1197229524174 - 5360217332855886973 - + + + + + 20071209231838 + + + 1197229524174 + 5360217332855886973 + diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateSubPageSymbolicLink/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateSubPageSymbolicLink/content.txt index 1dff5c4..7518a79 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateSubPageSymbolicLink/content.txt +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateSubPageSymbolicLink/content.txt @@ -1,12 +1,12 @@ -Create a symbolic link to a sub-page: - -First we need to create some pages to play with. -!|Page creator.| -|Page name. |PageContents. |valid?| -|LinkingPage |LINKING PAGE |true | -|LinkingPage.LinkedChild |LINKED CHILD |true | - -Now we create a symbolic link named !-SymLink-!. This links !-LinkingPage.LinkedChild-! as a child of !-LinkingPage-!. -!|Response Requester.| -|uri |status?| -|LinkingPage?responder=symlink&linkName=SymLink&linkPath=>LinkedChild|303| +Create a symbolic link to a sub-page: + +First we need to create some pages to play with. +!|Page creator.| +|Page name. |PageContents. |valid?| +|LinkingPage |LINKING PAGE |true | +|LinkingPage.LinkedChild |LINKED CHILD |true | + +Now we create a symbolic link named !-SymLink-!. This links !-LinkingPage.LinkedChild-! as a child of !-LinkingPage-!. +!|Response Requester.| +|uri |status?| +|LinkingPage?responder=symlink&linkName=SymLink&linkPath=>LinkedChild|303| diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateSubPageSymbolicLink/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateSubPageSymbolicLink/properties.xml index 54faed6..c67bf59 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateSubPageSymbolicLink/properties.xml +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateSubPageSymbolicLink/properties.xml @@ -1,14 +1,14 @@ - - - true - true - 20071209210332 - true - true - true - true - true - true - 1197252212825 - 6202123951021509855 - + + + true + true + 20071209210332 + true + true + true + true + true + true + 1197252212825 + 6202123951021509855 + diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/content.txt b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/content.txt index 0f89b13..759f058 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/content.txt +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/content.txt @@ -1,14 +1,14 @@ -!c !3 Symbolic Links - -Symbolic Links allow a user to easily create parent-child links between pages without permanently affecting the wiki structure. One common reason need for Symbolic Links is the the testing of a system on multiple environments. For example, imagine an application that site on top of an Oracle database. Hundreds of FitNesse tests have been written for this application using Oracle settings and then the team is confronted with the need to run the application on !-MySql-!. Getting both databases running under the same suite of tests can be very difficult and may result in duplicating all the tests. With Symbolic Links, the database configurations can be stored in high level pages along with appropriate path elements. Then the high-level pages may symbolically link to the test suite. In this manner one suite of tests can be executed in multiple environments. - - ->TestCreatingRelativeSymbolicLink ->TestCreatingAbsoluteSymbolicLink ->TestCreatingSubPageSymbolicLink ->TestCreatingBackwardSymbolicLink ->TestRemovingSymbolicLink ->TestSymbolicLinkBehavior ----- -All Subpages: +!c !3 Symbolic Links + +Symbolic Links allow a user to easily create parent-child links between pages without permanently affecting the wiki structure. One common reason need for Symbolic Links is the the testing of a system on multiple environments. For example, imagine an application that site on top of an Oracle database. Hundreds of FitNesse tests have been written for this application using Oracle settings and then the team is confronted with the need to run the application on !-MySql-!. Getting both databases running under the same suite of tests can be very difficult and may result in duplicating all the tests. With Symbolic Links, the database configurations can be stored in high level pages along with appropriate path elements. Then the high-level pages may symbolically link to the test suite. In this manner one suite of tests can be executed in multiple environments. + + +>TestCreatingRelativeSymbolicLink +>TestCreatingAbsoluteSymbolicLink +>TestCreatingSubPageSymbolicLink +>TestCreatingBackwardSymbolicLink +>TestRemovingSymbolicLink +>TestSymbolicLinkBehavior +---- +All Subpages: !contents \ No newline at end of file diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/properties.xml index 3b4d24d..3c2058d 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/properties.xml +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/properties.xml @@ -1,12 +1,12 @@ - - - - - 20071209232537 - - - - - 1197260737340 - 159061011507139978 - + + + + + 20071209232537 + + + + + 1197260737340 + 159061011507139978 + diff --git a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestHttpStatus/properties.xml b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestHttpStatus/properties.xml index abb3da8..59a0a7c 100644 --- a/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestHttpStatus/properties.xml +++ b/fitnesse/FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestHttpStatus/properties.xml @@ -1,9 +1,9 @@ - - - - 20071130010014 - - - - - + + + + 20071130010014 + + + + + diff --git a/pom.xml b/pom.xml index 29af419..e13676f 100644 --- a/pom.xml +++ b/pom.xml @@ -9,8 +9,8 @@ 1.2.0 - src - test + src/main + src/test @@ -20,7 +20,7 @@ - test + src/test **/*.java @@ -83,7 +83,7 @@ - main.LispMain + application.LispMain diff --git a/src/main/LispMain.java b/src/main/application/LispMain.java similarity index 99% rename from src/main/LispMain.java rename to src/main/application/LispMain.java index 837af64..91d8837 100644 --- a/src/main/LispMain.java +++ b/src/main/application/LispMain.java @@ -1,4 +1,4 @@ -package main; +package application; import static com.googlecode.lanterna.terminal.IOSafeTerminalAdapter.createRuntimeExceptionConvertingAdapter; import static java.text.MessageFormat.format; diff --git a/src/environment/RuntimeEnvironment.java b/src/main/environment/RuntimeEnvironment.java similarity index 100% rename from src/environment/RuntimeEnvironment.java rename to src/main/environment/RuntimeEnvironment.java diff --git a/src/error/CriticalLineColumnException.java b/src/main/error/CriticalLineColumnException.java similarity index 100% rename from src/error/CriticalLineColumnException.java rename to src/main/error/CriticalLineColumnException.java diff --git a/src/error/CriticalLispException.java b/src/main/error/CriticalLispException.java similarity index 100% rename from src/error/CriticalLispException.java rename to src/main/error/CriticalLispException.java diff --git a/src/error/ErrorManager.java b/src/main/error/ErrorManager.java similarity index 100% rename from src/error/ErrorManager.java rename to src/main/error/ErrorManager.java diff --git a/src/error/LineColumnException.java b/src/main/error/LineColumnException.java similarity index 100% rename from src/error/LineColumnException.java rename to src/main/error/LineColumnException.java diff --git a/src/error/LispException.java b/src/main/error/LispException.java similarity index 100% rename from src/error/LispException.java rename to src/main/error/LispException.java diff --git a/src/error/LispWarning.java b/src/main/error/LispWarning.java similarity index 100% rename from src/error/LispWarning.java rename to src/main/error/LispWarning.java diff --git a/src/file/FilePosition.java b/src/main/file/FilePosition.java similarity index 100% rename from src/file/FilePosition.java rename to src/main/file/FilePosition.java diff --git a/src/file/FilePositionTracker.java b/src/main/file/FilePositionTracker.java similarity index 100% rename from src/file/FilePositionTracker.java rename to src/main/file/FilePositionTracker.java diff --git a/src/function/ArgumentValidator.java b/src/main/function/ArgumentValidator.java similarity index 100% rename from src/function/ArgumentValidator.java rename to src/main/function/ArgumentValidator.java diff --git a/src/function/FunctionNames.java b/src/main/function/FunctionNames.java similarity index 100% rename from src/function/FunctionNames.java rename to src/main/function/FunctionNames.java diff --git a/src/function/LispFunction.java b/src/main/function/LispFunction.java similarity index 100% rename from src/function/LispFunction.java rename to src/main/function/LispFunction.java diff --git a/src/function/LispSpecialFunction.java b/src/main/function/LispSpecialFunction.java similarity index 100% rename from src/function/LispSpecialFunction.java rename to src/main/function/LispSpecialFunction.java diff --git a/src/function/UserDefinedFunction.java b/src/main/function/UserDefinedFunction.java similarity index 100% rename from src/function/UserDefinedFunction.java rename to src/main/function/UserDefinedFunction.java diff --git a/src/function/UserDefinedMacro.java b/src/main/function/UserDefinedMacro.java similarity index 100% rename from src/function/UserDefinedMacro.java rename to src/main/function/UserDefinedMacro.java diff --git a/src/function/UserDefinedSpecialFunction.java b/src/main/function/UserDefinedSpecialFunction.java similarity index 100% rename from src/function/UserDefinedSpecialFunction.java rename to src/main/function/UserDefinedSpecialFunction.java diff --git a/src/function/builtin/APPLY.java b/src/main/function/builtin/APPLY.java similarity index 100% rename from src/function/builtin/APPLY.java rename to src/main/function/builtin/APPLY.java diff --git a/src/function/builtin/BackquoteEvaluator.java b/src/main/function/builtin/BackquoteEvaluator.java similarity index 100% rename from src/function/builtin/BackquoteEvaluator.java rename to src/main/function/builtin/BackquoteEvaluator.java diff --git a/src/function/builtin/EVAL.java b/src/main/function/builtin/EVAL.java similarity index 100% rename from src/function/builtin/EVAL.java rename to src/main/function/builtin/EVAL.java diff --git a/src/function/builtin/EXIT.java b/src/main/function/builtin/EXIT.java similarity index 100% rename from src/function/builtin/EXIT.java rename to src/main/function/builtin/EXIT.java diff --git a/src/function/builtin/FUNCALL.java b/src/main/function/builtin/FUNCALL.java similarity index 100% rename from src/function/builtin/FUNCALL.java rename to src/main/function/builtin/FUNCALL.java diff --git a/src/function/builtin/FUSE.java b/src/main/function/builtin/FUSE.java similarity index 100% rename from src/function/builtin/FUSE.java rename to src/main/function/builtin/FUSE.java diff --git a/src/function/builtin/GENSYM.java b/src/main/function/builtin/GENSYM.java similarity index 100% rename from src/function/builtin/GENSYM.java rename to src/main/function/builtin/GENSYM.java diff --git a/src/function/builtin/LOAD.java b/src/main/function/builtin/LOAD.java similarity index 100% rename from src/function/builtin/LOAD.java rename to src/main/function/builtin/LOAD.java diff --git a/src/function/builtin/PRINT.java b/src/main/function/builtin/PRINT.java similarity index 100% rename from src/function/builtin/PRINT.java rename to src/main/function/builtin/PRINT.java diff --git a/src/function/builtin/SET.java b/src/main/function/builtin/SET.java similarity index 100% rename from src/function/builtin/SET.java rename to src/main/function/builtin/SET.java diff --git a/src/function/builtin/SYMBOLS.java b/src/main/function/builtin/SYMBOLS.java similarity index 100% rename from src/function/builtin/SYMBOLS.java rename to src/main/function/builtin/SYMBOLS.java diff --git a/src/function/builtin/SYMBOL_FUNCTION.java b/src/main/function/builtin/SYMBOL_FUNCTION.java similarity index 100% rename from src/function/builtin/SYMBOL_FUNCTION.java rename to src/main/function/builtin/SYMBOL_FUNCTION.java diff --git a/src/function/builtin/cons/APPEND.java b/src/main/function/builtin/cons/APPEND.java similarity index 100% rename from src/function/builtin/cons/APPEND.java rename to src/main/function/builtin/cons/APPEND.java diff --git a/src/function/builtin/cons/CONS.java b/src/main/function/builtin/cons/CONS.java similarity index 100% rename from src/function/builtin/cons/CONS.java rename to src/main/function/builtin/cons/CONS.java diff --git a/src/function/builtin/cons/FIRST.java b/src/main/function/builtin/cons/FIRST.java similarity index 100% rename from src/function/builtin/cons/FIRST.java rename to src/main/function/builtin/cons/FIRST.java diff --git a/src/function/builtin/cons/LENGTH.java b/src/main/function/builtin/cons/LENGTH.java similarity index 100% rename from src/function/builtin/cons/LENGTH.java rename to src/main/function/builtin/cons/LENGTH.java diff --git a/src/function/builtin/cons/LIST.java b/src/main/function/builtin/cons/LIST.java similarity index 100% rename from src/function/builtin/cons/LIST.java rename to src/main/function/builtin/cons/LIST.java diff --git a/src/function/builtin/cons/REST.java b/src/main/function/builtin/cons/REST.java similarity index 100% rename from src/function/builtin/cons/REST.java rename to src/main/function/builtin/cons/REST.java diff --git a/src/function/builtin/math/DIVIDE.java b/src/main/function/builtin/math/DIVIDE.java similarity index 100% rename from src/function/builtin/math/DIVIDE.java rename to src/main/function/builtin/math/DIVIDE.java diff --git a/src/function/builtin/math/MINUS.java b/src/main/function/builtin/math/MINUS.java similarity index 100% rename from src/function/builtin/math/MINUS.java rename to src/main/function/builtin/math/MINUS.java diff --git a/src/function/builtin/math/MODULO.java b/src/main/function/builtin/math/MODULO.java similarity index 100% rename from src/function/builtin/math/MODULO.java rename to src/main/function/builtin/math/MODULO.java diff --git a/src/function/builtin/math/MULTIPLY.java b/src/main/function/builtin/math/MULTIPLY.java similarity index 100% rename from src/function/builtin/math/MULTIPLY.java rename to src/main/function/builtin/math/MULTIPLY.java diff --git a/src/function/builtin/math/MathFunction.java b/src/main/function/builtin/math/MathFunction.java similarity index 100% rename from src/function/builtin/math/MathFunction.java rename to src/main/function/builtin/math/MathFunction.java diff --git a/src/function/builtin/math/PLUS.java b/src/main/function/builtin/math/PLUS.java similarity index 100% rename from src/function/builtin/math/PLUS.java rename to src/main/function/builtin/math/PLUS.java diff --git a/src/function/builtin/math/REMAINDER.java b/src/main/function/builtin/math/REMAINDER.java similarity index 100% rename from src/function/builtin/math/REMAINDER.java rename to src/main/function/builtin/math/REMAINDER.java diff --git a/src/function/builtin/predicate/ATOM.java b/src/main/function/builtin/predicate/ATOM.java similarity index 100% rename from src/function/builtin/predicate/ATOM.java rename to src/main/function/builtin/predicate/ATOM.java diff --git a/src/function/builtin/predicate/EQ.java b/src/main/function/builtin/predicate/EQ.java similarity index 100% rename from src/function/builtin/predicate/EQ.java rename to src/main/function/builtin/predicate/EQ.java diff --git a/src/function/builtin/predicate/EQUAL.java b/src/main/function/builtin/predicate/EQUAL.java similarity index 100% rename from src/function/builtin/predicate/EQUAL.java rename to src/main/function/builtin/predicate/EQUAL.java diff --git a/src/function/builtin/predicate/GENSYM_EQUAL.java b/src/main/function/builtin/predicate/GENSYM_EQUAL.java similarity index 100% rename from src/function/builtin/predicate/GENSYM_EQUAL.java rename to src/main/function/builtin/predicate/GENSYM_EQUAL.java diff --git a/src/function/builtin/predicate/LISTP.java b/src/main/function/builtin/predicate/LISTP.java similarity index 100% rename from src/function/builtin/predicate/LISTP.java rename to src/main/function/builtin/predicate/LISTP.java diff --git a/src/function/builtin/predicate/NULL.java b/src/main/function/builtin/predicate/NULL.java similarity index 100% rename from src/function/builtin/predicate/NULL.java rename to src/main/function/builtin/predicate/NULL.java diff --git a/src/function/builtin/predicate/NUMERIC_EQUAL.java b/src/main/function/builtin/predicate/NUMERIC_EQUAL.java similarity index 100% rename from src/function/builtin/predicate/NUMERIC_EQUAL.java rename to src/main/function/builtin/predicate/NUMERIC_EQUAL.java diff --git a/src/function/builtin/predicate/NUMERIC_GREATER.java b/src/main/function/builtin/predicate/NUMERIC_GREATER.java similarity index 100% rename from src/function/builtin/predicate/NUMERIC_GREATER.java rename to src/main/function/builtin/predicate/NUMERIC_GREATER.java diff --git a/src/function/builtin/predicate/NUMERIC_LESS.java b/src/main/function/builtin/predicate/NUMERIC_LESS.java similarity index 100% rename from src/function/builtin/predicate/NUMERIC_LESS.java rename to src/main/function/builtin/predicate/NUMERIC_LESS.java diff --git a/src/function/builtin/special/AND.java b/src/main/function/builtin/special/AND.java similarity index 100% rename from src/function/builtin/special/AND.java rename to src/main/function/builtin/special/AND.java diff --git a/src/function/builtin/special/CASE.java b/src/main/function/builtin/special/CASE.java similarity index 100% rename from src/function/builtin/special/CASE.java rename to src/main/function/builtin/special/CASE.java diff --git a/src/function/builtin/special/COND.java b/src/main/function/builtin/special/COND.java similarity index 100% rename from src/function/builtin/special/COND.java rename to src/main/function/builtin/special/COND.java diff --git a/src/function/builtin/special/DEFINE_SPECIAL.java b/src/main/function/builtin/special/DEFINE_SPECIAL.java similarity index 100% rename from src/function/builtin/special/DEFINE_SPECIAL.java rename to src/main/function/builtin/special/DEFINE_SPECIAL.java diff --git a/src/function/builtin/special/DEFMACRO.java b/src/main/function/builtin/special/DEFMACRO.java similarity index 100% rename from src/function/builtin/special/DEFMACRO.java rename to src/main/function/builtin/special/DEFMACRO.java diff --git a/src/function/builtin/special/DEFUN.java b/src/main/function/builtin/special/DEFUN.java similarity index 100% rename from src/function/builtin/special/DEFUN.java rename to src/main/function/builtin/special/DEFUN.java diff --git a/src/function/builtin/special/Define.java b/src/main/function/builtin/special/Define.java similarity index 100% rename from src/function/builtin/special/Define.java rename to src/main/function/builtin/special/Define.java diff --git a/src/function/builtin/special/IF.java b/src/main/function/builtin/special/IF.java similarity index 100% rename from src/function/builtin/special/IF.java rename to src/main/function/builtin/special/IF.java diff --git a/src/function/builtin/special/LAMBDA.java b/src/main/function/builtin/special/LAMBDA.java similarity index 100% rename from src/function/builtin/special/LAMBDA.java rename to src/main/function/builtin/special/LAMBDA.java diff --git a/src/function/builtin/special/LET.java b/src/main/function/builtin/special/LET.java similarity index 100% rename from src/function/builtin/special/LET.java rename to src/main/function/builtin/special/LET.java diff --git a/src/function/builtin/special/LET_STAR.java b/src/main/function/builtin/special/LET_STAR.java similarity index 100% rename from src/function/builtin/special/LET_STAR.java rename to src/main/function/builtin/special/LET_STAR.java diff --git a/src/function/builtin/special/OR.java b/src/main/function/builtin/special/OR.java similarity index 100% rename from src/function/builtin/special/OR.java rename to src/main/function/builtin/special/OR.java diff --git a/src/function/builtin/special/PROGN.java b/src/main/function/builtin/special/PROGN.java similarity index 100% rename from src/function/builtin/special/PROGN.java rename to src/main/function/builtin/special/PROGN.java diff --git a/src/function/builtin/special/QUOTE.java b/src/main/function/builtin/special/QUOTE.java similarity index 100% rename from src/function/builtin/special/QUOTE.java rename to src/main/function/builtin/special/QUOTE.java diff --git a/src/function/builtin/special/RECUR.java b/src/main/function/builtin/special/RECUR.java similarity index 100% rename from src/function/builtin/special/RECUR.java rename to src/main/function/builtin/special/RECUR.java diff --git a/src/function/builtin/special/SETQ.java b/src/main/function/builtin/special/SETQ.java similarity index 100% rename from src/function/builtin/special/SETQ.java rename to src/main/function/builtin/special/SETQ.java diff --git a/src/interpreter/FileLispInterpreter.java b/src/main/interpreter/FileLispInterpreter.java similarity index 100% rename from src/interpreter/FileLispInterpreter.java rename to src/main/interpreter/FileLispInterpreter.java diff --git a/src/interpreter/InteractiveLispInterpreter.java b/src/main/interpreter/InteractiveLispInterpreter.java similarity index 100% rename from src/interpreter/InteractiveLispInterpreter.java rename to src/main/interpreter/InteractiveLispInterpreter.java diff --git a/src/interpreter/LispInterpreter.java b/src/main/interpreter/LispInterpreter.java similarity index 100% rename from src/interpreter/LispInterpreter.java rename to src/main/interpreter/LispInterpreter.java diff --git a/src/interpreter/LispInterpreterBuilder.java b/src/main/interpreter/LispInterpreterBuilder.java similarity index 100% rename from src/interpreter/LispInterpreterBuilder.java rename to src/main/interpreter/LispInterpreterBuilder.java diff --git a/src/interpreter/LispInterpreterBuilderImpl.java b/src/main/interpreter/LispInterpreterBuilderImpl.java similarity index 100% rename from src/interpreter/LispInterpreterBuilderImpl.java rename to src/main/interpreter/LispInterpreterBuilderImpl.java diff --git a/src/parser/LispParser.java b/src/main/parser/LispParser.java similarity index 100% rename from src/parser/LispParser.java rename to src/main/parser/LispParser.java diff --git a/src/recursion/TailCall.java b/src/main/recursion/TailCall.java similarity index 100% rename from src/recursion/TailCall.java rename to src/main/recursion/TailCall.java diff --git a/src/recursion/TailCalls.java b/src/main/recursion/TailCalls.java similarity index 100% rename from src/recursion/TailCalls.java rename to src/main/recursion/TailCalls.java diff --git a/src/scanner/LispCommentRemovingInputStream.java b/src/main/scanner/LispCommentRemovingInputStream.java similarity index 100% rename from src/scanner/LispCommentRemovingInputStream.java rename to src/main/scanner/LispCommentRemovingInputStream.java diff --git a/src/scanner/LispInputStream.java b/src/main/scanner/LispInputStream.java similarity index 100% rename from src/scanner/LispInputStream.java rename to src/main/scanner/LispInputStream.java diff --git a/src/scanner/LispScanner.java b/src/main/scanner/LispScanner.java similarity index 100% rename from src/scanner/LispScanner.java rename to src/main/scanner/LispScanner.java diff --git a/src/sexpression/AtSignExpression.java b/src/main/sexpression/AtSignExpression.java similarity index 100% rename from src/sexpression/AtSignExpression.java rename to src/main/sexpression/AtSignExpression.java diff --git a/src/sexpression/Atom.java b/src/main/sexpression/Atom.java similarity index 100% rename from src/sexpression/Atom.java rename to src/main/sexpression/Atom.java diff --git a/src/sexpression/BackquoteExpression.java b/src/main/sexpression/BackquoteExpression.java similarity index 100% rename from src/sexpression/BackquoteExpression.java rename to src/main/sexpression/BackquoteExpression.java diff --git a/src/sexpression/CommaExpression.java b/src/main/sexpression/CommaExpression.java similarity index 100% rename from src/sexpression/CommaExpression.java rename to src/main/sexpression/CommaExpression.java diff --git a/src/sexpression/Cons.java b/src/main/sexpression/Cons.java similarity index 100% rename from src/sexpression/Cons.java rename to src/main/sexpression/Cons.java diff --git a/src/sexpression/DisplayName.java b/src/main/sexpression/DisplayName.java similarity index 100% rename from src/sexpression/DisplayName.java rename to src/main/sexpression/DisplayName.java diff --git a/src/sexpression/LambdaExpression.java b/src/main/sexpression/LambdaExpression.java similarity index 100% rename from src/sexpression/LambdaExpression.java rename to src/main/sexpression/LambdaExpression.java diff --git a/src/sexpression/LispNumber.java b/src/main/sexpression/LispNumber.java similarity index 100% rename from src/sexpression/LispNumber.java rename to src/main/sexpression/LispNumber.java diff --git a/src/sexpression/LispString.java b/src/main/sexpression/LispString.java similarity index 100% rename from src/sexpression/LispString.java rename to src/main/sexpression/LispString.java diff --git a/src/sexpression/Nil.java b/src/main/sexpression/Nil.java similarity index 100% rename from src/sexpression/Nil.java rename to src/main/sexpression/Nil.java diff --git a/src/sexpression/SExpression.java b/src/main/sexpression/SExpression.java similarity index 100% rename from src/sexpression/SExpression.java rename to src/main/sexpression/SExpression.java diff --git a/src/sexpression/Symbol.java b/src/main/sexpression/Symbol.java similarity index 100% rename from src/sexpression/Symbol.java rename to src/main/sexpression/Symbol.java diff --git a/src/stream/SafeInputStream.java b/src/main/stream/SafeInputStream.java similarity index 100% rename from src/stream/SafeInputStream.java rename to src/main/stream/SafeInputStream.java diff --git a/src/stream/SafeOutputStream.java b/src/main/stream/SafeOutputStream.java similarity index 100% rename from src/stream/SafeOutputStream.java rename to src/main/stream/SafeOutputStream.java diff --git a/src/stream/UncheckedIOException.java b/src/main/stream/UncheckedIOException.java similarity index 100% rename from src/stream/UncheckedIOException.java rename to src/main/stream/UncheckedIOException.java diff --git a/src/table/ExecutionContext.java b/src/main/table/ExecutionContext.java similarity index 100% rename from src/table/ExecutionContext.java rename to src/main/table/ExecutionContext.java diff --git a/src/table/FunctionTable.java b/src/main/table/FunctionTable.java similarity index 100% rename from src/table/FunctionTable.java rename to src/main/table/FunctionTable.java diff --git a/src/table/SymbolTable.java b/src/main/table/SymbolTable.java similarity index 100% rename from src/table/SymbolTable.java rename to src/main/table/SymbolTable.java diff --git a/src/terminal/ControlSequence.java b/src/main/terminal/ControlSequence.java similarity index 100% rename from src/terminal/ControlSequence.java rename to src/main/terminal/ControlSequence.java diff --git a/src/terminal/ControlSequenceHandler.java b/src/main/terminal/ControlSequenceHandler.java similarity index 100% rename from src/terminal/ControlSequenceHandler.java rename to src/main/terminal/ControlSequenceHandler.java diff --git a/src/terminal/ControlSequenceLookup.java b/src/main/terminal/ControlSequenceLookup.java similarity index 100% rename from src/terminal/ControlSequenceLookup.java rename to src/main/terminal/ControlSequenceLookup.java diff --git a/src/terminal/LispTerminal.java b/src/main/terminal/LispTerminal.java similarity index 100% rename from src/terminal/LispTerminal.java rename to src/main/terminal/LispTerminal.java diff --git a/src/terminal/SelectGraphicRendition.java b/src/main/terminal/SelectGraphicRendition.java similarity index 100% rename from src/terminal/SelectGraphicRendition.java rename to src/main/terminal/SelectGraphicRendition.java diff --git a/src/terminal/TerminalConfiguration.java b/src/main/terminal/TerminalConfiguration.java similarity index 100% rename from src/terminal/TerminalConfiguration.java rename to src/main/terminal/TerminalConfiguration.java diff --git a/src/terminal/TerminalHistory.java b/src/main/terminal/TerminalHistory.java similarity index 100% rename from src/terminal/TerminalHistory.java rename to src/main/terminal/TerminalHistory.java diff --git a/src/token/AtSign.java b/src/main/token/AtSign.java similarity index 100% rename from src/token/AtSign.java rename to src/main/token/AtSign.java diff --git a/src/token/Backquote.java b/src/main/token/Backquote.java similarity index 100% rename from src/token/Backquote.java rename to src/main/token/Backquote.java diff --git a/src/token/Comma.java b/src/main/token/Comma.java similarity index 100% rename from src/token/Comma.java rename to src/main/token/Comma.java diff --git a/src/token/Eof.java b/src/main/token/Eof.java similarity index 100% rename from src/token/Eof.java rename to src/main/token/Eof.java diff --git a/src/token/Identifier.java b/src/main/token/Identifier.java similarity index 100% rename from src/token/Identifier.java rename to src/main/token/Identifier.java diff --git a/src/token/LeftParenthesis.java b/src/main/token/LeftParenthesis.java similarity index 100% rename from src/token/LeftParenthesis.java rename to src/main/token/LeftParenthesis.java diff --git a/src/token/Number.java b/src/main/token/Number.java similarity index 100% rename from src/token/Number.java rename to src/main/token/Number.java diff --git a/src/token/QuoteMark.java b/src/main/token/QuoteMark.java similarity index 100% rename from src/token/QuoteMark.java rename to src/main/token/QuoteMark.java diff --git a/src/token/QuotedString.java b/src/main/token/QuotedString.java similarity index 100% rename from src/token/QuotedString.java rename to src/main/token/QuotedString.java diff --git a/src/token/RightParenthesis.java b/src/main/token/RightParenthesis.java similarity index 100% rename from src/token/RightParenthesis.java rename to src/main/token/RightParenthesis.java diff --git a/src/token/Token.java b/src/main/token/Token.java similarity index 100% rename from src/token/Token.java rename to src/main/token/Token.java diff --git a/src/token/TokenFactory.java b/src/main/token/TokenFactory.java similarity index 100% rename from src/token/TokenFactory.java rename to src/main/token/TokenFactory.java diff --git a/src/token/TokenFactoryImpl.java b/src/main/token/TokenFactoryImpl.java similarity index 100% rename from src/token/TokenFactoryImpl.java rename to src/main/token/TokenFactoryImpl.java diff --git a/src/util/Characters.java b/src/main/util/Characters.java similarity index 100% rename from src/util/Characters.java rename to src/main/util/Characters.java diff --git a/src/util/Path.java b/src/main/util/Path.java similarity index 100% rename from src/util/Path.java rename to src/main/util/Path.java diff --git a/test/acceptance/AcceptanceTest.java b/src/test/acceptance/AcceptanceTest.java similarity index 100% rename from test/acceptance/AcceptanceTest.java rename to src/test/acceptance/AcceptanceTest.java diff --git a/test/acceptance/fixture/LispInterpreterFixture.java b/src/test/acceptance/fixture/LispInterpreterFixture.java similarity index 97% rename from test/acceptance/fixture/LispInterpreterFixture.java rename to src/test/acceptance/fixture/LispInterpreterFixture.java index c476c5a..622f6a3 100644 --- a/test/acceptance/fixture/LispInterpreterFixture.java +++ b/src/test/acceptance/fixture/LispInterpreterFixture.java @@ -1,6 +1,6 @@ package acceptance.fixture; -import static main.LispMain.LANGUAGE_FILE_NAMES; +import static application.LispMain.LANGUAGE_FILE_NAMES; import static table.FunctionTable.resetFunctionTable; import static util.Path.getPathPrefix; diff --git a/test/main/MainTest.java b/src/test/application/MainTest.java similarity index 88% rename from test/main/MainTest.java rename to src/test/application/MainTest.java index 8c89602..f385856 100644 --- a/test/main/MainTest.java +++ b/src/test/application/MainTest.java @@ -1,11 +1,11 @@ -package main; +package application; import static com.googlecode.lanterna.input.KeyType.Enter; import static java.text.MessageFormat.format; -import static main.LispMain.ANSI_GREEN; -import static main.LispMain.ANSI_PURPLE; -import static main.LispMain.ANSI_RESET; -import static main.LispMain.GREETING; +import static application.LispMain.ANSI_GREEN; +import static application.LispMain.ANSI_PURPLE; +import static application.LispMain.ANSI_RESET; +import static application.LispMain.GREETING; import static org.junit.Assert.assertEquals; import java.io.PipedInputStream; @@ -100,7 +100,7 @@ public class MainTest extends SymbolAndFunctionCleaner { @Test public void runWithBadFile() { - String expectedMessage = "[critical] test/main/test-files/bad.lisp (No such file or directory)"; + String expectedMessage = "[critical] src/test/application/test-files/bad.lisp (No such file or directory)"; exit.expectSystemExitWithStatus(1); exit.checkAssertionAfterwards(() -> { @@ -109,12 +109,12 @@ public class MainTest extends SymbolAndFunctionCleaner { }); - runInterpreterWithFile("test/main/test-files/bad.lisp"); + runInterpreterWithFile("src/test/application/test-files/bad.lisp"); } @Test public void runWithFile_PrintsDecoratedLastValueOnly() { - runInterpreterWithFile("test/main/test-files/file.lisp"); + runInterpreterWithFile("src/test/application/test-files/file.lisp"); assertEquals("", getSystemErrLog()); assertEquals(format("{0}{1}{2}\n\n", ANSI_GREEN, "RADISH", ANSI_RESET), getSystemOutLog()); @@ -138,7 +138,7 @@ public class MainTest extends SymbolAndFunctionCleaner { @Test public void runMain() { - LispMain.main(new String[] { "test/main/test-files/file.lisp" }); + LispMain.main(new String[] { "src/test/application/test-files/file.lisp" }); assertEquals("", getSystemErrLog()); assertEquals(format("{0}{1}{2}\n\n", ANSI_GREEN, "RADISH", ANSI_RESET), getSystemOutLog()); diff --git a/test/main/test-files/file.lisp b/src/test/application/test-files/file.lisp similarity index 100% rename from test/main/test-files/file.lisp rename to src/test/application/test-files/file.lisp diff --git a/test/environment/RuntimeEnvironmentTest.java b/src/test/environment/RuntimeEnvironmentTest.java similarity index 100% rename from test/environment/RuntimeEnvironmentTest.java rename to src/test/environment/RuntimeEnvironmentTest.java diff --git a/test/error/ErrorManagerTest.java b/src/test/error/ErrorManagerTest.java similarity index 100% rename from test/error/ErrorManagerTest.java rename to src/test/error/ErrorManagerTest.java diff --git a/test/file/FilePositionTrackerTest.java b/src/test/file/FilePositionTrackerTest.java similarity index 100% rename from test/file/FilePositionTrackerTest.java rename to src/test/file/FilePositionTrackerTest.java diff --git a/test/function/ArgumentValidatorTest.java b/src/test/function/ArgumentValidatorTest.java similarity index 100% rename from test/function/ArgumentValidatorTest.java rename to src/test/function/ArgumentValidatorTest.java diff --git a/test/function/LispFunctionTest.java b/src/test/function/LispFunctionTest.java similarity index 100% rename from test/function/LispFunctionTest.java rename to src/test/function/LispFunctionTest.java diff --git a/test/function/LispSpecialFunctionTest.java b/src/test/function/LispSpecialFunctionTest.java similarity index 100% rename from test/function/LispSpecialFunctionTest.java rename to src/test/function/LispSpecialFunctionTest.java diff --git a/test/function/UserDefinedFunctionTest.java b/src/test/function/UserDefinedFunctionTest.java similarity index 100% rename from test/function/UserDefinedFunctionTest.java rename to src/test/function/UserDefinedFunctionTest.java diff --git a/test/function/builtin/APPLYTest.java b/src/test/function/builtin/APPLYTest.java similarity index 100% rename from test/function/builtin/APPLYTest.java rename to src/test/function/builtin/APPLYTest.java diff --git a/test/function/builtin/BackquoteEvaluatorTest.java b/src/test/function/builtin/BackquoteEvaluatorTest.java similarity index 100% rename from test/function/builtin/BackquoteEvaluatorTest.java rename to src/test/function/builtin/BackquoteEvaluatorTest.java diff --git a/test/function/builtin/EVALTest.java b/src/test/function/builtin/EVALTest.java similarity index 100% rename from test/function/builtin/EVALTest.java rename to src/test/function/builtin/EVALTest.java diff --git a/test/function/builtin/EXITTest.java b/src/test/function/builtin/EXITTest.java similarity index 100% rename from test/function/builtin/EXITTest.java rename to src/test/function/builtin/EXITTest.java diff --git a/test/function/builtin/FUNCALLTest.java b/src/test/function/builtin/FUNCALLTest.java similarity index 100% rename from test/function/builtin/FUNCALLTest.java rename to src/test/function/builtin/FUNCALLTest.java diff --git a/test/function/builtin/GENSYMTest.java b/src/test/function/builtin/GENSYMTest.java similarity index 100% rename from test/function/builtin/GENSYMTest.java rename to src/test/function/builtin/GENSYMTest.java diff --git a/test/function/builtin/LOADTest.java b/src/test/function/builtin/LOADTest.java similarity index 89% rename from test/function/builtin/LOADTest.java rename to src/test/function/builtin/LOADTest.java index 5b7bf31..a393004 100644 --- a/test/function/builtin/LOADTest.java +++ b/src/test/function/builtin/LOADTest.java @@ -71,7 +71,7 @@ public class LOADTest extends SymbolAndFunctionCleaner { @Test public void loadGoodFile_ReturnsTAndPrintsNothing() { - String input = "(load \"test/function/builtin/test-files/load-good.lisp\")"; + String input = "(load \"src/test/function/builtin/test-files/load-good.lisp\")"; assertT(evaluateString(input)); assertNothingPrinted(); @@ -79,7 +79,7 @@ public class LOADTest extends SymbolAndFunctionCleaner { @Test public void loadBadFile_ReturnsNilAndPrintsError() { - String input = "(load \"test/function/builtin/test-files/load-bad.lisp\")"; + String input = "(load \"src/test/function/builtin/test-files/load-bad.lisp\")"; assertNil(evaluateString(input)); assertErrorMessagePrinted(); @@ -95,7 +95,7 @@ public class LOADTest extends SymbolAndFunctionCleaner { @Test public void nestedLoadsInTheSameDirectory() { - String input = "(load \"test/function/builtin/test-files/nested/nested.lisp\")"; + String input = "(load \"src/test/function/builtin/test-files/nested/nested.lisp\")"; assertT(evaluateString(input)); assertNothingPrinted(); @@ -103,7 +103,7 @@ public class LOADTest extends SymbolAndFunctionCleaner { @Test public void nestedLoadsInDifferentDirectories() { - String input = "(load \"test/function/builtin/test-files/nested/one/load-one.lisp\")"; + String input = "(load \"src/test/function/builtin/test-files/nested/one/load-one.lisp\")"; assertT(evaluateString(input)); assertNothingPrinted(); @@ -126,7 +126,7 @@ public class LOADTest extends SymbolAndFunctionCleaner { @Test public void loadUsesRuntimePath() { - environment.setPath("test/function/builtin/test-files/nested/one/"); + environment.setPath("src/test/function/builtin/test-files/nested/one/"); String input = "(load \"load-one.lisp\")"; assertT(evaluateString(input)); diff --git a/test/function/builtin/PRINTTest.java b/src/test/function/builtin/PRINTTest.java similarity index 100% rename from test/function/builtin/PRINTTest.java rename to src/test/function/builtin/PRINTTest.java diff --git a/test/function/builtin/SETTest.java b/src/test/function/builtin/SETTest.java similarity index 100% rename from test/function/builtin/SETTest.java rename to src/test/function/builtin/SETTest.java diff --git a/test/function/builtin/SYMBOLSTest.java b/src/test/function/builtin/SYMBOLSTest.java similarity index 100% rename from test/function/builtin/SYMBOLSTest.java rename to src/test/function/builtin/SYMBOLSTest.java diff --git a/test/function/builtin/SYMBOL_FUNCTIONTest.java b/src/test/function/builtin/SYMBOL_FUNCTIONTest.java similarity index 100% rename from test/function/builtin/SYMBOL_FUNCTIONTest.java rename to src/test/function/builtin/SYMBOL_FUNCTIONTest.java diff --git a/test/function/builtin/cons/APPENDTest.java b/src/test/function/builtin/cons/APPENDTest.java similarity index 100% rename from test/function/builtin/cons/APPENDTest.java rename to src/test/function/builtin/cons/APPENDTest.java diff --git a/test/function/builtin/cons/CONSTest.java b/src/test/function/builtin/cons/CONSTest.java similarity index 100% rename from test/function/builtin/cons/CONSTest.java rename to src/test/function/builtin/cons/CONSTest.java diff --git a/test/function/builtin/cons/FIRSTTest.java b/src/test/function/builtin/cons/FIRSTTest.java similarity index 100% rename from test/function/builtin/cons/FIRSTTest.java rename to src/test/function/builtin/cons/FIRSTTest.java diff --git a/test/function/builtin/cons/LENGTHTest.java b/src/test/function/builtin/cons/LENGTHTest.java similarity index 100% rename from test/function/builtin/cons/LENGTHTest.java rename to src/test/function/builtin/cons/LENGTHTest.java diff --git a/test/function/builtin/cons/LISTTest.java b/src/test/function/builtin/cons/LISTTest.java similarity index 100% rename from test/function/builtin/cons/LISTTest.java rename to src/test/function/builtin/cons/LISTTest.java diff --git a/test/function/builtin/cons/RESTTest.java b/src/test/function/builtin/cons/RESTTest.java similarity index 100% rename from test/function/builtin/cons/RESTTest.java rename to src/test/function/builtin/cons/RESTTest.java diff --git a/test/function/builtin/math/DIVIDETest.java b/src/test/function/builtin/math/DIVIDETest.java similarity index 100% rename from test/function/builtin/math/DIVIDETest.java rename to src/test/function/builtin/math/DIVIDETest.java diff --git a/test/function/builtin/math/MINUSTest.java b/src/test/function/builtin/math/MINUSTest.java similarity index 100% rename from test/function/builtin/math/MINUSTest.java rename to src/test/function/builtin/math/MINUSTest.java diff --git a/test/function/builtin/math/MODULOTest.java b/src/test/function/builtin/math/MODULOTest.java similarity index 100% rename from test/function/builtin/math/MODULOTest.java rename to src/test/function/builtin/math/MODULOTest.java diff --git a/test/function/builtin/math/MULTIPLYTest.java b/src/test/function/builtin/math/MULTIPLYTest.java similarity index 100% rename from test/function/builtin/math/MULTIPLYTest.java rename to src/test/function/builtin/math/MULTIPLYTest.java diff --git a/test/function/builtin/math/PLUSTest.java b/src/test/function/builtin/math/PLUSTest.java similarity index 100% rename from test/function/builtin/math/PLUSTest.java rename to src/test/function/builtin/math/PLUSTest.java diff --git a/test/function/builtin/math/REMAINDERTest.java b/src/test/function/builtin/math/REMAINDERTest.java similarity index 100% rename from test/function/builtin/math/REMAINDERTest.java rename to src/test/function/builtin/math/REMAINDERTest.java diff --git a/test/function/builtin/predicate/ATOMTest.java b/src/test/function/builtin/predicate/ATOMTest.java similarity index 100% rename from test/function/builtin/predicate/ATOMTest.java rename to src/test/function/builtin/predicate/ATOMTest.java diff --git a/test/function/builtin/predicate/EQTest.java b/src/test/function/builtin/predicate/EQTest.java similarity index 100% rename from test/function/builtin/predicate/EQTest.java rename to src/test/function/builtin/predicate/EQTest.java diff --git a/test/function/builtin/predicate/EQUALTest.java b/src/test/function/builtin/predicate/EQUALTest.java similarity index 100% rename from test/function/builtin/predicate/EQUALTest.java rename to src/test/function/builtin/predicate/EQUALTest.java diff --git a/test/function/builtin/predicate/GENSYM_EQUALTest.java b/src/test/function/builtin/predicate/GENSYM_EQUALTest.java similarity index 100% rename from test/function/builtin/predicate/GENSYM_EQUALTest.java rename to src/test/function/builtin/predicate/GENSYM_EQUALTest.java diff --git a/test/function/builtin/predicate/LISTPTest.java b/src/test/function/builtin/predicate/LISTPTest.java similarity index 100% rename from test/function/builtin/predicate/LISTPTest.java rename to src/test/function/builtin/predicate/LISTPTest.java diff --git a/test/function/builtin/predicate/NULLTest.java b/src/test/function/builtin/predicate/NULLTest.java similarity index 100% rename from test/function/builtin/predicate/NULLTest.java rename to src/test/function/builtin/predicate/NULLTest.java diff --git a/test/function/builtin/predicate/NUMERIC_EQUALTest.java b/src/test/function/builtin/predicate/NUMERIC_EQUALTest.java similarity index 100% rename from test/function/builtin/predicate/NUMERIC_EQUALTest.java rename to src/test/function/builtin/predicate/NUMERIC_EQUALTest.java diff --git a/test/function/builtin/predicate/NUMERIC_GREATERTest.java b/src/test/function/builtin/predicate/NUMERIC_GREATERTest.java similarity index 100% rename from test/function/builtin/predicate/NUMERIC_GREATERTest.java rename to src/test/function/builtin/predicate/NUMERIC_GREATERTest.java diff --git a/test/function/builtin/predicate/NUMERIC_LESSTest.java b/src/test/function/builtin/predicate/NUMERIC_LESSTest.java similarity index 100% rename from test/function/builtin/predicate/NUMERIC_LESSTest.java rename to src/test/function/builtin/predicate/NUMERIC_LESSTest.java diff --git a/test/function/builtin/special/ANDTest.java b/src/test/function/builtin/special/ANDTest.java similarity index 100% rename from test/function/builtin/special/ANDTest.java rename to src/test/function/builtin/special/ANDTest.java diff --git a/test/function/builtin/special/CASETest.java b/src/test/function/builtin/special/CASETest.java similarity index 100% rename from test/function/builtin/special/CASETest.java rename to src/test/function/builtin/special/CASETest.java diff --git a/test/function/builtin/special/CONDTest.java b/src/test/function/builtin/special/CONDTest.java similarity index 100% rename from test/function/builtin/special/CONDTest.java rename to src/test/function/builtin/special/CONDTest.java diff --git a/test/function/builtin/special/DEFINE_SPECIALTest.java b/src/test/function/builtin/special/DEFINE_SPECIALTest.java similarity index 100% rename from test/function/builtin/special/DEFINE_SPECIALTest.java rename to src/test/function/builtin/special/DEFINE_SPECIALTest.java diff --git a/test/function/builtin/special/DEFMACROTest.java b/src/test/function/builtin/special/DEFMACROTest.java similarity index 100% rename from test/function/builtin/special/DEFMACROTest.java rename to src/test/function/builtin/special/DEFMACROTest.java diff --git a/test/function/builtin/special/DEFUNTest.java b/src/test/function/builtin/special/DEFUNTest.java similarity index 100% rename from test/function/builtin/special/DEFUNTest.java rename to src/test/function/builtin/special/DEFUNTest.java diff --git a/test/function/builtin/special/FUSETest.java b/src/test/function/builtin/special/FUSETest.java similarity index 100% rename from test/function/builtin/special/FUSETest.java rename to src/test/function/builtin/special/FUSETest.java diff --git a/test/function/builtin/special/IFTest.java b/src/test/function/builtin/special/IFTest.java similarity index 100% rename from test/function/builtin/special/IFTest.java rename to src/test/function/builtin/special/IFTest.java diff --git a/test/function/builtin/special/LAMBDATest.java b/src/test/function/builtin/special/LAMBDATest.java similarity index 100% rename from test/function/builtin/special/LAMBDATest.java rename to src/test/function/builtin/special/LAMBDATest.java diff --git a/test/function/builtin/special/LETTest.java b/src/test/function/builtin/special/LETTest.java similarity index 100% rename from test/function/builtin/special/LETTest.java rename to src/test/function/builtin/special/LETTest.java diff --git a/test/function/builtin/special/LET_STARTest.java b/src/test/function/builtin/special/LET_STARTest.java similarity index 100% rename from test/function/builtin/special/LET_STARTest.java rename to src/test/function/builtin/special/LET_STARTest.java diff --git a/test/function/builtin/special/ORTest.java b/src/test/function/builtin/special/ORTest.java similarity index 100% rename from test/function/builtin/special/ORTest.java rename to src/test/function/builtin/special/ORTest.java diff --git a/test/function/builtin/special/PROGNTest.java b/src/test/function/builtin/special/PROGNTest.java similarity index 100% rename from test/function/builtin/special/PROGNTest.java rename to src/test/function/builtin/special/PROGNTest.java diff --git a/test/function/builtin/special/QUOTETest.java b/src/test/function/builtin/special/QUOTETest.java similarity index 100% rename from test/function/builtin/special/QUOTETest.java rename to src/test/function/builtin/special/QUOTETest.java diff --git a/test/function/builtin/special/RECURTest.java b/src/test/function/builtin/special/RECURTest.java similarity index 100% rename from test/function/builtin/special/RECURTest.java rename to src/test/function/builtin/special/RECURTest.java diff --git a/test/function/builtin/special/SETQTest.java b/src/test/function/builtin/special/SETQTest.java similarity index 100% rename from test/function/builtin/special/SETQTest.java rename to src/test/function/builtin/special/SETQTest.java diff --git a/test/function/builtin/test-files/load-bad.lisp b/src/test/function/builtin/test-files/load-bad.lisp similarity index 96% rename from test/function/builtin/test-files/load-bad.lisp rename to src/test/function/builtin/test-files/load-bad.lisp index c078133..3406069 100644 --- a/test/function/builtin/test-files/load-bad.lisp +++ b/src/test/function/builtin/test-files/load-bad.lisp @@ -1,50 +1,50 @@ -)(defun extend-null (the-list) - (cond - ((equal (length the-list) 0) t) - (t nil) - ) -) - -(defun mapcar (function-name the-list) - (cond - ((null the-list) nil) - (t (cons (funcall function-name (first the-list)) - (mapcar function-name (rest the-list)))) - ) -) - -(defun maplist (function-name the-list) - (cond - ((null the-list) nil) - (t (cons (funcall function-name the-list) - (maplist function-name (rest the-list)))) - ) -) - -(defun extend-apply (function-name param-list) - (eval (cons function-name param-list))) - -(defun append (listA listB) - (cond - ((null listA) listB) - (t (cons (first listA) (append (rest listA) listB))) - ) -) - -(defun second (listA) (first (rest listA))) -(defun third (listA) (first (rest (rest listA)))) -(defun fourth (listA) (first (rest (rest (rest listA))))) -(defun fifth (listA) (first (rest (rest (rest (rest listA)))))) -(defun sixth (listA) (first (rest (rest (rest (rest (rest listA))))))) -(defun seventh (listA) (first (rest (rest (rest (rest (rest (rest listA)))))))) -(defun eighth (listA) (first (rest (rest (rest (rest (rest (rest (rest listA))))))))) -(defun ninth (listA) (first (rest (rest (rest (rest (rest (rest (rest (rest listA)))))))))) -(defun tenth (listA) (first (rest (rest (rest (rest (rest (rest (rest (rest (rest listA))))))))))) - -(defun nth (n listA) - (cond - ((equal 0 n) (first listA)) - (t (nth (- n 1) (rest listA))) - ) -) - +)(defun extend-null (the-list) + (cond + ((equal (length the-list) 0) t) + (t nil) + ) +) + +(defun mapcar (function-name the-list) + (cond + ((null the-list) nil) + (t (cons (funcall function-name (first the-list)) + (mapcar function-name (rest the-list)))) + ) +) + +(defun maplist (function-name the-list) + (cond + ((null the-list) nil) + (t (cons (funcall function-name the-list) + (maplist function-name (rest the-list)))) + ) +) + +(defun extend-apply (function-name param-list) + (eval (cons function-name param-list))) + +(defun append (listA listB) + (cond + ((null listA) listB) + (t (cons (first listA) (append (rest listA) listB))) + ) +) + +(defun second (listA) (first (rest listA))) +(defun third (listA) (first (rest (rest listA)))) +(defun fourth (listA) (first (rest (rest (rest listA))))) +(defun fifth (listA) (first (rest (rest (rest (rest listA)))))) +(defun sixth (listA) (first (rest (rest (rest (rest (rest listA))))))) +(defun seventh (listA) (first (rest (rest (rest (rest (rest (rest listA)))))))) +(defun eighth (listA) (first (rest (rest (rest (rest (rest (rest (rest listA))))))))) +(defun ninth (listA) (first (rest (rest (rest (rest (rest (rest (rest (rest listA)))))))))) +(defun tenth (listA) (first (rest (rest (rest (rest (rest (rest (rest (rest (rest listA))))))))))) + +(defun nth (n listA) + (cond + ((equal 0 n) (first listA)) + (t (nth (- n 1) (rest listA))) + ) +) + diff --git a/test/function/builtin/test-files/load-good.lisp b/src/test/function/builtin/test-files/load-good.lisp similarity index 96% rename from test/function/builtin/test-files/load-good.lisp rename to src/test/function/builtin/test-files/load-good.lisp index ad42d27..61c8fe3 100644 --- a/test/function/builtin/test-files/load-good.lisp +++ b/src/test/function/builtin/test-files/load-good.lisp @@ -1,43 +1,43 @@ -(defun extend-null (the-list) - (cond - ((equal (length the-list) 0) t) - (t nil) - ) -) - -(defun mapcar (function-name the-list) - (cond - ((null the-list) nil) - (t (cons (funcall function-name (first the-list)) - (mapcar function-name (rest the-list)))) - ) -) - -(defun maplist (function-name the-list) - (cond - ((null the-list) nil) - (t (cons (funcall function-name the-list) - (maplist function-name (rest the-list)))) - ) -) - -(defun extend-apply (function-name param-list) - (eval (cons function-name param-list))) - -(defun second (listA) (first (rest listA))) -(defun third (listA) (first (rest (rest listA)))) -(defun fourth (listA) (first (rest (rest (rest listA))))) -(defun fifth (listA) (first (rest (rest (rest (rest listA)))))) -(defun sixth (listA) (first (rest (rest (rest (rest (rest listA))))))) -(defun seventh (listA) (first (rest (rest (rest (rest (rest (rest listA)))))))) -(defun eighth (listA) (first (rest (rest (rest (rest (rest (rest (rest listA))))))))) -(defun ninth (listA) (first (rest (rest (rest (rest (rest (rest (rest (rest listA)))))))))) -(defun tenth (listA) (first (rest (rest (rest (rest (rest (rest (rest (rest (rest listA))))))))))) - -(defun nth (n listA) - (cond - ((equal 0 n) (first listA)) - (t (nth (- n 1) (rest listA))) - ) -) - +(defun extend-null (the-list) + (cond + ((equal (length the-list) 0) t) + (t nil) + ) +) + +(defun mapcar (function-name the-list) + (cond + ((null the-list) nil) + (t (cons (funcall function-name (first the-list)) + (mapcar function-name (rest the-list)))) + ) +) + +(defun maplist (function-name the-list) + (cond + ((null the-list) nil) + (t (cons (funcall function-name the-list) + (maplist function-name (rest the-list)))) + ) +) + +(defun extend-apply (function-name param-list) + (eval (cons function-name param-list))) + +(defun second (listA) (first (rest listA))) +(defun third (listA) (first (rest (rest listA)))) +(defun fourth (listA) (first (rest (rest (rest listA))))) +(defun fifth (listA) (first (rest (rest (rest (rest listA)))))) +(defun sixth (listA) (first (rest (rest (rest (rest (rest listA))))))) +(defun seventh (listA) (first (rest (rest (rest (rest (rest (rest listA)))))))) +(defun eighth (listA) (first (rest (rest (rest (rest (rest (rest (rest listA))))))))) +(defun ninth (listA) (first (rest (rest (rest (rest (rest (rest (rest (rest listA)))))))))) +(defun tenth (listA) (first (rest (rest (rest (rest (rest (rest (rest (rest (rest listA))))))))))) + +(defun nth (n listA) + (cond + ((equal 0 n) (first listA)) + (t (nth (- n 1) (rest listA))) + ) +) + diff --git a/test/function/builtin/test-files/nested/included.lisp b/src/test/function/builtin/test-files/nested/included.lisp similarity index 100% rename from test/function/builtin/test-files/nested/included.lisp rename to src/test/function/builtin/test-files/nested/included.lisp diff --git a/test/function/builtin/test-files/nested/nested.lisp b/src/test/function/builtin/test-files/nested/nested.lisp similarity index 95% rename from test/function/builtin/test-files/nested/nested.lisp rename to src/test/function/builtin/test-files/nested/nested.lisp index 6b67b0b..2dd0091 100644 --- a/test/function/builtin/test-files/nested/nested.lisp +++ b/src/test/function/builtin/test-files/nested/nested.lisp @@ -1 +1 @@ -(load "included.lisp") +(load "included.lisp") diff --git a/test/function/builtin/test-files/nested/one/load-one.lisp b/src/test/function/builtin/test-files/nested/one/load-one.lisp similarity index 100% rename from test/function/builtin/test-files/nested/one/load-one.lisp rename to src/test/function/builtin/test-files/nested/one/load-one.lisp diff --git a/test/function/builtin/test-files/nested/one/two/load-two.lisp b/src/test/function/builtin/test-files/nested/one/two/load-two.lisp similarity index 100% rename from test/function/builtin/test-files/nested/one/two/load-two.lisp rename to src/test/function/builtin/test-files/nested/one/two/load-two.lisp diff --git a/test/function/builtin/test-files/nested/one/two/three/load-three.lisp b/src/test/function/builtin/test-files/nested/one/two/three/load-three.lisp similarity index 100% rename from test/function/builtin/test-files/nested/one/two/three/load-three.lisp rename to src/test/function/builtin/test-files/nested/one/two/three/load-three.lisp diff --git a/test/interpreter/LispInterpreterTest.java b/src/test/interpreter/LispInterpreterTest.java similarity index 96% rename from test/interpreter/LispInterpreterTest.java rename to src/test/interpreter/LispInterpreterTest.java index c531f86..913d28a 100644 --- a/test/interpreter/LispInterpreterTest.java +++ b/src/test/interpreter/LispInterpreterTest.java @@ -96,7 +96,7 @@ public class LispInterpreterTest { @Test public void buildFileBasedInterpreter() { setCommonFeatures(); - builder.useFile("test/interpreter/test-files/file.lisp"); + builder.useFile("src/test/interpreter/test-files/file.lisp"); LispInterpreter interpreter = builder.build(); assertTrue(interpreter instanceof FileLispInterpreter); @@ -129,7 +129,7 @@ public class LispInterpreterTest { @Test public void attemptToBuildInterpreterOnBadFile() { setCommonFeatures(); - builder.useFile("test/interpreter/test-files/does-not-exist.lisp"); + builder.useFile("src/test/interpreter/test-files/does-not-exist.lisp"); builder.build(); assertErrorMessageWritten(); @@ -166,7 +166,7 @@ public class LispInterpreterTest { @Test public void fileBasedInterpreterWorks_PrintsLastValueOnly() { setCommonFeatures(); - builder.useFile("test/interpreter/test-files/file.lisp"); + builder.useFile("src/test/interpreter/test-files/file.lisp"); builder.build().interpret(); assertEquals("PICKLE\n\n", outputStream.toString()); diff --git a/test/interpreter/test-files/file.lisp b/src/test/interpreter/test-files/file.lisp similarity index 100% rename from test/interpreter/test-files/file.lisp rename to src/test/interpreter/test-files/file.lisp diff --git a/test/parser/LispParserTest.java b/src/test/parser/LispParserTest.java similarity index 100% rename from test/parser/LispParserTest.java rename to src/test/parser/LispParserTest.java diff --git a/test/recursion/TailCallTest.java b/src/test/recursion/TailCallTest.java similarity index 100% rename from test/recursion/TailCallTest.java rename to src/test/recursion/TailCallTest.java diff --git a/test/scanner/LispCommentRemovingInputStreamTest.java b/src/test/scanner/LispCommentRemovingInputStreamTest.java similarity index 100% rename from test/scanner/LispCommentRemovingInputStreamTest.java rename to src/test/scanner/LispCommentRemovingInputStreamTest.java diff --git a/test/scanner/LispScannerLineColumnTest.java b/src/test/scanner/LispScannerLineColumnTest.java similarity index 100% rename from test/scanner/LispScannerLineColumnTest.java rename to src/test/scanner/LispScannerLineColumnTest.java diff --git a/test/scanner/LispScannerTextTest.java b/src/test/scanner/LispScannerTextTest.java similarity index 100% rename from test/scanner/LispScannerTextTest.java rename to src/test/scanner/LispScannerTextTest.java diff --git a/test/scanner/LispScannerTypeTest.java b/src/test/scanner/LispScannerTypeTest.java similarity index 100% rename from test/scanner/LispScannerTypeTest.java rename to src/test/scanner/LispScannerTypeTest.java diff --git a/test/sexpression/SExpressionTest.java b/src/test/sexpression/SExpressionTest.java similarity index 100% rename from test/sexpression/SExpressionTest.java rename to src/test/sexpression/SExpressionTest.java diff --git a/test/stream/SafeInputStreamTest.java b/src/test/stream/SafeInputStreamTest.java similarity index 100% rename from test/stream/SafeInputStreamTest.java rename to src/test/stream/SafeInputStreamTest.java diff --git a/test/stream/SafeOutputStreamTest.java b/src/test/stream/SafeOutputStreamTest.java similarity index 100% rename from test/stream/SafeOutputStreamTest.java rename to src/test/stream/SafeOutputStreamTest.java diff --git a/test/table/ExecutionContextTest.java b/src/test/table/ExecutionContextTest.java similarity index 100% rename from test/table/ExecutionContextTest.java rename to src/test/table/ExecutionContextTest.java diff --git a/test/table/FunctionTableTest.java b/src/test/table/FunctionTableTest.java similarity index 100% rename from test/table/FunctionTableTest.java rename to src/test/table/FunctionTableTest.java diff --git a/test/table/SymbolTableTest.java b/src/test/table/SymbolTableTest.java similarity index 100% rename from test/table/SymbolTableTest.java rename to src/test/table/SymbolTableTest.java diff --git a/test/terminal/ControlSequenceHandlerTest.java b/src/test/terminal/ControlSequenceHandlerTest.java similarity index 100% rename from test/terminal/ControlSequenceHandlerTest.java rename to src/test/terminal/ControlSequenceHandlerTest.java diff --git a/test/terminal/ControlSequenceTest.java b/src/test/terminal/ControlSequenceTest.java similarity index 100% rename from test/terminal/ControlSequenceTest.java rename to src/test/terminal/ControlSequenceTest.java diff --git a/test/terminal/FlushListener.java b/src/test/terminal/FlushListener.java similarity index 100% rename from test/terminal/FlushListener.java rename to src/test/terminal/FlushListener.java diff --git a/test/terminal/LispTerminalTest.java b/src/test/terminal/LispTerminalTest.java similarity index 100% rename from test/terminal/LispTerminalTest.java rename to src/test/terminal/LispTerminalTest.java diff --git a/test/terminal/TerminalConfigurationTest.java b/src/test/terminal/TerminalConfigurationTest.java similarity index 100% rename from test/terminal/TerminalConfigurationTest.java rename to src/test/terminal/TerminalConfigurationTest.java diff --git a/test/terminal/TerminalHistoryTest.java b/src/test/terminal/TerminalHistoryTest.java similarity index 100% rename from test/terminal/TerminalHistoryTest.java rename to src/test/terminal/TerminalHistoryTest.java diff --git a/test/terminal/VirtualTerminalInteractor.java b/src/test/terminal/VirtualTerminalInteractor.java similarity index 100% rename from test/terminal/VirtualTerminalInteractor.java rename to src/test/terminal/VirtualTerminalInteractor.java diff --git a/test/testutil/SymbolAndFunctionCleaner.java b/src/test/testutil/SymbolAndFunctionCleaner.java similarity index 100% rename from test/testutil/SymbolAndFunctionCleaner.java rename to src/test/testutil/SymbolAndFunctionCleaner.java diff --git a/test/testutil/TestUtilities.java b/src/test/testutil/TestUtilities.java similarity index 100% rename from test/testutil/TestUtilities.java rename to src/test/testutil/TestUtilities.java diff --git a/test/testutil/TypeAssertions.java b/src/test/testutil/TypeAssertions.java similarity index 100% rename from test/testutil/TypeAssertions.java rename to src/test/testutil/TypeAssertions.java diff --git a/test/token/TokenFactoryTest.java b/src/test/token/TokenFactoryTest.java similarity index 100% rename from test/token/TokenFactoryTest.java rename to src/test/token/TokenFactoryTest.java diff --git a/test/util/CharactersTest.java b/src/test/util/CharactersTest.java similarity index 100% rename from test/util/CharactersTest.java rename to src/test/util/CharactersTest.java diff --git a/test/util/PathTest.java b/src/test/util/PathTest.java similarity index 100% rename from test/util/PathTest.java rename to src/test/util/PathTest.java