From 02c68d03c0a31271ec4a46c209cc7f1c7047b3d5 Mon Sep 17 00:00:00 2001 From: Keith Cassell Date: Wed, 31 Jul 2019 14:33:17 -0400 Subject: [PATCH] Adding Jacoco to jaffa-components, jaffa-console --- jaffa-components-admin/pom.xml | 5 ----- .../admin/exceptions/ConfigExceptionTest.java | 14 ++++++++++++++ jaffa-components-messaging/pom.xml | 14 -------------- .../messageviewer/dto/HeaderElementDtoTest.java | 14 ++++++++++++++ jaffa-components-printing/pom.xml | 14 -------------- .../dto/FormDefinitionFinderInDtoTest.java | 14 ++++++++++++++ .../taskfinder/dto/TaskFinderOutDtoTest.java | 14 ++++++++++++++ jaffa-components-user/pom.xml | 2 +- .../dto/UserRequestFinderInDtoTest.java | 12 ++++++++++++ jaffa-components/pom.xml | 14 -------------- .../org/apache/log4j/jdbcplus/MDCFilterTest.java | 2 +- jaffa-console/pom.xml | 1 - .../test/java/org/jaffa/sc/apis/TreeNodeTest.java | 14 ++++++++++++++ 13 files changed, 84 insertions(+), 50 deletions(-) create mode 100644 jaffa-components-admin/src/test/java/org/jaffa/applications/jaffa/modules/admin/exceptions/ConfigExceptionTest.java create mode 100644 jaffa-components-messaging/src/test/java/org/jaffa/modules/messaging/components/messageviewer/dto/HeaderElementDtoTest.java create mode 100644 jaffa-components-printing/src/test/java/org/jaffa/modules/printing/components/formdefinitionfinder/dto/FormDefinitionFinderInDtoTest.java create mode 100644 jaffa-components-scheduler/src/test/java/org/jaffa/modules/scheduler/components/taskfinder/dto/TaskFinderOutDtoTest.java create mode 100644 jaffa-components-user/src/test/java/org/jaffa/applications/jaffa/modules/user/components/userrequestfinder/dto/UserRequestFinderInDtoTest.java rename jaffa-components/{source => src}/test/java/org/apache/log4j/jdbcplus/MDCFilterTest.java (99%) create mode 100644 jaffa-console/src/test/java/org/jaffa/sc/apis/TreeNodeTest.java diff --git a/jaffa-components-admin/pom.xml b/jaffa-components-admin/pom.xml index e3464426..6e713616 100644 --- a/jaffa-components-admin/pom.xml +++ b/jaffa-components-admin/pom.xml @@ -52,14 +52,9 @@ log4j-1.2-api provided - - - - junit junit - 3.8.1 test diff --git a/jaffa-components-admin/src/test/java/org/jaffa/applications/jaffa/modules/admin/exceptions/ConfigExceptionTest.java b/jaffa-components-admin/src/test/java/org/jaffa/applications/jaffa/modules/admin/exceptions/ConfigExceptionTest.java new file mode 100644 index 00000000..06da4610 --- /dev/null +++ b/jaffa-components-admin/src/test/java/org/jaffa/applications/jaffa/modules/admin/exceptions/ConfigExceptionTest.java @@ -0,0 +1,14 @@ +package org.jaffa.applications.jaffa.modules.admin.exceptions; + +import org.junit.Assert; +import org.junit.Test; + +import static org.junit.Assert.*; + +public class ConfigExceptionTest { + + @Test public void testConstructor1() { + ConfigException exc = new ConfigException("theProp"); + assertTrue(exc.toString().contains("theProp")); + } +} diff --git a/jaffa-components-messaging/pom.xml b/jaffa-components-messaging/pom.xml index ac4d0d76..9b9b875d 100644 --- a/jaffa-components-messaging/pom.xml +++ b/jaffa-components-messaging/pom.xml @@ -88,20 +88,6 @@ log4j-1.2-api provided - - - - - - junit - junit - 3.8.1 - test - diff --git a/jaffa-components-messaging/src/test/java/org/jaffa/modules/messaging/components/messageviewer/dto/HeaderElementDtoTest.java b/jaffa-components-messaging/src/test/java/org/jaffa/modules/messaging/components/messageviewer/dto/HeaderElementDtoTest.java new file mode 100644 index 00000000..85909304 --- /dev/null +++ b/jaffa-components-messaging/src/test/java/org/jaffa/modules/messaging/components/messageviewer/dto/HeaderElementDtoTest.java @@ -0,0 +1,14 @@ +package org.jaffa.modules.messaging.components.messageviewer.dto; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class HeaderElementDtoTest { + + @Test public void getNameTest() { + HeaderElementDto testObject = new HeaderElementDto(); + testObject.setName("bob"); + assertEquals("bob", testObject.getName()); + } +} diff --git a/jaffa-components-printing/pom.xml b/jaffa-components-printing/pom.xml index 58452760..2d60826a 100644 --- a/jaffa-components-printing/pom.xml +++ b/jaffa-components-printing/pom.xml @@ -142,20 +142,6 @@ jsp-api provided - - - - - junit - junit - 4.11 - test - - - org.mockito - mockito-all - test - diff --git a/jaffa-components-printing/src/test/java/org/jaffa/modules/printing/components/formdefinitionfinder/dto/FormDefinitionFinderInDtoTest.java b/jaffa-components-printing/src/test/java/org/jaffa/modules/printing/components/formdefinitionfinder/dto/FormDefinitionFinderInDtoTest.java new file mode 100644 index 00000000..134926a7 --- /dev/null +++ b/jaffa-components-printing/src/test/java/org/jaffa/modules/printing/components/formdefinitionfinder/dto/FormDefinitionFinderInDtoTest.java @@ -0,0 +1,14 @@ +package org.jaffa.modules.printing.components.formdefinitionfinder.dto; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class FormDefinitionFinderInDtoTest { + + @Test public void getHeaderDtoTest() { + FormDefinitionFinderInDto testObject = new FormDefinitionFinderInDto(); + testObject.setHeaderDto(null); + assertNull(testObject.getHeaderDto()); + } +} diff --git a/jaffa-components-scheduler/src/test/java/org/jaffa/modules/scheduler/components/taskfinder/dto/TaskFinderOutDtoTest.java b/jaffa-components-scheduler/src/test/java/org/jaffa/modules/scheduler/components/taskfinder/dto/TaskFinderOutDtoTest.java new file mode 100644 index 00000000..1c2ccedd --- /dev/null +++ b/jaffa-components-scheduler/src/test/java/org/jaffa/modules/scheduler/components/taskfinder/dto/TaskFinderOutDtoTest.java @@ -0,0 +1,14 @@ +package org.jaffa.modules.scheduler.components.taskfinder.dto; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class TaskFinderOutDtoTest { + + @Test public void getRowsTest() { + TaskFinderOutDto testObject = new TaskFinderOutDto(); + testObject.setRows(null); + assertNull(testObject.getRows()); + } +} diff --git a/jaffa-components-user/pom.xml b/jaffa-components-user/pom.xml index 051c0930..ce2f65cc 100644 --- a/jaffa-components-user/pom.xml +++ b/jaffa-components-user/pom.xml @@ -78,7 +78,7 @@ junit junit - 4.11 + ${version.junit} test diff --git a/jaffa-components-user/src/test/java/org/jaffa/applications/jaffa/modules/user/components/userrequestfinder/dto/UserRequestFinderInDtoTest.java b/jaffa-components-user/src/test/java/org/jaffa/applications/jaffa/modules/user/components/userrequestfinder/dto/UserRequestFinderInDtoTest.java new file mode 100644 index 00000000..af582583 --- /dev/null +++ b/jaffa-components-user/src/test/java/org/jaffa/applications/jaffa/modules/user/components/userrequestfinder/dto/UserRequestFinderInDtoTest.java @@ -0,0 +1,12 @@ +package org.jaffa.applications.jaffa.modules.user.components.userrequestfinder.dto; + +import static org.junit.Assert.*; + +public class UserRequestFinderInDtoTest { + + @org.junit.Test public void getHeaderDtoTest() { + UserRequestFinderInDto testObject = new UserRequestFinderInDto(); + testObject.setHeaderDto(null); + assertNull(testObject.getHeaderDto()); + } +} diff --git a/jaffa-components/pom.xml b/jaffa-components/pom.xml index 3883042e..b155b902 100644 --- a/jaffa-components/pom.xml +++ b/jaffa-components/pom.xml @@ -109,20 +109,6 @@ 1.7.2 provided - - - - - - junit - junit - 3.8.1 - test - diff --git a/jaffa-components/source/test/java/org/apache/log4j/jdbcplus/MDCFilterTest.java b/jaffa-components/src/test/java/org/apache/log4j/jdbcplus/MDCFilterTest.java similarity index 99% rename from jaffa-components/source/test/java/org/apache/log4j/jdbcplus/MDCFilterTest.java rename to jaffa-components/src/test/java/org/apache/log4j/jdbcplus/MDCFilterTest.java index 0c14c474..c526374d 100644 --- a/jaffa-components/source/test/java/org/apache/log4j/jdbcplus/MDCFilterTest.java +++ b/jaffa-components/src/test/java/org/apache/log4j/jdbcplus/MDCFilterTest.java @@ -87,4 +87,4 @@ public void decide() { LOG.info("decide: " + ret); assertTrue(ret == Filter.NEUTRAL); } -} \ No newline at end of file +} diff --git a/jaffa-console/pom.xml b/jaffa-console/pom.xml index e0d10667..739848cf 100644 --- a/jaffa-console/pom.xml +++ b/jaffa-console/pom.xml @@ -9,7 +9,6 @@ 8.1.8-SNAPSHOT - org.jaffa jaffa-console Jaffa Console diff --git a/jaffa-console/src/test/java/org/jaffa/sc/apis/TreeNodeTest.java b/jaffa-console/src/test/java/org/jaffa/sc/apis/TreeNodeTest.java new file mode 100644 index 00000000..e7f2a2a7 --- /dev/null +++ b/jaffa-console/src/test/java/org/jaffa/sc/apis/TreeNodeTest.java @@ -0,0 +1,14 @@ +package org.jaffa.sc.apis; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class TreeNodeTest { + + @Test public void getTextTest() { + TreeNode testObject = new TreeNode("n1"); + testObject.setText("hi"); + assertEquals("hi", testObject.getText()); + } +}