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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
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;
@ -31,23 +32,17 @@ public class SimpleObjectTest {
simpleObject = new SimpleObject();
}
/**
* Test for Names for SimpleObjects
*/
public static class Name extends SimpleObjectTest {
@Test
public void happyCase() throws Exception {
public void testName() throws Exception {
// given
String name = "Foobar";
assertThat(simpleObject.getName()).isNull();
assertNull(simpleObject.getName());
// when
simpleObject.setName(name);
// then
assertThat(simpleObject.getName()).isEqualTo(name);
}
assertEquals(name, simpleObject.getName());
}
}

32
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;
@ -47,13 +48,8 @@ public class SimpleObjectsTest {
simpleObjects.container = mockContainer;
}
/**
* Test Creation of Simple Objects
*/
public static class Create extends SimpleObjectsTest {
@Test
public void happyCase() throws Exception {
public void testCreate() throws Exception {
// given
final SimpleObject simpleObject = new SimpleObject();
@ -71,22 +67,16 @@ public class SimpleObjectsTest {
});
// when
final SimpleObject obj = simpleObjects.create("Foobar");
String objectName = "Foobar";
final SimpleObject obj = simpleObjects.create(objectName);
// then
assertThat(obj).isEqualTo(simpleObject);
assertThat(obj.getName()).isEqualTo("Foobar");
assertEquals(simpleObject, obj);
assertEquals(objectName, obj.getName());
}
}
/**
* Test Listing of Simple Objects
*/
public static class ListAll extends SimpleObjectsTest {
@Test
public void happyCase() throws Exception {
public void testListAll() throws Exception {
// given
final List<SimpleObject> all = Lists.newArrayList();
@ -102,7 +92,7 @@ public class SimpleObjectsTest {
final List<SimpleObject> list = simpleObjects.listAll();
// then
assertThat(list).isEqualTo(all);
}
assertEquals(all, list);
}
}

60
naked-objects/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java
View File

@ -18,12 +18,11 @@
*/
package domainapp.integtests.tests.modules.simple;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import domainapp.dom.modules.simple.SimpleObject;
import domainapp.fixture.scenarios.RecreateSimpleObjects;
import domainapp.integtests.tests.SimpleAppIntegTest;
import javax.inject.Inject;
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.fixturescripts.FixtureScripts;
import org.apache.isis.applib.services.wrapper.DisabledException;
@ -31,6 +30,10 @@ import org.apache.isis.applib.services.wrapper.InvalidException;
import org.junit.Before;
import org.junit.Test;
import domainapp.dom.modules.simple.SimpleObject;
import domainapp.fixture.scenarios.RecreateSimpleObjects;
import domainapp.integtests.tests.SimpleAppIntegTest;
/**
* Test Fixtures with Simple Objects
*/
@ -38,11 +41,15 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest {
@Inject
FixtureScripts fixtureScripts;
@Inject
DomainObjectContainer container;
RecreateSimpleObjects fs;
SimpleObject simpleObjectPojo;
SimpleObject simpleObjectWrapped;
private static final String NEW_NAME = "new name";
@Before
public void setUp() throws Exception {
// given
@ -51,71 +58,51 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest {
simpleObjectPojo = fs.getSimpleObjects().get(0);
assertThat(simpleObjectPojo).isNotNull();
assertNotNull(simpleObjectPojo);
simpleObjectWrapped = wrap(simpleObjectPojo);
}
/**
* Test Object Name accessibility
*/
public static class Name extends SimpleObjectIntegTest {
@Test
public void accessible() throws Exception {
public void testNameAccessible() throws Exception {
// when
final String name = simpleObjectWrapped.getName();
// then
assertThat(name).isEqualTo(fs.names.get(0));
assertEquals(fs.names.get(0), name);
}
@Test
public void cannotBeUpdatedDirectly() throws Exception {
public void testNameCannotBeUpdatedDirectly() throws Exception {
// expect
expectedExceptions.expect(DisabledException.class);
// when
simpleObjectWrapped.setName("new name");
simpleObjectWrapped.setName(NEW_NAME);
}
}
/**
* Test Validation of SimpleObject Names
*/
public static class UpdateName extends SimpleObjectIntegTest {
@Test
public void happyCase() throws Exception {
public void testUpdateName() throws Exception {
// when
simpleObjectWrapped.updateName("new name");
simpleObjectWrapped.updateName(NEW_NAME);
// then
assertThat(simpleObjectWrapped.getName()).isEqualTo("new name");
assertEquals(NEW_NAME, simpleObjectWrapped.getName());
}
@Test
public void failsValidation() throws Exception {
public void testUpdateNameFailsValidation() throws Exception {
// expect
expectedExceptions.expect(InvalidException.class);
expectedExceptions.expectMessage("Exclamation mark is not allowed");
// when
simpleObjectWrapped.updateName("new name!");
simpleObjectWrapped.updateName(NEW_NAME + "!");
}
}
/**
* Test ContainerTitle generation based on SimpleObject Name
*/
public static class Title extends SimpleObjectIntegTest {
@Inject
DomainObjectContainer container;
@Test
public void interpolatesName() throws Exception {
public void testInterpolatesName() throws Exception {
// given
final String name = simpleObjectWrapped.getName();
@ -124,7 +111,6 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest {
final String title = container.titleOf(simpleObjectWrapped);
// then
assertThat(title).isEqualTo("Object: " + name);
}
assertEquals("Object: " + name, title);
}
}

48
naked-objects/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java
View File

@ -18,17 +18,13 @@
*/
package domainapp.integtests.tests.modules.simple;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import com.google.common.base.Throwables;
import domainapp.dom.modules.simple.SimpleObject;
import domainapp.dom.modules.simple.SimpleObjects;
import domainapp.fixture.modules.simple.SimpleObjectsTearDown;
import domainapp.fixture.scenarios.RecreateSimpleObjects;
import domainapp.integtests.tests.SimpleAppIntegTest;
import java.sql.SQLIntegrityConstraintViolationException;
import java.util.List;
import javax.inject.Inject;
import org.apache.isis.applib.fixturescripts.FixtureScript;
import org.apache.isis.applib.fixturescripts.FixtureScripts;
import org.hamcrest.Description;
@ -36,6 +32,14 @@ import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
import org.junit.Test;
import com.google.common.base.Throwables;
import domainapp.dom.modules.simple.SimpleObject;
import domainapp.dom.modules.simple.SimpleObjects;
import domainapp.fixture.modules.simple.SimpleObjectsTearDown;
import domainapp.fixture.scenarios.RecreateSimpleObjects;
import domainapp.integtests.tests.SimpleAppIntegTest;
/**
* Fixture Pattern Integration Test
*/
@ -46,13 +50,8 @@ public class SimpleObjectsIntegTest extends SimpleAppIntegTest {
@Inject
SimpleObjects simpleObjects;
/**
* Test Listing of All Simple Objects
*/
public static class ListAll extends SimpleObjectsIntegTest {
@Test
public void happyCase() throws Exception {
public void testListAll() throws Exception {
// given
RecreateSimpleObjects fs = new RecreateSimpleObjects();
@ -63,14 +62,14 @@ public class SimpleObjectsIntegTest extends SimpleAppIntegTest {
final List<SimpleObject> all = wrap(simpleObjects).listAll();
// then
assertThat(all).hasSize(fs.getSimpleObjects().size());
assertEquals(fs.getSimpleObjects().size(), all.size());
SimpleObject simpleObject = wrap(all.get(0));
assertThat(simpleObject.getName()).isEqualTo(fs.getSimpleObjects().get(0).getName());
assertEquals(fs.getSimpleObjects().get(0).getName(), simpleObject.getName());
}
@Test
public void whenNone() throws Exception {
public void testListAllWhenNone() throws Exception {
// given
FixtureScript fs = new SimpleObjectsTearDown();
@ -81,18 +80,11 @@ public class SimpleObjectsIntegTest extends SimpleAppIntegTest {
final List<SimpleObject> all = wrap(simpleObjects).listAll();
// then
assertThat(all).hasSize(0);
assertEquals(0, all.size());
}
}
/**
* Test Creation of Simple Objects
*/
public static class Create extends SimpleObjectsIntegTest {
@Test
public void happyCase() throws Exception {
public void testCreate() throws Exception {
// given
FixtureScript fs = new SimpleObjectsTearDown();
@ -104,11 +96,11 @@ public class SimpleObjectsIntegTest extends SimpleAppIntegTest {
// then
final List<SimpleObject> all = wrap(simpleObjects).listAll();
assertThat(all).hasSize(1);
assertEquals(1, all.size());
}
@Test
public void whenAlreadyExists() throws Exception {
public void testCreateWhenAlreadyExists() throws Exception {
// given
FixtureScript fs = new SimpleObjectsTearDown();
@ -145,5 +137,3 @@ public class SimpleObjectsIntegTest extends SimpleAppIntegTest {
};
}
}
}