Added unit tests and refactored code

This commit is contained in:
Mike Cifelli 2017-01-05 18:00:21 -05:00
parent 3cb9d89616
commit 5cd037fc07
4 changed files with 91 additions and 34 deletions

View File

@ -8,8 +8,8 @@ public class GREATERP extends LispFunction {
private ArgumentValidator argumentValidator; private ArgumentValidator argumentValidator;
public GREATERP() { public GREATERP() {
this.argumentValidator = new ArgumentValidator("GREATERP"); this.argumentValidator = new ArgumentValidator(">");
this.argumentValidator.setMinimumNumberOfArguments(2); this.argumentValidator.setMinimumNumberOfArguments(1);
this.argumentValidator.setEveryArgumentExpectedType(LispNumber.class); this.argumentValidator.setEveryArgumentExpectedType(LispNumber.class);
} }

View File

@ -1,49 +1,43 @@
package function.builtin; package function.builtin;
import function.LispFunction; import function.*;
import sexpression.*; import sexpression.*;
/**
* <code>LESSP</code> represents the '&lt;' function in Lisp.
*/
public class LESSP extends LispFunction { public class LESSP extends LispFunction {
public SExpression call(Cons argList) { private ArgumentValidator argumentValidator;
// make sure we have received at least one argument
if (argList.nullp()) {
Cons originalSExpr = new Cons(new Symbol("<"), argList);
throw new RuntimeException("too few arguments given to <: " + originalSExpr); public LESSP() {
} this.argumentValidator = new ArgumentValidator("<");
this.argumentValidator.setMinimumNumberOfArguments(1);
this.argumentValidator.setEveryArgumentExpectedType(LispNumber.class);
}
SExpression firstArg = argList.getCar(); public SExpression call(Cons argumentList) {
Cons argRest = (Cons) argList.getCdr(); argumentValidator.validate(argumentList);
// make sure that the first argument is a number return callTailRecursive(argumentList);
if (firstArg.numberp()) { }
LispNumber num1 = (LispNumber) firstArg;
if (argRest.nullp()) { private SExpression callTailRecursive(Cons argumentList) {
return Symbol.T; Cons remainingArguments = (Cons) argumentList.getCdr();
}
SExpression secondArg = argRest.getCar(); if (remainingArguments.nullp())
return Symbol.T;
// make sure that the second argument is a number as well SExpression firstArgument = argumentList.getCar();
if (secondArg.numberp()) { SExpression secondArgument = remainingArguments.getCar();
LispNumber num2 = (LispNumber) secondArg; LispNumber number1 = (LispNumber) firstArgument;
LispNumber number2 = (LispNumber) secondArgument;
if (num1.getValue().compareTo(num2.getValue()) < 0) { if (!isFirstLesser(number1, number2))
return call(argRest); return Nil.getInstance();
}
return Nil.getInstance(); return callTailRecursive(remainingArguments);
} }
throw new RuntimeException("<: " + secondArg + " is not a number"); private boolean isFirstLesser(LispNumber number1, LispNumber number2) {
} return number1.getValue().compareTo(number2.getValue()) < 0;
throw new RuntimeException("<: " + firstArg + " is not a number");
} }
} }

View File

@ -8,6 +8,13 @@ import function.ArgumentValidator.*;
public class GREATERPTester { public class GREATERPTester {
@Test
public void testGreaterpWithOneNumber_ReturnsT() {
String input = "(> 1)";
assertSExpressionsMatch(evaluateString(input), parseString("t"));
}
@Test @Test
public void testGreaterpWithTwoNumbers_ReturnsNil() { public void testGreaterpWithTwoNumbers_ReturnsNil() {
String input = "(> 1 2)"; String input = "(> 1 2)";
@ -43,7 +50,7 @@ public class GREATERPTester {
@Test(expected = TooFewArgumentsException.class) @Test(expected = TooFewArgumentsException.class)
public void testGreaterpWithTooFewArguments() { public void testGreaterpWithTooFewArguments() {
evaluateString("(> 1)"); evaluateString("(>)");
} }
} }

View File

@ -0,0 +1,56 @@
package function.builtin;
import static testutil.TestUtilities.*;
import org.junit.Test;
import function.ArgumentValidator.*;
public class LESSPTester {
@Test
public void testLesspWithOneNumber_ReturnsT() {
String input = "(< 1)";
assertSExpressionsMatch(evaluateString(input), parseString("t"));
}
@Test
public void testLesspWithTwoNumbers_ReturnsNil() {
String input = "(< 2 1)";
assertSExpressionsMatch(evaluateString(input), parseString("nil"));
}
@Test
public void testLesspWithTwoNumbers_ReturnsT() {
String input = "(< 2 3)";
assertSExpressionsMatch(evaluateString(input), parseString("t"));
}
@Test
public void testLesspWithManyNumbers_ReturnsNil() {
String input = "(< 4 3 2 5 1)";
assertSExpressionsMatch(evaluateString(input), parseString("nil"));
}
@Test
public void testLesspWithManyNumbers_ReturnsT() {
String input = "(< 0 1 2 3 4)";
assertSExpressionsMatch(evaluateString(input), parseString("t"));
}
@Test(expected = BadArgumentTypeException.class)
public void testLesspWithNonNumbers() {
evaluateString("(< '(1) '(2))");
}
@Test(expected = TooFewArgumentsException.class)
public void testLesspWithTooFewArguments() {
evaluateString("(<)");
}
}