Fix blocker issues on Sonar iluwatar#508 (iluwatar#810)

staillebois · npathai · commit 70f6e5435394 · 2018-10-25T18:43:58.000+05:30
* Fix blocker issues on Sonar

* Replace Assertj assertions with JUnit ones
diff --git a/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java b/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
@@ -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 for Names for SimpleObjects
-   */
-  public static class Name extends SimpleObjectTest {
-
-    @Test
-    public void happyCase() throws Exception {
-      // given
-      String name = "Foobar";
-      assertThat(simpleObject.getName()).isNull();
-
-      // when
-      simpleObject.setName(name);
-
-      // then
-      assertThat(simpleObject.getName()).isEqualTo(name);
-    }
+  
+  @Test
+  public void testName() throws Exception {
+    // given
+    String name = "Foobar";
+    assertNull(simpleObject.getName());
+
+    // when
+    simpleObject.setName(name);
+
+    // then
+    assertEquals(name, simpleObject.getName());
   }
 
 }
diff --git a/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java b/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
@@ -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 void setUp() throws Exception {
     simpleObjects = new SimpleObjects();
     simpleObjects.container = mockContainer;
   }
-
-  /**
-   * Test Creation of Simple Objects
-   */
-  public static class Create extends SimpleObjectsTest {
-
-    @Test
-    public void happyCase() throws Exception {
-
-      // given
-      final SimpleObject simpleObject = new SimpleObject();
-
-      final Sequence seq = context.sequence("create");
-      context.checking(new Expectations() {
-        {
-          oneOf(mockContainer).newTransientInstance(SimpleObject.class);
-          inSequence(seq);
-          will(returnValue(simpleObject));
-
-          oneOf(mockContainer).persistIfNotAlready(simpleObject);
-          inSequence(seq);
-        }
-      });
-
-      // when
-      final SimpleObject obj = simpleObjects.create("Foobar");
-
-      // then
-      assertThat(obj).isEqualTo(simpleObject);
-      assertThat(obj.getName()).isEqualTo("Foobar");
-    }
-
+  
+  @Test
+  public void testCreate() throws Exception {
+
+    // given
+    final SimpleObject simpleObject = new SimpleObject();
+
+    final Sequence seq = context.sequence("create");
+    context.checking(new Expectations() {
+      {
+        oneOf(mockContainer).newTransientInstance(SimpleObject.class);
+        inSequence(seq);
+        will(returnValue(simpleObject));
+
+        oneOf(mockContainer).persistIfNotAlready(simpleObject);
+        inSequence(seq);
+      }
+    });
+
+    // when
+    String objectName = "Foobar";
+    final SimpleObject obj = simpleObjects.create(objectName);
+
+    // then
+    assertEquals(simpleObject, obj);
+    assertEquals(objectName, obj.getName());
   }
+  
+  @Test
+  public void testListAll() throws Exception {
 
-  /**
-   * Test Listing of Simple Objects
-   */
-  public static class ListAll extends SimpleObjectsTest {
+    // given
+    final List<SimpleObject> all = Lists.newArrayList();
 
-    @Test
-    public void happyCase() throws Exception {
+    context.checking(new Expectations() {
+      {
+        oneOf(mockContainer).allInstances(SimpleObject.class);
+        will(returnValue(all));
+      }
+    });
 
-      // given
-      final List<SimpleObject> all = Lists.newArrayList();
+    // when
+    final List<SimpleObject> list = simpleObjects.listAll();
 
-      context.checking(new Expectations() {
-        {
-          oneOf(mockContainer).allInstances(SimpleObject.class);
-          will(returnValue(all));
-        }
-      });
-
-      // when
-      final List<SimpleObject> list = simpleObjects.listAll();
-
-      // then
-      assertThat(list).isEqualTo(all);
-    }
+    // then
+    assertEquals(all, list);
   }
+
 }
diff --git a/naked-objects/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java b/naked-objects/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectIntegTest.java
@@ -18,30 +18,37 @@
  */
 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;
 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
  */
 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 {
@@ -51,80 +58,59 @@ public void setUp() throws Exception {
 
     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 {
-      // when
-      final String name = simpleObjectWrapped.getName();
-      // then
-      assertThat(name).isEqualTo(fs.names.get(0));
-    }
-
-    @Test
-    public void cannotBeUpdatedDirectly() throws Exception {
-
-      // expect
-      expectedExceptions.expect(DisabledException.class);
-
-      // when
-      simpleObjectWrapped.setName("new name");
-    }
+  
+  @Test
+  public void testNameAccessible() throws Exception {
+    // when
+    final String name = simpleObjectWrapped.getName();
+    // then
+    assertEquals(fs.names.get(0), name);
   }
+  
+  @Test
+  public void testNameCannotBeUpdatedDirectly() throws Exception {
 
-  /**
-   * Test Validation of SimpleObject Names
-   */
-  public static class UpdateName extends SimpleObjectIntegTest {
-
-    @Test
-    public void happyCase() throws Exception {
-
-      // when
-      simpleObjectWrapped.updateName("new name");
+    // expect
+    expectedExceptions.expect(DisabledException.class);
 
-      // then
-      assertThat(simpleObjectWrapped.getName()).isEqualTo("new name");
-    }
-
-    @Test
-    public void failsValidation() throws Exception {
+    // when
+    simpleObjectWrapped.setName(NEW_NAME);
+  }
+  
+  @Test
+  public void testUpdateName() throws Exception {
 
-      // expect
-      expectedExceptions.expect(InvalidException.class);
-      expectedExceptions.expectMessage("Exclamation mark is not allowed");
+    // when
+    simpleObjectWrapped.updateName(NEW_NAME);
 
-      // when
-      simpleObjectWrapped.updateName("new name!");
-    }
+    // then
+    assertEquals(NEW_NAME, simpleObjectWrapped.getName());
   }
+  
+  @Test
+  public void testUpdateNameFailsValidation() throws Exception {
 
-  /**
-   * Test ContainerTitle generation based on SimpleObject Name
-   */
-  public static class Title extends SimpleObjectIntegTest {
-
-    @Inject
-    DomainObjectContainer container;
+    // expect
+    expectedExceptions.expect(InvalidException.class);
+    expectedExceptions.expectMessage("Exclamation mark is not allowed");
 
-    @Test
-    public void interpolatesName() throws Exception {
+    // when
+    simpleObjectWrapped.updateName(NEW_NAME + "!");
+  }
+  
+  @Test
+  public void testInterpolatesName() throws Exception {
 
-      // given
-      final String name = simpleObjectWrapped.getName();
+    // given
+    final String name = simpleObjectWrapped.getName();
 
-      // when
-      final String title = container.titleOf(simpleObjectWrapped);
+    // when
+    final String title = container.titleOf(simpleObjectWrapped);
 
-      // then
-      assertThat(title).isEqualTo("Object: " + name);
-    }
+    // then
+    assertEquals("Object: " + name, title);
   }
 }
diff --git a/naked-objects/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java b/naked-objects/integtests/src/test/java/domainapp/integtests/tests/modules/simple/SimpleObjectsIntegTest.java
