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

Fix blocker issues on Sonar #508 (#810)

Browse Source 
* Fix blocker issues on Sonar

* Replace Assertj assertions with JUnit ones
This commit is contained in:
staillebois
2018-10-25 15:13:58 +02:00
committed by Narendra Pathai
parent 1f1fcae513
commit 70f6e54353
4 changed files with 185 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
View File

@ -14,7 +14,8 @@
*/
package domainapp.dom.modules.simple;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import org.junit.Before;
import org.junit.Test;
@ -30,24 +31,18 @@ public class SimpleObjectTest {
public void setUp() throws Exception {
simpleObject = new SimpleObject();
}
@Test
public void testName() throws Exception {
// given
String name = "Foobar";
assertNull(simpleObject.getName());
/**
* Test for Names for SimpleObjects
*/
public static class Name extends SimpleObjectTest {
// when
simpleObject.setName(name);
@Test
public void happyCase() throws Exception {
// given
String name = "Foobar";
assertThat(simpleObject.getName()).isNull();
// when
simpleObject.setName(name);
// then
assertThat(simpleObject.getName()).isEqualTo(name);
}
// then
assertEquals(name, simpleObject.getName());
}
}

92
naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
View File

@ -14,9 +14,10 @@
*/
package domainapp.dom.modules.simple;
import static org.assertj.core.api.Assertions.assertThat;
import com.google.common.collect.Lists;
import static org.junit.Assert.assertEquals;
import java.util.List;
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
@ -46,63 +47,52 @@ public class SimpleObjectsTest {
simpleObjects = new SimpleObjects();
simpleObjects.container = mockContainer;
}
@Test
public void testCreate() throws Exception {
/**
* Test Creation of Simple Objects
*/
public static class Create extends SimpleObjectsTest {
// given
final SimpleObject simpleObject = new SimpleObject();
@Test
public void happyCase() throws Exception {
final Sequence seq = context.sequence("create");
context.checking(new Expectations() {
{
oneOf(mockContainer).newTransientInstance(SimpleObject.class);
inSequence(seq);
will(returnValue(simpleObject));
// given
final SimpleObject simpleObject = new SimpleObject();
oneOf(mockContainer).persistIfNotAlready(simpleObject);
inSequence(seq);
}
});
final Sequence seq = context.sequence("create");
context.checking(new Expectations() {
{
oneOf(mockContainer).newTransientInstance(SimpleObject.class);
inSequence(seq);
will(returnValue(simpleObject));
// when
String objectName = "Foobar";
final SimpleObject obj = simpleObjects.create(objectName);
oneOf(mockContainer).persistIfNotAlready(simpleObject);
inSequence(seq);
}
});
// then
assertEquals(simpleObject, obj);
assertEquals(objectName, obj.getName());
}
@Test
public void testListAll() throws Exception {
// when
final SimpleObject obj = simpleObjects.create("Foobar");
// given
final List<SimpleObject> all = Lists.newArrayList();
// then
assertThat(obj).isEqualTo(simpleObject);
assertThat(obj.getName()).isEqualTo("Foobar");
}
context.checking(new Expectations() {
{
oneOf(mockContainer).allInstances(SimpleObject.class);
will(returnValue(all));
}
});
// when
final List<SimpleObject> list = simpleObjects.listAll();
// then
assertEquals(all, list);
}
/**
* Test Listing of Simple Objects
*/
public static class ListAll extends SimpleObjectsTest {
@Test
public void happyCase() throws Exception {
// given
final List<SimpleObject> all = Lists.newArrayList();
context.checking(new Expectations() {
{
oneOf(mockContainer).allInstances(SimpleObject.class);
will(returnValue(all));
}
});
// when
final List<SimpleObject> list = simpleObjects.listAll();
// then
assertThat(list).isEqualTo(all);
}
}
}