aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Week7/test/polynomial/PolynomialTest.java30
1 files changed, 9 insertions, 21 deletions
diff --git a/Week7/test/polynomial/PolynomialTest.java b/Week7/test/polynomial/PolynomialTest.java
index 7d7275a..13f7405 100644
--- a/Week7/test/polynomial/PolynomialTest.java
+++ b/Week7/test/polynomial/PolynomialTest.java
@@ -43,10 +43,8 @@ public class PolynomialTest {
@Test
public void testToString() {
System.out.println("toString");
- Polynomial instance = new Polynomial("3 5 -4 1 2.5 0 -3.4 -7"); // Test exp=0, exp=1, exp>1, positive & negative integer & floating point coefficients
- String expResult = "3.000000x^5-4.000000x+2.500000-3.400000x^-7";
- String result = instance.toString();
- assertEquals(expResult, result);
+ // Test exp=0, exp=1, exp>1, positive & negative integer & floating point coefficients
+ assertEquals("3.000000x^5-4.000000x+2.500000-3.400000x^-7", new Polynomial("3 5 -4 1 2.5 0 -3.4 -7").toString());
}
/**
@@ -55,10 +53,9 @@ public class PolynomialTest {
@Test
public void testMinus() {
System.out.println("minus");
- Polynomial b = new Polynomial("5 3 4 2 3 1 10 0"); // 5x^3 + 4x^2 + 3x + 10
- Polynomial instance = new Polynomial("7 4 -4 2 3 1 5 0"); // 7x^4 - 4x^2 + 3x + 5
- instance.minus(b);
- assertEquals(new Polynomial("7 4 -5 3 -8 2 -5 0"), instance); // 7x^4 - 5x^3 - 8x^2 - 5
+ Polynomial instance = new Polynomial("7 4 -4 2 3 1 5 0"); // 7x^4 - 4x^2 + 3x + 5
+ instance.minus(new Polynomial("5 3 4 2 3 1 10 0")); // 5x^3 + 4x^2 + 3x + 10
+ assertEquals(new Polynomial("7 4 -5 3 -8 2 -5 0"), instance); // 7x^4 - 5x^3 - 8x^2 - 5
}
/**
@@ -67,9 +64,8 @@ public class PolynomialTest {
@Test
public void testTimes() {
System.out.println("times");
- Polynomial b = new Polynomial("5 3 4 2");
Polynomial instance = new Polynomial("7 1 6 3");
- instance.times(b);
+ instance.times(new Polynomial("5 3 4 2"));
assertEquals(new Polynomial("30 6 24 5 35 4 28 3"), instance);
}
@@ -92,11 +88,7 @@ public class PolynomialTest {
@Test
public void testEquals() {
System.out.println("equals");
- Object other_poly = new Polynomial("3 5 4 2");
- Polynomial instance = new Polynomial("4 2 3 5");
- boolean expResult = true;
- boolean result = instance.equals(other_poly);
- assertEquals(expResult, result);
+ assertEquals(true, new Polynomial("4 2 3 5").equals(new Polynomial("3 5 4 2")));
}
/**
@@ -105,9 +97,8 @@ public class PolynomialTest {
@Test
public void testPlus_Polynomial() {
System.out.println("plus");
- Polynomial b = new Polynomial("5 3 4 2 3 1 10 0"); // 5x^3 + 4x^2 + 3x + 10
Polynomial instance = new Polynomial("7 4 -4 2 7 1 5 0"); // 7x^4 - 4x^2 + 7x + 5
- instance.plus(b);
+ instance.plus(new Polynomial("5 3 4 2 3 1 10 0")); // 5x^3 + 4x^2 + 3x + 10
assertEquals(new Polynomial("7 4 5 3 10 1 15 0"), instance); // 7x^4 + 5x^3 + 10x + 15
}
@@ -117,11 +108,8 @@ public class PolynomialTest {
@Test
public void testApply() {
System.out.println("apply");
- double x = 17.0;
Polynomial instance = new Polynomial("5 4 0.5 3 9 2 8 0");
- double expResult = 422670.5;
- double result = instance.apply(x);
- assertEquals(expResult, result, 0.0);
+ assertEquals(422670.5, instance.apply(17.0), 0.0);
}
}