|
|
@@ -12,6 +12,7 @@ import java.io.IOException;
|
|
|
import java.io.OutputStream;
|
|
|
import java.io.PrintStream;
|
|
|
import java.io.UnsupportedEncodingException;
|
|
|
+import java.nio.charset.Charset;
|
|
|
import java.nio.charset.StandardCharsets;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
@@ -21,8 +22,8 @@ import java.util.regex.Pattern;
|
|
|
import net.ranides.assira.junit.mockup.TesterObjects;
|
|
|
import net.ranides.assira.junit.mockup.TesterObjects.*;
|
|
|
import net.ranides.assira.junit.mockup.Testers;
|
|
|
-import org.junit.Assert;
|
|
|
import org.junit.Test;
|
|
|
+import static net.ranides.assira.junit.NewAssert.*;
|
|
|
|
|
|
/**
|
|
|
*
|
|
|
@@ -88,12 +89,12 @@ public class TestContractRunnerTest {
|
|
|
suite.run(() -> new ObjectABC());
|
|
|
suite.run(() -> new ObjectA());
|
|
|
suite.run(() -> new AbstractAB(){});
|
|
|
- Assert.assertEquals(EXPECTED, TesterObjects.OUT);
|
|
|
+ assertEquals(EXPECTED, TesterObjects.OUT);
|
|
|
}
|
|
|
|
|
|
@Test
|
|
|
public void testInvalid() {
|
|
|
- NewAssert.assertThrows(AssertionError.class, () ->
|
|
|
+ assertThrows(AssertionError.class, () ->
|
|
|
new TestContractRunner(System.err).append(new Testers.Invalid())
|
|
|
);
|
|
|
}
|
|
|
@@ -105,7 +106,7 @@ public class TestContractRunnerTest {
|
|
|
|
|
|
TesterObjects.OUT.clear();
|
|
|
suite.run(() -> new ObjectA());
|
|
|
- Assert.assertEquals(EXPECTED_A, TesterObjects.OUT);
|
|
|
+ assertEquals(EXPECTED_A, TesterObjects.OUT);
|
|
|
}
|
|
|
|
|
|
@Test
|
|
|
@@ -119,10 +120,8 @@ public class TestContractRunnerTest {
|
|
|
|
|
|
TesterObjects.OUT.clear();
|
|
|
suite.run(() -> new ObjectA());
|
|
|
- System.out.println(">>>" + out.toString());
|
|
|
- System.out.println(">>>" + EXPECTED_OUT);
|
|
|
- Assert.assertEquals(EXPECTED_OUT, out.toString());
|
|
|
- Assert.assertEquals(EXPECTED_A, TesterObjects.OUT);
|
|
|
+ assertEquals(EXPECTED_OUT, out.toString());
|
|
|
+ assertEquals(EXPECTED_A, TesterObjects.OUT);
|
|
|
}
|
|
|
|
|
|
@Test
|
|
|
@@ -132,12 +131,12 @@ public class TestContractRunnerTest {
|
|
|
new TestContractRunner(System.err)
|
|
|
.append(new Testers.ForMap())
|
|
|
.run(() -> new TreeMap<>());
|
|
|
- Assert.assertEquals(Arrays.asList("map"), TesterObjects.OUT);
|
|
|
+ assertEquals(Arrays.asList("map"), TesterObjects.OUT);
|
|
|
}
|
|
|
|
|
|
@Test
|
|
|
public void testWildcardSupplier() {
|
|
|
- NewAssert.assertThrows(AssertionError.class, ()->{
|
|
|
+ assertThrows(AssertionError.class, ()->{
|
|
|
new TestContractRunner(System.err)
|
|
|
.append(new Testers.ForWildcard())
|
|
|
.run(() -> new TreeMap<>());
|
|
|
@@ -150,7 +149,7 @@ public class TestContractRunnerTest {
|
|
|
new TestContractRunner(System.err)
|
|
|
.append(new Testers.ForFunction())
|
|
|
.run((int[] args) -> new ArrayList<>());
|
|
|
- Assert.assertEquals(EXPECTED_FUNCTION, TesterObjects.OUT);
|
|
|
+ assertEquals(EXPECTED_FUNCTION, TesterObjects.OUT);
|
|
|
}
|
|
|
|
|
|
@Test
|
|
|
@@ -168,7 +167,7 @@ public class TestContractRunnerTest {
|
|
|
suite
|
|
|
.param("name", "ot")
|
|
|
.run(() -> new Object());
|
|
|
- Assert.assertEquals(EXPECTED_RES, TesterObjects.OUT);
|
|
|
+ assertEquals(EXPECTED_RES, TesterObjects.OUT);
|
|
|
}
|
|
|
|
|
|
private static class TeeStream extends FilterOutputStream {
|