gaspersic/java-design-patterns
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Migrate to JUnit5

Browse Source
This commit is contained in:
Artur Mogozov
2017-12-31 16:29:48 +09:00
parent a20e54d0a7
commit 6694d742a3
408 changed files with 2656 additions and 2165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/AppTest.java
View File

@ -22,7 +22,7 @@
*/
package com.iluwatar.intercepting.filter;
import org.junit.Test;
import org.junit.jupiter.api.Test;
/**
*

4
intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterManagerTest.java
View File

@ -22,9 +22,9 @@
*/
package com.iluwatar.intercepting.filter;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;

49
intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterTest.java
View File

@ -22,25 +22,22 @@
*/
package com.iluwatar.intercepting.filter;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import java.util.ArrayList;
import java.util.List;
import static junit.framework.TestCase.assertSame;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
/**
* Date: 12/13/15 - 2:17 PM
*
* @author Jeroen Meulemeester
*/
@RunWith(Parameterized.class)
public class FilterTest {
private static final Order PERFECT_ORDER = new Order("name", "12345678901", "addr", "dep", "order");
@ -50,8 +47,7 @@ public class FilterTest {
private static final Order WRONG_CONTACT = new Order("name", "", "addr", "dep", "order");
private static final Order WRONG_NAME = new Order("", "12345678901", "addr", "dep", "order");
@Parameters
public static List<Object[]> getTestData() {
static List<Object[]> getTestData() {
final List<Object[]> testData = new ArrayList<>();
testData.add(new Object[]{new NameFilter(), PERFECT_ORDER, ""});
testData.add(new Object[]{new NameFilter(), WRONG_NAME, "Invalid name!"});
@ -91,30 +87,19 @@ public class FilterTest {
return testData;
}
private final Filter filter;
private final Order order;
private final String result;
/**
* Constructor
*/
public FilterTest(Filter filter, Order order, String result) {
this.filter = filter;
this.order = order;
this.result = result;
}
@Test
public void testExecute() throws Exception {
final String result = this.filter.execute(this.order);
@ParameterizedTest
@MethodSource("getTestData")
public void testExecute(Filter filter, Order order, String expectedResult) throws Exception {
final String result = filter.execute(order);
assertNotNull(result);
assertEquals(this.result, result.trim());
assertEquals(expectedResult, result.trim());
}
@Test
public void testNext() throws Exception {
assertNull(this.filter.getNext());
assertSame(this.filter, this.filter.getLast());
@ParameterizedTest
@MethodSource("getTestData")
public void testNext(Filter filter) throws Exception {
assertNull(filter.getNext());
assertSame(filter, filter.getLast());
}
}

4
intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/OrderTest.java
View File

@ -22,9 +22,9 @@
*/
package com.iluwatar.intercepting.filter;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Date: 12/13/15 - 2:57 PM