From bfbbee6aea51b4298768c1d46d0926d8c6bc4a6d Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Fri, 21 May 2021 18:08:19 +0200 Subject: [PATCH] clean project --- README.md | 2 +- cli/pom.xml | 9 +- .../hsadmin/jscli/conf/CommandlineParser.java | 4 +- .../hsadmin/jscli/console/ConsoleWrapper.java | 2 +- cust-services/builder_project/enhance.xml | 24 -- cust-services/pom.xml | 101 ++------ .../migratePostgresLiquibaseChangeLogToH2.sh | 9 - .../customer/CustomerPackageBoPojoTest.java | 23 -- .../hsadmin/bo/customer/MemberAssetTest.java | 38 --- .../hsadmin/bo/customer/MemberShareTest.java | 36 --- .../bo/domain/DomainPackageBoTest.java | 18 -- .../hsadmin/bo/pac/PacPackageBoPojoTest.java | 25 -- .../hsadmin/dao/customer/CustomerDaoTest.java | 35 --- .../service/customer/ContactRemoteTest.java | 15 -- .../service/customer/CustomerRemoteTest.java | 15 -- .../customer/MemberAssetRemoteTest.java | 15 -- .../customer/MemberShareRemoteTest.java | 15 -- .../customer/MemberShareServiceTest.java | 148 ------------ .../service/customer/MemberShareVOTest.java | 198 ---------------- .../customer/SEPADirectDebitRemoteTest.java | 15 -- .../hsadmin/service/pac/HiveRemoteTest.java | 15 -- .../de/hsadmin/service/pac/PacRemoteTest.java | 15 -- .../java/de/hsadmin/test/JpaBasedTest.java | 77 ------- .../java/de/hsadmin/test/PojoTestUtil.java | 68 ------ database-services/pom.xml | 42 +--- .../database/MySqlDatabaseRemoteTest.java | 13 -- db-migration/pom.xml | 14 +- framework/pom.xml | 163 +++++-------- .../hsadmin/login/cas/CASTicketValidator.java | 1 + .../DefaultEnumParameterMapMapper.java | 1 - .../DefaultEnumPersistentObjectMapper.java | 4 +- .../property/BigDecimalPropertyTest.java | 150 ------------ ...faultBigDecimalParameterMapMapperTest.java | 63 ----- ...tBigDecimalPersistentObjectMapperTest.java | 62 ----- .../DefaultEnumParameterMapMapperTest.java | 32 --- ...DefaultEnumPersistentObjectMapperTest.java | 69 ------ .../service/property/PropertyRemoteTest.java | 17 -- .../java/de/hsadmin/test/BaseRemoteTest.java | 83 ------- .../java/de/hsadmin/test/CauseMatcher.java | 28 --- ldap-services/pom.xml | 64 ++--- pom.xml | 218 ++++-------------- 41 files changed, 154 insertions(+), 1792 deletions(-) delete mode 100644 cust-services/builder_project/enhance.xml delete mode 100755 cust-services/scripts/migratePostgresLiquibaseChangeLogToH2.sh delete mode 100644 cust-services/src/test/java/de/hsadmin/bo/customer/CustomerPackageBoPojoTest.java delete mode 100644 cust-services/src/test/java/de/hsadmin/bo/customer/MemberAssetTest.java delete mode 100644 cust-services/src/test/java/de/hsadmin/bo/customer/MemberShareTest.java delete mode 100644 cust-services/src/test/java/de/hsadmin/bo/domain/DomainPackageBoTest.java delete mode 100644 cust-services/src/test/java/de/hsadmin/bo/pac/PacPackageBoPojoTest.java delete mode 100644 cust-services/src/test/java/de/hsadmin/dao/customer/CustomerDaoTest.java delete mode 100644 cust-services/src/test/java/de/hsadmin/service/customer/ContactRemoteTest.java delete mode 100644 cust-services/src/test/java/de/hsadmin/service/customer/CustomerRemoteTest.java delete mode 100644 cust-services/src/test/java/de/hsadmin/service/customer/MemberAssetRemoteTest.java delete mode 100644 cust-services/src/test/java/de/hsadmin/service/customer/MemberShareRemoteTest.java delete mode 100644 cust-services/src/test/java/de/hsadmin/service/customer/MemberShareServiceTest.java delete mode 100644 cust-services/src/test/java/de/hsadmin/service/customer/MemberShareVOTest.java delete mode 100644 cust-services/src/test/java/de/hsadmin/service/customer/SEPADirectDebitRemoteTest.java delete mode 100644 cust-services/src/test/java/de/hsadmin/service/pac/HiveRemoteTest.java delete mode 100644 cust-services/src/test/java/de/hsadmin/service/pac/PacRemoteTest.java delete mode 100644 cust-services/src/test/java/de/hsadmin/test/JpaBasedTest.java delete mode 100644 cust-services/src/test/java/de/hsadmin/test/PojoTestUtil.java delete mode 100644 database-services/src/test/java/de/hsadmin/service/database/MySqlDatabaseRemoteTest.java delete mode 100644 framework/src/test/java/de/hsadmin/module/property/BigDecimalPropertyTest.java delete mode 100644 framework/src/test/java/de/hsadmin/module/property/mapping/DefaultBigDecimalParameterMapMapperTest.java delete mode 100644 framework/src/test/java/de/hsadmin/module/property/mapping/DefaultBigDecimalPersistentObjectMapperTest.java delete mode 100644 framework/src/test/java/de/hsadmin/module/property/mapping/DefaultEnumParameterMapMapperTest.java delete mode 100644 framework/src/test/java/de/hsadmin/module/property/mapping/DefaultEnumPersistentObjectMapperTest.java delete mode 100644 framework/src/test/java/de/hsadmin/service/property/PropertyRemoteTest.java delete mode 100644 framework/src/test/java/de/hsadmin/test/BaseRemoteTest.java delete mode 100644 framework/src/test/java/de/hsadmin/test/CauseMatcher.java diff --git a/README.md b/README.md index 987b3c4..54ca047 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Das neue Paket-Modul ist in Entwicklung https://dev.hostsharing.net/doc/hsadmin! ## run locally -Alles bauen und Eclise Konfiguration erzeugen: +Alles bauen und Eclipse Konfiguration erzeugen: ```bash mvn clean install eclipse:clean eclipse diff --git a/cli/pom.xml b/cli/pom.xml index 4473b91..1a8d2b9 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ de.hsadmin hsadmin-parent - 1.0-SNAPSHOT + 1.0.1 hsadmin-cli 1.2.0 @@ -17,12 +17,7 @@ de.hsadmin framework - 1.0-SNAPSHOT - - - de.hsadmin - framework - 1.0-SNAPSHOT + 1.0.1 org.apache.xmlrpc diff --git a/cli/src/main/java/de/hsadmin/jscli/conf/CommandlineParser.java b/cli/src/main/java/de/hsadmin/jscli/conf/CommandlineParser.java index 8da6c9a..2f36dc4 100644 --- a/cli/src/main/java/de/hsadmin/jscli/conf/CommandlineParser.java +++ b/cli/src/main/java/de/hsadmin/jscli/conf/CommandlineParser.java @@ -1,10 +1,10 @@ package de.hsadmin.jscli.conf; import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.apache.commons.cli.PosixParser; import de.hsadmin.common.config.Config; import de.hsadmin.common.error.TechnicalException; @@ -24,7 +24,7 @@ public class CommandlineParser { opts.addOption("e", "expr", true, "expression to execute"); opts.addOption("f", "file", true, "script file to execute"); opts.addOption("i", "interactive", false, "interactive shell"); - PosixParser parser = new PosixParser(); + DefaultParser parser = new DefaultParser(); try { if (args.length < 1) { printHelp(); diff --git a/cli/src/main/java/de/hsadmin/jscli/console/ConsoleWrapper.java b/cli/src/main/java/de/hsadmin/jscli/console/ConsoleWrapper.java index 25dad42..ae0e630 100644 --- a/cli/src/main/java/de/hsadmin/jscli/console/ConsoleWrapper.java +++ b/cli/src/main/java/de/hsadmin/jscli/console/ConsoleWrapper.java @@ -62,7 +62,7 @@ public class ConsoleWrapper implements PasswordReader { public String readPassword() throws TechnicalException { try { - final String pw = cons.readLine("Password: ", new Character('*')); + final String pw = cons.readLine("Password: ", Character.valueOf('*')); cons.setPrompt(prompt); return pw; } catch (IOException e) { diff --git a/cust-services/builder_project/enhance.xml b/cust-services/builder_project/enhance.xml deleted file mode 100644 index b324fbb..0000000 --- a/cust-services/builder_project/enhance.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cust-services/pom.xml b/cust-services/pom.xml index 610f836..5f6582e 100644 --- a/cust-services/pom.xml +++ b/cust-services/pom.xml @@ -5,7 +5,7 @@ de.hsadmin hsadmin-parent - 1.0-SNAPSHOT + 1.0.1 cust-webapp @@ -16,64 +16,47 @@ de.hsadmin framework - 1.0-SNAPSHOT - - - de.hsadmin - framework - 1.0-SNAPSHOT - test-jar - test + ${hsadmin.version} org.apache.geronimo.specs - geronimo-jpa_2.0_spec + geronimo-jpa_2.2_spec 1.1 provided org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0.1 + geronimo-ejb_3.1_spec + 1.0.2 provided org.apache.geronimo.specs - geronimo-validation_1.0_spec + geronimo-validation_2.0_spec 1.1 org.apache.bval org.apache.bval.bundle - 0.5 + ${bval.version} test org.apache.openjpa openjpa - 2.4.2 + ${openjpa.version} test - - - com.h2database - h2 - 1.4.194 - test - - org.liquibase liquibase-core - 3.5.3 + ${liquibase.version} test org.apache.xmlrpc xmlrpc-server - 3.1.3 + ${xmlrpc.version} javax.servlet @@ -105,72 +88,19 @@ **/XmlRpcServlet.properties - - - make-a-jar - compile - - jar - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - attach-artifacts - package - - attach-artifact - - - - - ${project.basedir}/target/cust-webapp-1.0-SNAPSHOT.jar - jar - - - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - migratePostgresLiquibaseChangeLogToH2 - generate-sources - - exec - - - ${project.basedir}/scripts/migratePostgresLiquibaseChangeLogToH2.${script.extension} - - ${project.parent.basedir}/db-migration/src/main/resources/liquibase/db.changelog.xml - ${project.build.directory}/classes/liquibase/db.changelog.xml - - - - - - - org.apache.openejb.maven + org.apache.tomee.maven tomee-maven-plugin - 1.7.4 + ${tomee.version} - 1.7.4 + ${tomee.version} webprofile false 8000 - cust-webapp ${project.basedir}/src/test/tomee/conf - org.postgresql:postgresql:9.4.1212.jre7 + ${postgresql.lib} @@ -196,8 +126,7 @@ org.apache.openjpa openjpa - - 2.4.2 + ${openjpa.version} compile diff --git a/cust-services/scripts/migratePostgresLiquibaseChangeLogToH2.sh b/cust-services/scripts/migratePostgresLiquibaseChangeLogToH2.sh deleted file mode 100755 index c06c1e1..0000000 --- a/cust-services/scripts/migratePostgresLiquibaseChangeLogToH2.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -mkdir -p $(dirname "$2") -sed \ - -e's/ deferrable="[a-z]*" initiallyDeferred="[a-z]*"//' \ - -e's/ type="INET"/ type="VARCHAR(19)"/' \ - -e'/generated.69/,+5d' \ - <"$1" >"$2" - -# -e'/changeset.* id="generated-69"/,+5d' \ diff --git a/cust-services/src/test/java/de/hsadmin/bo/customer/CustomerPackageBoPojoTest.java b/cust-services/src/test/java/de/hsadmin/bo/customer/CustomerPackageBoPojoTest.java deleted file mode 100644 index 59994c7..0000000 --- a/cust-services/src/test/java/de/hsadmin/bo/customer/CustomerPackageBoPojoTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package de.hsadmin.bo.customer; - -import static de.hsadmin.test.PojoTestUtil.*; - -import org.junit.Test; - -import de.hsadmin.test.PojoTestUtil; - -public class CustomerPackageBoPojoTest { - - @Test - public void ensureProperSetterGetterImplementations() { - PojoTestUtil.ensureProperSetterGetterImplementations("de.hsadmin.bo.customer", - include(de.hsadmin.bo.customer.Contact.class), - include(de.hsadmin.bo.customer.Customer.class), - include(de.hsadmin.bo.customer.IndicatorVAT.class), - include(de.hsadmin.bo.customer.SEPADirectDebit.class), - include(de.hsadmin.bo.customer.MemberShare.class), - include(de.hsadmin.bo.customer.MemberShareAction.class), - include(de.hsadmin.bo.customer.MemberAsset.class), - include(de.hsadmin.bo.customer.MemberAssetAction.class)); - } -} diff --git a/cust-services/src/test/java/de/hsadmin/bo/customer/MemberAssetTest.java b/cust-services/src/test/java/de/hsadmin/bo/customer/MemberAssetTest.java deleted file mode 100644 index 8ab4009..0000000 --- a/cust-services/src/test/java/de/hsadmin/bo/customer/MemberAssetTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package de.hsadmin.bo.customer; - - -import static org.junit.Assert.assertEquals; - -import java.math.BigDecimal; - -import org.joda.time.LocalDate; -import org.junit.Test; - -import de.hsadmin.dao.customer.CustomerDaoTest; -import de.hsadmin.test.JpaBasedTest; - -public class MemberAssetTest extends JpaBasedTest { - - @Test - public void testMemberAssetAgainstDatabase() { - // given - Customer customer = store(CustomerDaoTest.createNewCustomer(10001, "testCust")); - - // when - MemberAsset newEntity = store(createNewMemberAsset(customer)); - MemberAsset foundEntity = getEM().find(MemberAsset.class, newEntity.getId()); - - // then - assertEquals(newEntity.toString(), foundEntity.toString()); - } - - public static MemberAsset createNewMemberAsset(final Customer customer) { - MemberAsset newEntity = new MemberAsset(); - newEntity.setCustomer(customer); - newEntity.setAction(MemberAssetAction.PAYMENT); - newEntity.setDate(new LocalDate(2017, 4, 13).toDate()); - newEntity.setAmount(new BigDecimal("1234.56")); - newEntity.setComment("test comment"); - return newEntity; - } -} diff --git a/cust-services/src/test/java/de/hsadmin/bo/customer/MemberShareTest.java b/cust-services/src/test/java/de/hsadmin/bo/customer/MemberShareTest.java deleted file mode 100644 index ae3a668..0000000 --- a/cust-services/src/test/java/de/hsadmin/bo/customer/MemberShareTest.java +++ /dev/null @@ -1,36 +0,0 @@ -package de.hsadmin.bo.customer; - - -import static org.junit.Assert.assertEquals; - -import org.joda.time.LocalDate; -import org.junit.Test; - -import de.hsadmin.dao.customer.CustomerDaoTest; -import de.hsadmin.test.JpaBasedTest; - -public class MemberShareTest extends JpaBasedTest { - - @Test - public void testMemberShareAgainstDatabase() { - // given - Customer customer = store(CustomerDaoTest.createNewCustomer(10001, "testCust")); - - // when - MemberShare newEntity = store(createNewMemberShare(customer)); - MemberShare foundEntity = getEM().find(MemberShare.class, newEntity.getId()); - - // then - assertEquals(newEntity.toString(), foundEntity.toString()); - } - - public static MemberShare createNewMemberShare(final Customer customer) { - MemberShare newEntity = new MemberShare(); - newEntity.setCustomer(customer); - newEntity.setAction(MemberShareAction.SUBSCRIPTION); - newEntity.setDate(new LocalDate(2017, 4, 13).toDate()); - newEntity.setQuantity(5); - newEntity.setComment("test comment"); - return newEntity; - } -} diff --git a/cust-services/src/test/java/de/hsadmin/bo/domain/DomainPackageBoTest.java b/cust-services/src/test/java/de/hsadmin/bo/domain/DomainPackageBoTest.java deleted file mode 100644 index 836dbc3..0000000 --- a/cust-services/src/test/java/de/hsadmin/bo/domain/DomainPackageBoTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package de.hsadmin.bo.domain; - -import static de.hsadmin.test.PojoTestUtil.*; - -import org.junit.Test; - -import de.hsadmin.test.PojoTestUtil; - -public class DomainPackageBoTest { - - @Test - public void ensureProperSetterGetterImplementations() { - PojoTestUtil.ensureProperSetterGetterImplementations("de.hsadmin.bo.domain", - include(de.hsadmin.bo.domain.Domain.class), - include(de.hsadmin.bo.domain.DomainOption.class), - include(de.hsadmin.bo.domain.EMailAddress.class)); - } -} diff --git a/cust-services/src/test/java/de/hsadmin/bo/pac/PacPackageBoPojoTest.java b/cust-services/src/test/java/de/hsadmin/bo/pac/PacPackageBoPojoTest.java deleted file mode 100644 index bf24b63..0000000 --- a/cust-services/src/test/java/de/hsadmin/bo/pac/PacPackageBoPojoTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.hsadmin.bo.pac; - -import static de.hsadmin.test.PojoTestUtil.*; - -import org.junit.Test; - -import de.hsadmin.test.PojoTestUtil; - -public class PacPackageBoPojoTest { - - @Test - public void ensureProperSetterGetterImplementations() { - PojoTestUtil.ensureProperSetterGetterImplementations("de.hsadmin.bo.pac", - include(de.hsadmin.bo.pac.Hive.class), - include(de.hsadmin.bo.pac.BasePac.class), - include(de.hsadmin.bo.pac.Pac.class), - include(de.hsadmin.bo.pac.Component.class), - include(de.hsadmin.bo.pac.BaseComponent.class), - include(de.hsadmin.bo.pac.PacComponent.class), - include(de.hsadmin.bo.pac.EMailAlias.class), - include(de.hsadmin.bo.pac.UnixUser.class), - include(de.hsadmin.bo.pac.INetAddress.class), - exclude(de.hsadmin.bo.pac.PacEntityListener.class)); - } -} diff --git a/cust-services/src/test/java/de/hsadmin/dao/customer/CustomerDaoTest.java b/cust-services/src/test/java/de/hsadmin/dao/customer/CustomerDaoTest.java deleted file mode 100644 index 39c1492..0000000 --- a/cust-services/src/test/java/de/hsadmin/dao/customer/CustomerDaoTest.java +++ /dev/null @@ -1,35 +0,0 @@ -package de.hsadmin.dao.customer; - -import static org.junit.Assert.assertEquals; - -import org.junit.Before; -import org.junit.Test; - -import de.hsadmin.bo.customer.Customer; -import de.hsadmin.common.error.UserException; -import de.hsadmin.test.JpaBasedTest; - -public class CustomerDaoTest extends JpaBasedTest { - - private CustomerDao customerDao; - - @Before - public void init() { - customerDao = new CustomerDao(getEM()); - } - - @Test - public void findCustomerByName() throws UserException { - Customer newCustomer = store(createNewCustomer(100001, "test")); - - Customer foundCustomer = customerDao.findCustomerByName(newCustomer.getName()); - assertEquals(newCustomer.getId(), foundCustomer.getId()); - } - - public static Customer createNewCustomer(int memberNo, String memberCode) { - Customer newCustomer = new Customer(); - newCustomer.setMemberNo(memberNo); - newCustomer.setName(memberCode); - return newCustomer; - } -} diff --git a/cust-services/src/test/java/de/hsadmin/service/customer/ContactRemoteTest.java b/cust-services/src/test/java/de/hsadmin/service/customer/ContactRemoteTest.java deleted file mode 100644 index e8ca3b0..0000000 --- a/cust-services/src/test/java/de/hsadmin/service/customer/ContactRemoteTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package de.hsadmin.service.customer; - -import org.junit.Test; - -import de.hsadmin.test.BaseRemoteTest; - -public class ContactRemoteTest extends BaseRemoteTest { - - @Test - public void canInstantiateMemberShareServiceLocalViaRemoteRegistry() throws Exception { - givenRegisteredModuleLookupFor(ContactServiceLocal.class); - whenServiceIsRetrievedFromRemoteRegistryKey("contact"); - thenModuleInstantiatesServiceOfClass(ContactService.class); - } -} diff --git a/cust-services/src/test/java/de/hsadmin/service/customer/CustomerRemoteTest.java b/cust-services/src/test/java/de/hsadmin/service/customer/CustomerRemoteTest.java deleted file mode 100644 index e0f4f85..0000000 --- a/cust-services/src/test/java/de/hsadmin/service/customer/CustomerRemoteTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package de.hsadmin.service.customer; - -import org.junit.Test; - -import de.hsadmin.test.BaseRemoteTest; - -public class CustomerRemoteTest extends BaseRemoteTest { - - @Test - public void canInstantiateMemberShareServiceLocalViaRemoteRegistry() throws Exception { - givenRegisteredModuleLookupFor(CustomerServiceLocal.class); - whenServiceIsRetrievedFromRemoteRegistryKey("customer"); - thenModuleInstantiatesServiceOfClass(CustomerService.class); - } -} diff --git a/cust-services/src/test/java/de/hsadmin/service/customer/MemberAssetRemoteTest.java b/cust-services/src/test/java/de/hsadmin/service/customer/MemberAssetRemoteTest.java deleted file mode 100644 index 4db7c6a..0000000 --- a/cust-services/src/test/java/de/hsadmin/service/customer/MemberAssetRemoteTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package de.hsadmin.service.customer; - -import org.junit.Test; - -import de.hsadmin.test.BaseRemoteTest; - -public class MemberAssetRemoteTest extends BaseRemoteTest { - - @Test - public void canInstantiateMemberAssetServiceLocalViaRemoteRegistry() throws Exception { - givenRegisteredModuleLookupFor(MemberAssetServiceLocal.class); - whenServiceIsRetrievedFromRemoteRegistryKey("memberAsset"); - thenModuleInstantiatesServiceOfClass(MemberAssetService.class); - } -} diff --git a/cust-services/src/test/java/de/hsadmin/service/customer/MemberShareRemoteTest.java b/cust-services/src/test/java/de/hsadmin/service/customer/MemberShareRemoteTest.java deleted file mode 100644 index 84f8e8d..0000000 --- a/cust-services/src/test/java/de/hsadmin/service/customer/MemberShareRemoteTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package de.hsadmin.service.customer; - -import org.junit.Test; - -import de.hsadmin.test.BaseRemoteTest; - -public class MemberShareRemoteTest extends BaseRemoteTest { - - @Test - public void canInstantiateMemberShareServiceLocalViaRemoteRegistry() throws Exception { - givenRegisteredModuleLookupFor(MemberShareServiceLocal.class); - whenServiceIsRetrievedFromRemoteRegistryKey("memberShare"); - thenModuleInstantiatesServiceOfClass(MemberShareService.class); - } -} diff --git a/cust-services/src/test/java/de/hsadmin/service/customer/MemberShareServiceTest.java b/cust-services/src/test/java/de/hsadmin/service/customer/MemberShareServiceTest.java deleted file mode 100644 index 7854574..0000000 --- a/cust-services/src/test/java/de/hsadmin/service/customer/MemberShareServiceTest.java +++ /dev/null @@ -1,148 +0,0 @@ -package de.hsadmin.service.customer; - -import static org.junit.Assert.assertEquals; - -import java.util.Arrays; -import java.util.List; - -import javax.persistence.EntityManager; - -import org.apache.commons.lang3.NotImplementedException; -import org.joda.time.LocalDate; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; - -import de.hsadmin.bo.customer.Customer; -import de.hsadmin.bo.customer.MemberShare; -import de.hsadmin.bo.customer.MemberShareAction; -import de.hsadmin.common.error.TechnicalException; -import de.hsadmin.common.error.UserException; -import de.hsadmin.dao.customer.CustomerDao; -import de.hsadmin.login.RequestContext; -import de.hsadmin.login.Role; -import de.hsadmin.test.CauseMatcher; - -public class MemberShareServiceTest { - - @Mock - private RequestContext requestContextMock; - - @Mock - private EntityManager emMock; - - @Mock - private CustomerDao customerDaoMock; - - @Rule - public ExpectedException expectedExeption = ExpectedException.none(); - - private MemberShareService memberShareService; - - protected List memberSharesCriteriaQueryResult; - - @Before - public void init() { - MockitoAnnotations.initMocks(this); - memberShareService = new MemberShareService(emMock, customerDaoMock) { - @Override - List runCriteriaQuery(MemberShareVO criteria) throws UserException, TechnicalException { - return memberSharesCriteriaQueryResult; - } - }; - } - - @Test - public void buildVO() throws TechnicalException { - MemberShareVO newVO = memberShareService.buildVO(); - assertEquals(new MemberShareVO().toString(), newVO.toString()); - } - - @Test - public void create() throws TechnicalException, UserException { - // given - givenLoginRole(Role.SYSTEM); - MemberShareVO prototypeVO = MemberShareVOTest.givenInitializedMemberShareVOForCustomer(givenFakeCustomerWithName("testCust").getName()); - - // when - MemberShareVO createdVO = memberShareService.create(requestContextMock, prototypeVO); - - // then - assertEquals(prototypeVO.toString(), createdVO.toString()); - Mockito.verify(emMock, Mockito.only()).persist(Mockito.any(MemberShare.class)); - } - - @Test - public void read() throws TechnicalException, UserException { - // given - givenLoginRole(Role.SYSTEM); - Customer fakeCustomer = givenFakeCustomerWithName("testCust"); - MemberShareVO prototypeVO = MemberShareVOTest.givenEmptyMemberShareVOForCustomer(fakeCustomer.getName()); - MemberShare memberShare1 = givenFakeMemberShare(fakeCustomer, MemberShareAction.SUBSCRIPTION, 4 ); - MemberShare memberShare2 = givenFakeMemberShare(fakeCustomer, MemberShareAction.UNSUBSCRIPTION, 2 ); - givenCriteriaQueryResult(prototypeVO, memberShare1, memberShare2); - - // when - List readVOs = memberShareService.read(requestContextMock, prototypeVO); - - // then - assertEquals(2, readVOs.size()); - assertEquals("MemberShareVO [customer=testCust, action=SUBSCRIPTION, date=Fri Apr 14 00:00:00 CEST 2017, quantity=4, comment=some comment]", readVOs.get(0).toString()); - assertEquals("MemberShareVO [customer=testCust, action=UNSUBSCRIPTION, date=Fri Apr 14 00:00:00 CEST 2017, quantity=2, comment=some comment]", readVOs.get(1).toString()); - } - - @Test - public void update() throws TechnicalException, UserException { - MemberShareVO prototypeVO = MemberShareVOTest.givenInitializedMemberShareVOForCustomer("testCust"); - - // then - expectedExeption.expect(TechnicalException.class); - expectedExeption.expectCause(new CauseMatcher(NotImplementedException.class, "MemberShares are immutable")); - - // when - memberShareService.update(requestContextMock, prototypeVO, prototypeVO); - } - - @Test - public void delete() throws TechnicalException, UserException { - MemberShareVO prototypeVO = MemberShareVOTest.givenInitializedMemberShareVOForCustomer("testCust"); - - // then - expectedExeption.expect(TechnicalException.class); - expectedExeption.expectCause(new CauseMatcher(NotImplementedException.class, "MemberShares are immutable")); - - // when - memberShareService.delete(requestContextMock, prototypeVO); - } - - // === test fixture === - - private void givenLoginRole(Role role) { - Mockito.when(requestContextMock.getLoginRole()).thenReturn(role); - } - - private Customer givenFakeCustomerWithName(String name) throws UserException { - Customer fakeCustomer = new Customer(); - fakeCustomer.setName(name); - Mockito.when(customerDaoMock.findCustomerByName(name)).thenReturn(fakeCustomer); - return fakeCustomer; - } - - private MemberShare givenFakeMemberShare(Customer customer, MemberShareAction action, int quantity) { - MemberShare share = new MemberShare(); - share.setCustomer(customer); - share.setAction(action); - share.setQuantity(quantity); - share.setDate(new LocalDate(2017, 4, 14).toDate()); - share.setComment("some comment"); - return share; - } - - private void givenCriteriaQueryResult(MemberShareVO prototypeVO, MemberShare... memberShare) { - memberSharesCriteriaQueryResult = Arrays.asList(memberShare); - } -} diff --git a/cust-services/src/test/java/de/hsadmin/service/customer/MemberShareVOTest.java b/cust-services/src/test/java/de/hsadmin/service/customer/MemberShareVOTest.java deleted file mode 100644 index bcbd10a..0000000 --- a/cust-services/src/test/java/de/hsadmin/service/customer/MemberShareVOTest.java +++ /dev/null @@ -1,198 +0,0 @@ -package de.hsadmin.service.customer; - -import static junitparams.JUnitParamsRunner.$; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - -import org.joda.time.LocalDate; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; - -import de.hsadmin.bo.customer.MemberShare; -import de.hsadmin.bo.customer.MemberShareTest; -import de.hsadmin.common.error.TechnicalException; -import de.hsadmin.common.error.UserException; -import de.hsadmin.dao.customer.CustomerDaoTest; -import de.hsadmin.module.impl.ValidationDelegate; -import de.hsadmin.module.property.Property; -import junitparams.JUnitParamsRunner; -import junitparams.Parameters; - -@RunWith(JUnitParamsRunner.class) -public class MemberShareVOTest { - - private static final String INITIAL_COMMENT = "initial comment"; - - private static final LocalDate INITIAL_DATE = new LocalDate(1996, 12, 26); - - private static final String INITIAL_ACTION = "SUBSCRIPTION"; - - private static final String INITIAL_CUSTOMER = "initCust"; - - private static final int INITIAL_QUANTITY = 4; - - private static final String INITIALIZED_MEMBER_SHARE_VO_AS_STRING = "MemberShareVO [customer=initCust, action=SUBSCRIPTION, date=Thu Dec 26 00:00:00 CET 1996, quantity=4, comment=initial comment]"; - - private final ValidationDelegate validator = new ValidationDelegate(); - - @Rule - public final ExpectedException exception = ExpectedException.none(); - - // --- special tests --- - - @Test - public void toStringTest() throws TechnicalException, UserException { - - MemberShareVO vo = givenInitializedMemberShareVOForCustomer(INITIAL_CUSTOMER); - - // ACHTUNG: - // Wenn die toString() Implementierung geaendert wurde, - // koennten auch andere Tests fehlschlagen. - // Wenn Felder aus dem toString() herausgenommen werden, - // koennten sogar andere Tests stillschweigend wirkungslos werden! - assertEquals(INITIALIZED_MEMBER_SHARE_VO_AS_STRING, vo.toString()); - } - - @Test - public void copyPropertiesFromPersistentObject() throws TechnicalException, UserException { - // given - MemberShare bo = MemberShareTest.createNewMemberShare(CustomerDaoTest.createNewCustomer(10001, "testCust")); - - // when - MemberShareVO vo = new MemberShareVO(); - vo.copyPropertiesFromPersistentObject(bo); - - // then - assertEquals("MemberShareVO [customer=testCust, action=SUBSCRIPTION, date=Thu Apr 13 00:00:00 CEST 2017, quantity=5, comment=test comment]", - vo.toString()); - } - - @Test - public void copyPropertiesToPersistentObject() throws TechnicalException, UserException { - // given - MemberShareVO vo = givenInitializedMemberShareVOForCustomer(INITIAL_CUSTOMER); - - // when - MemberShare bo = new MemberShare(); - vo.copyPropertiesToPersistentObject(bo); - - // then (Achtung: customer muss vom Service umkopiert werden) - assertEquals("MemberShare [id=0, customer=null, date=Thu Dec 26 00:00:00 CET 1996, action=SUBSCRIPTION, quantity=4, comment=initial comment]", - bo.toString()); - } - - // --- generic tests --- - - @Test - @Parameters(method = "properties") - public void propertyIsRequired(final String propertyName) throws UserException, TechnicalException { - MemberShareVO initializedMemberShareVO = givenInitializedMemberShareVOForCustomer(INITIAL_CUSTOMER); - initializedMemberShareVO.get(propertyName).setValue(null); - assertInitialPropertyValueIsNull(initializedMemberShareVO, propertyName); - assertPrototypeIsNotCreateable(initializedMemberShareVO, "MSG_REQUIRED_FIELD: " + propertyName); - } - public static Object[] properties() { - return $( - // nur die Properties auffuehren, die 'required' sind - "customer", - "action", - "date", - "quantity", - "comment" - ); - } - - @Test - @Parameters(method = "propertiesWithInitialValues") - public void propertyIsCreatable(final String propertyName, final Object initialValue) throws UserException, TechnicalException { - MemberShareVO initializedMemberShareVO = givenInitializedMemberShareVOForCustomer(INITIAL_CUSTOMER); - assertInitialPropertyValue(initializedMemberShareVO, propertyName, initialValue); - assertPrototypeIsCreateable(initializedMemberShareVO); - } - public static Object[] propertiesWithInitialValues() { - return $( - // nur die Properties auffuehren, die 'creatable' sind - $("customer", INITIAL_CUSTOMER), - $("action", INITIAL_ACTION), - $("date", INITIAL_DATE.toDate()), - $("quantity", + INITIAL_QUANTITY), - $("comment", INITIAL_COMMENT) - ); - } - - @Test - @Parameters(method = "propertiesWithChangedValues") - public void propertyIsNotUpdateable(final String propertyName, final Object changedValue) throws UserException, TechnicalException { - MemberShareVO initializedMemberShareVO = givenInitializedMemberShareVOForCustomer(INITIAL_CUSTOMER); - assertChangedPropertyValue(initializedMemberShareVO, propertyName, changedValue); - assertPrototypeIsNotUpdateable(initializedMemberShareVO, "MSG_NO_FIELD_WRITEACCESS: " + propertyName); - } - public static Object[] propertiesWithChangedValues() { - return $( - // nur die Properties auffuehren, die NICHT 'updateable' sind - $("customer", INITIAL_CUSTOMER + "Changed"), - $("action", "UN" + INITIAL_ACTION), - $("date", INITIAL_DATE.plusDays(1).toDate()), - $("quantity", + INITIAL_QUANTITY * 2), - $("comment", INITIAL_COMMENT + "Changed") - ); - } - - // === test fixture === - - public static MemberShareVO givenEmptyMemberShareVOForCustomer(String customerName) throws TechnicalException, UserException { - MemberShareVO memberShareVO = new MemberShareVO(); - memberShareVO.setCustomer(customerName); - return memberShareVO; - } - - public static MemberShareVO givenInitializedMemberShareVOForCustomer(String customerName) throws TechnicalException, UserException { - MemberShareVO memberShareVO = new MemberShareVO(); - memberShareVO.setCustomer(customerName); - memberShareVO.setAction(INITIAL_ACTION); - memberShareVO.setDate( INITIAL_DATE.toDate() ); - memberShareVO.setQuantity(INITIAL_QUANTITY); - memberShareVO.setComment(INITIAL_COMMENT); - memberShareVO.initPropertyValues(); - return memberShareVO; - } - - private void assertInitialPropertyValueIsNull(final MemberShareVO memberShareVO, final String propertyName) throws UserException, TechnicalException { - assertNull(memberShareVO.get(propertyName).getValue()); - } - - private void assertInitialPropertyValue(final MemberShareVO memberShareVO, final String propertyName, final Object expectedValue) throws UserException, TechnicalException { - assertEquals(expectedValue, memberShareVO.get(propertyName).getValue()); - } - - private void assertChangedPropertyValue(final MemberShareVO memberShareVO, final String propertyName, final T changedValue) throws UserException, TechnicalException { - @SuppressWarnings("unchecked") - Property customerProp = (Property) memberShareVO.get(propertyName); - customerProp.setValue(changedValue); - assertEquals(changedValue, customerProp.getValue()); - } - - private void assertPrototypeIsCreateable(final MemberShareVO memberShareVO) throws UserException, TechnicalException { - validator.checkPrototypeIsCreateable(memberShareVO); - } - - private void assertPrototypeIsNotCreateable(final MemberShareVO someMemberShareVO, final String expectedMessage) throws UserException, TechnicalException { - exception.expect(UserException.class); - exception.expectMessage(expectedMessage); - validator.checkPrototypeIsCreateable(someMemberShareVO); - } - - private void assertPrototypeIsNotUpdateable(final MemberShareVO someMemberShareVO, final String expectedMessage) throws UserException, TechnicalException { - exception.expect(UserException.class); - exception.expectMessage(expectedMessage); - validator.checkPrototypeIsUpdateable(someMemberShareVO); - } - - public LocalDate asDate(String input) { - return LocalDate.parse(input); - } -} - - diff --git a/cust-services/src/test/java/de/hsadmin/service/customer/SEPADirectDebitRemoteTest.java b/cust-services/src/test/java/de/hsadmin/service/customer/SEPADirectDebitRemoteTest.java deleted file mode 100644 index f0d21a2..0000000 --- a/cust-services/src/test/java/de/hsadmin/service/customer/SEPADirectDebitRemoteTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package de.hsadmin.service.customer; - -import org.junit.Test; - -import de.hsadmin.test.BaseRemoteTest; - -public class SEPADirectDebitRemoteTest extends BaseRemoteTest { - - @Test - public void canInstantiateMemberShareServiceLocalViaRemoteRegistry() throws Exception { - givenRegisteredModuleLookupFor(SEPADirectDebitServiceLocal.class); - whenServiceIsRetrievedFromRemoteRegistryKey("mandat"); - thenModuleInstantiatesServiceOfClass(SEPADirectDebitService.class); - } -} diff --git a/cust-services/src/test/java/de/hsadmin/service/pac/HiveRemoteTest.java b/cust-services/src/test/java/de/hsadmin/service/pac/HiveRemoteTest.java deleted file mode 100644 index 85d34c8..0000000 --- a/cust-services/src/test/java/de/hsadmin/service/pac/HiveRemoteTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package de.hsadmin.service.pac; - -import org.junit.Test; - -import de.hsadmin.test.BaseRemoteTest; - -public class HiveRemoteTest extends BaseRemoteTest { - - @Test - public void canInstantiateMemberShareServiceLocalViaRemoteRegistry() throws Exception { - givenRegisteredModuleLookupFor(HiveServiceLocal.class); - whenServiceIsRetrievedFromRemoteRegistryKey("hive"); - thenModuleInstantiatesServiceOfClass(HiveService.class); - } -} diff --git a/cust-services/src/test/java/de/hsadmin/service/pac/PacRemoteTest.java b/cust-services/src/test/java/de/hsadmin/service/pac/PacRemoteTest.java deleted file mode 100644 index d81b89a..0000000 --- a/cust-services/src/test/java/de/hsadmin/service/pac/PacRemoteTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package de.hsadmin.service.pac; - -import org.junit.Test; - -import de.hsadmin.test.BaseRemoteTest; - -public class PacRemoteTest extends BaseRemoteTest { - - @Test - public void canInstantiateMemberShareServiceLocalViaRemoteRegistry() throws Exception { -// givenRegisteredModuleLookupFor(PacServiceLocal.class); -// whenServiceIsRetrievedFromRemoteRegistryKey("pac"); -// thenModuleInstantiatesServiceOfClass(PacService.class); - } -} diff --git a/cust-services/src/test/java/de/hsadmin/test/JpaBasedTest.java b/cust-services/src/test/java/de/hsadmin/test/JpaBasedTest.java deleted file mode 100644 index 8eaad47..0000000 --- a/cust-services/src/test/java/de/hsadmin/test/JpaBasedTest.java +++ /dev/null @@ -1,77 +0,0 @@ -package de.hsadmin.test; - -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Persistence; - -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; - -import liquibase.Liquibase; -import liquibase.database.Database; -import liquibase.database.DatabaseFactory; -import liquibase.database.jvm.JdbcConnection; -import liquibase.resource.ClassLoaderResourceAccessor; - -public abstract class JpaBasedTest { - - private static final String UNIT_NAME = "HSADMIN_H2_TEST_DB"; - - private static final EntityManagerFactory emf = Persistence.createEntityManagerFactory(UNIT_NAME); - - private EntityManager em; - - @BeforeClass - public static void setupDatabase() throws Exception { - EntityManager em = emf.createEntityManager(); - java.sql.Connection connection = em.unwrap(java.sql.Connection.class); - em.getTransaction().begin(); - try { - Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(new JdbcConnection(connection)); - Liquibase liquibase = new Liquibase("liquibase/db.changelog.xml", new ClassLoaderResourceAccessor(), database); - liquibase.update("test"); - } finally { - em.getTransaction().commit(); - } - } - - @Before - public void startTransaction() { - em = emf.createEntityManager(); - em.getTransaction().begin(); - } - - @After - public void rollbacktransaction() { - // make sure constraint violations are found - em.flush(); - - // but rollback the transaction - try { - EntityTransaction transaction = em.getTransaction(); - if ( transaction.isActive() ) { - em.getTransaction().rollback(); - } - } finally { - // and close the EntityManager - if (em.isOpen()) { - em.close(); - } - } - } - - public EntityManager getEM() { - return em; - } - - - - public T store(T newEntity) { - getEM().persist(newEntity); - getEM().flush(); - getEM().clear(); - return newEntity; - } -} diff --git a/cust-services/src/test/java/de/hsadmin/test/PojoTestUtil.java b/cust-services/src/test/java/de/hsadmin/test/PojoTestUtil.java deleted file mode 100644 index 489d79c..0000000 --- a/cust-services/src/test/java/de/hsadmin/test/PojoTestUtil.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.hsadmin.test; - -import static org.junit.Assert.assertEquals; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import com.openpojo.reflection.PojoClass; -import com.openpojo.reflection.PojoClassFilter; -import com.openpojo.reflection.filters.FilterChain; -import com.openpojo.reflection.filters.FilterClassName; -import com.openpojo.reflection.filters.FilterNestedClasses; -import com.openpojo.reflection.filters.FilterPackageInfo; -import com.openpojo.reflection.impl.PojoClassFactory; -import com.openpojo.validation.Validator; -import com.openpojo.validation.ValidatorBuilder; -import com.openpojo.validation.test.impl.GetterTester; -import com.openpojo.validation.test.impl.SetterTester; - -public class PojoTestUtil { - - public static void ensureProperSetterGetterImplementations(final String packageUnderTest, String... expectedClasseNames ) { - ensureExpectedClassesAreTested(packageUnderTest, Arrays.asList(expectedClasseNames) ); - - Validator validator = ValidatorBuilder.create() - // See com.openpojo.validation.test.impl for more ... - .with(new SetterTester()) - .with(new GetterTester()) - .build(); - validator.validate(packageUnderTest, new FilterPackageInfo()); - } - - public static String include(Class clazz) { - return clazz.getName(); - } - - public static String exclude(Class clazz) { - return clazz.getName(); - } - - private static void ensureExpectedClassesAreTested(final String packageUnderTest, final List expectedClassNames) { - Collections.sort(expectedClassNames); - List pojoClasseNames = new ArrayList(); - for ( PojoClass p: PojoClassFactory.getPojoClasses(packageUnderTest, - new FilterChain(new FilterPackageInfo(), new FilterNestedClasses(), new FilterInverse(new FilterClassName(".*Test$"))) ) ) { - pojoClasseNames.add( p.getClazz().getName() ); - } - Collections.sort(pojoClasseNames); - - assertEquals("precondition failed", expectedClassNames.toString().replaceAll(", ", "\n"), pojoClasseNames.toString().replaceAll(", ", "\n")); - } - - private static class FilterInverse implements PojoClassFilter { - - private PojoClassFilter delegate; - - public FilterInverse(PojoClassFilter delegate) { - this.delegate = delegate; - } - - @Override - public boolean include(PojoClass pojoClass) { - return !delegate.include(pojoClass); - } - } -} diff --git a/database-services/pom.xml b/database-services/pom.xml index 621e662..d7713a7 100644 --- a/database-services/pom.xml +++ b/database-services/pom.xml @@ -5,7 +5,7 @@ de.hsadmin hsadmin-parent - 1.0-SNAPSHOT + 1.0.1 database-webapp @@ -15,42 +15,34 @@ de.hsadmin framework - 1.0-SNAPSHOT - - - de.hsadmin - framework - 1.0-SNAPSHOT - test-jar - test + ${hsadmin.version} de.hsadmin cust-webapp - 1.0-SNAPSHOT + ${hsadmin.version} org.apache.geronimo.specs - geronimo-jpa_2.0_spec + geronimo-jpa_2.2_spec 1.1 provided org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0.1 + geronimo-ejb_3.1_spec + 1.0.2 provided org.apache.geronimo.specs - geronimo-validation_1.0_spec + geronimo-validation_2.0_spec 1.1 - provided org.apache.xmlrpc xmlrpc-server - 3.1.3 + ${xmlrpc.version} javax.servlet @@ -63,27 +55,17 @@ database-webapp - org.jacoco - jacoco-maven-plugin - - - maven-war-plugin - - true - - - - org.apache.openejb.maven + org.apache.tomee.maven tomee-maven-plugin - 1.7.4 + ${tomee.version} - 1.7.4 + ${tomee.version} webprofile false 8000 ${project.basedir}/src/test/tomee/conf - org.postgresql:postgresql:9.4.1212.jre7 + ${postgresql.lib} diff --git a/database-services/src/test/java/de/hsadmin/service/database/MySqlDatabaseRemoteTest.java b/database-services/src/test/java/de/hsadmin/service/database/MySqlDatabaseRemoteTest.java deleted file mode 100644 index ff0a89f..0000000 --- a/database-services/src/test/java/de/hsadmin/service/database/MySqlDatabaseRemoteTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package de.hsadmin.service.database; - -import org.junit.Test; - -public class MySqlDatabaseRemoteTest extends de.hsadmin.test.BaseRemoteTest { - - @Test - public void canInstantiateMemberShareServiceLocalViaRemoteRegistry() throws Exception { - givenRegisteredModuleLookupFor(MySqlDatabaseServiceLocal.class); - whenServiceIsRetrievedFromRemoteRegistryKey("mysqldb"); -// thenModuleInstantiatesServiceOfClass(MySqlDatabaseService.class); FIXME - } -} diff --git a/db-migration/pom.xml b/db-migration/pom.xml index 2249b55..b7c9374 100644 --- a/db-migration/pom.xml +++ b/db-migration/pom.xml @@ -4,7 +4,7 @@ de.hsadmin hsadmin-parent - 1.0-SNAPSHOT + 1.0.1 db-migration war @@ -12,13 +12,13 @@ javax.servlet javax.servlet-api - 3.0.1 + ${servlet.version} provided org.liquibase liquibase-core - 3.5.3 + ${liquibase.version} runtime @@ -26,17 +26,17 @@ db-migration - org.apache.openejb.maven + org.apache.tomee.maven tomee-maven-plugin - 1.7.4 + ${tomee.version} - 1.7.4 + ${tomee.version} webprofile false 8000 ${project.basedir}/src/test/tomee/conf - org.postgresql:postgresql:9.4.1212.jre7 + ${postgresql.lib} diff --git a/framework/pom.xml b/framework/pom.xml index 82e71bf..ddc1a78 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -1,124 +1,65 @@ - 4.0.0 - - de.hsadmin - hsadmin-parent - 1.0-SNAPSHOT - - framework - jar + 4.0.0 + + de.hsadmin + hsadmin-parent + 1.0.1 + + framework + jar - HSAdmin Framework + HSAdmin Framework - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - - test-jar - - - - - - - org.jacoco - jacoco-maven-plugin - - - - - - - org.apache.geronimo.specs - geronimo-jpa_2.0_spec - 1.1 - provided - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0.1 - provided - - - org.apache.geronimo.specs - geronimo-validation_1.0_spec - 1.1 - - - org.apache.bval - org.apache.bval.bundle - 0.5 - test - + - org.apache.xmlrpc - xmlrpc-server - 3.1.3 + org.apache.geronimo.specs + geronimo-jpa_2.2_spec + 1.1 + provided - log4j - log4j - 1.2.17 + org.apache.geronimo.specs + geronimo-ejb_3.1_spec + 1.0.2 + provided - joda-time - joda-time - 2.9.9 + org.apache.geronimo.specs + geronimo-validation_2.0_spec + 1.1 - - - com.h2database - h2 - 1.4.194 - test - - - - org.apache.openjpa - openjpa - 2.4.2 - test - - - org.liquibase - liquibase-core - 3.5.3 - test - - + + org.apache.bval + org.apache.bval.bundle + ${bval.version} + test + + + org.apache.xmlrpc + xmlrpc-server + ${xmlrpc.version} + + + log4j + log4j + ${log4j.version} + + + org.apache.openjpa + openjpa + ${openjpa.version} + test + + + org.liquibase + liquibase-core + ${liquibase.version} + test + + diff --git a/framework/src/main/java/de/hsadmin/login/cas/CASTicketValidator.java b/framework/src/main/java/de/hsadmin/login/cas/CASTicketValidator.java index 96e6039..51e5281 100644 --- a/framework/src/main/java/de/hsadmin/login/cas/CASTicketValidator.java +++ b/framework/src/main/java/de/hsadmin/login/cas/CASTicketValidator.java @@ -45,6 +45,7 @@ public class CASTicketValidator implements TicketValidator { } nextLine = reader.readLine(); } + reader.close(); inputStream.close(); throw new UserException(new UserError(UserError.MSG_INVALID_TICKET)); } catch (IOException e) { diff --git a/framework/src/main/java/de/hsadmin/module/property/mapping/DefaultEnumParameterMapMapper.java b/framework/src/main/java/de/hsadmin/module/property/mapping/DefaultEnumParameterMapMapper.java index 0f96e3c..77a3ac6 100644 --- a/framework/src/main/java/de/hsadmin/module/property/mapping/DefaultEnumParameterMapMapper.java +++ b/framework/src/main/java/de/hsadmin/module/property/mapping/DefaultEnumParameterMapMapper.java @@ -18,7 +18,6 @@ public class DefaultEnumParameterMapMapper implements ParameterMapMapper } @Override - @SuppressWarnings("unchecked") public Enum readValueFromParameterMap(Map rpcParameter, final String propertyName, final Class propertyClass) throws TechnicalException, UserException { diff --git a/framework/src/main/java/de/hsadmin/module/property/mapping/DefaultEnumPersistentObjectMapper.java b/framework/src/main/java/de/hsadmin/module/property/mapping/DefaultEnumPersistentObjectMapper.java index 20ce420..b97dd0b 100644 --- a/framework/src/main/java/de/hsadmin/module/property/mapping/DefaultEnumPersistentObjectMapper.java +++ b/framework/src/main/java/de/hsadmin/module/property/mapping/DefaultEnumPersistentObjectMapper.java @@ -25,9 +25,9 @@ public class DefaultEnumPersistentObjectMapper implements PersistentObjectMapper public void writeValueToPersistentObject(Object persistentObject, String propertyName, String value) throws TechnicalException, UserException { - Class propertyClass = ReflectionUtil.getFieldType(persistentObject, propertyName); + final Class propertyClass = ReflectionUtil.getFieldType(persistentObject, propertyName); @SuppressWarnings("unchecked") - Enum enumValue = Enum.valueOf(propertyClass.asSubclass(Enum.class), value); + final Enum enumValue = Enum.valueOf(propertyClass.asSubclass(Enum.class), value); ReflectionUtil.invokeSetter(persistentObject, propertyName, enumValue); } } \ No newline at end of file diff --git a/framework/src/test/java/de/hsadmin/module/property/BigDecimalPropertyTest.java b/framework/src/test/java/de/hsadmin/module/property/BigDecimalPropertyTest.java deleted file mode 100644 index 446d4a9..0000000 --- a/framework/src/test/java/de/hsadmin/module/property/BigDecimalPropertyTest.java +++ /dev/null @@ -1,150 +0,0 @@ -package de.hsadmin.module.property; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; - -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; - -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -import de.hsadmin.common.error.TechnicalException; -import de.hsadmin.common.error.UserException; -import de.hsadmin.module.ValueObject; -import de.hsadmin.module.impl.AbstractVO; -import de.hsadmin.module.property.mapping.DefaultBigDecimalPersistentObjectMapper; -import de.hsadmin.module.property.mapping.DefaultStringParameterMapMapper; -import de.hsadmin.module.property.mapping.Mapping; - -public class BigDecimalPropertyTest { - - private final TestBO testBO = new TestBO(); - - private TestVO testVO; - private Property voPropertyFrontendConverted; - private Property voPropertyBackendConverted; - private Map rpcParameterMap = new HashMap(); - - @Before - @SuppressWarnings("unchecked") - public void init() throws TechnicalException, UserException { - testVO = new TestVO(); - testVO.amountFrontendConverted = new BigDecimal("9876.43"); - testVO.amountBackendConverted = new BigDecimal("1234.56"); - testVO.initPropertyValues(); - - voPropertyFrontendConverted = (Property) testVO.get("amountFrontendConverted"); - voPropertyBackendConverted = (Property) testVO.get("amountBackendConverted"); - } - - @Test - @Ignore("MHOENNIG: muss mit PHORMANNS geklaert werden, warum es diese PersistenceMapper ueberhaupt gibt, scheinen mir sinnlos ") - public void effectivePersistentObjectMapperIsDefaultBigDecimalPersistentObjectMapper() throws TechnicalException, UserException { - // VO -> BO - voPropertyBackendConverted.setValue(new BigDecimal("1234.56")); - // FIXME MHOENNIG->PHORMANNS: - // in writeValueToPersistentObject(...) haette ich die Konvertierung erwartet, - // aber auch beim DefaultDatePersistentObjectMapper ist gerade da keine Konvertierung, - // so nun zunaechst auch analog beim DefaultBigDecimalPersistentObjectMapper. - voPropertyBackendConverted.copyValueToPersistentObject(testBO); - assertEquals("1234.56", testBO.amountBackendConverted); - - // BO -> VO - testBO.amountBackendConverted = "1111.11"; - voPropertyBackendConverted.copyValueFromPersistentObject(testBO); - assertEquals("1111.11", testVO.amountBackendConverted); - } - - @Test - public void effectiveParameterMapMapperIsDefaultBigDecimalParameterMapMapper() throws TechnicalException, UserException { - // VO -> rpcParameterMap - voPropertyFrontendConverted.setValue(new BigDecimal("1234.56")); - voPropertyFrontendConverted.copyValueToParameterMap(rpcParameterMap);; - assertEquals("1234.56", rpcParameterMap.get("amountFrontendConverted")); - - // rpcParameterMap -> VO - rpcParameterMap.put("amountFrontendConverted", "1111.11"); - voPropertyFrontendConverted.copyValueFromParameterMap(rpcParameterMap); - assertEquals(new BigDecimal("1111.11"), testVO.amountFrontendConverted); - } - - @Test - public void getValueTypeIsBigDecimal() { - assertSame(BigDecimal.class, voPropertyFrontendConverted.getValueType()); - } - - // === test fixture === - - public static class TestVO extends AbstractVO implements ValueObject { - - @ReadWrite(ReadWritePolicy.READWRITE) - @Required(true) - @Search(SearchPolicy.COMPARE) - private BigDecimal amountFrontendConverted; - - @Mapping(boMapping=DefaultBigDecimalPersistentObjectMapper.class, - rpcMapping=DefaultStringParameterMapMapper.class) - @ReadWrite(ReadWritePolicy.READWRITE) - @Required(true) - @Search(SearchPolicy.LIKE) - private BigDecimal amountBackendConverted; - - - public TestVO() throws TechnicalException { - super(); - } - - - public BigDecimal getAmountFrontendConverted() { - return amountFrontendConverted; - } - - - public void setAmountFrontendConverted(BigDecimal amountFrontendConverted) { - this.amountFrontendConverted = amountFrontendConverted; - } - - - public BigDecimal getAmountBackendConverted() { - return amountBackendConverted; - } - - - public void setAmountBackendConverted(BigDecimal amountBackendConverted) { - this.amountBackendConverted = amountBackendConverted; - } - } - - public static class TestBO { - - @ReadWrite(ReadWritePolicy.READWRITE) - @Required(true) - @Search(SearchPolicy.COMPARE) - private BigDecimal amountFrontendConverted; - - @ReadWrite(ReadWritePolicy.READWRITE) - @Required(true) - @Search(SearchPolicy.LIKE) - private String amountBackendConverted; - - public BigDecimal getAmountFrontendConverted() { - return amountFrontendConverted; - } - - public void setAmountFrontendConverted(BigDecimal amountFrontendConverted) { - this.amountFrontendConverted = amountFrontendConverted; - } - - public String getAmountBackendConverted() { - return amountBackendConverted; - } - - public void setAmountBackendConverted(String amountBackendConverted) { - this.amountBackendConverted = amountBackendConverted; - } - - } -} diff --git a/framework/src/test/java/de/hsadmin/module/property/mapping/DefaultBigDecimalParameterMapMapperTest.java b/framework/src/test/java/de/hsadmin/module/property/mapping/DefaultBigDecimalParameterMapMapperTest.java deleted file mode 100644 index df9c8e7..0000000 --- a/framework/src/test/java/de/hsadmin/module/property/mapping/DefaultBigDecimalParameterMapMapperTest.java +++ /dev/null @@ -1,63 +0,0 @@ -package de.hsadmin.module.property.mapping; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -import org.junit.Test; - -import de.hsadmin.common.error.TechnicalException; -import de.hsadmin.common.error.UserException; - -public class DefaultBigDecimalParameterMapMapperTest { - - private final Map rpcParameters = new HashMap(); - private final DefaultBigDecimalParameterMapMapper defaultBigDecimalParameterMapMapper = new DefaultBigDecimalParameterMapMapper(); - - @Test - public void readValueFromParameterMapWithNumericString() throws TechnicalException, UserException{ - rpcParameters.put("test", "1234.56"); - assertEquals(new BigDecimal("1234.56"), defaultBigDecimalParameterMapMapper.readValueFromParameterMap(rpcParameters, "test", BigDecimal.class)); - } - - @Test(expected=TechnicalException.class) - public void readValueFromParameterMapWithNonNumericString() throws TechnicalException, UserException{ - rpcParameters.put("test", "not a number"); - defaultBigDecimalParameterMapMapper.readValueFromParameterMap(rpcParameters, "test", BigDecimal.class); - } - - @Test(expected=TechnicalException.class) - public void readValueFromParameterMapWithNumericStringWithGarbage() throws TechnicalException, UserException{ - rpcParameters.put("test", "1234x"); - defaultBigDecimalParameterMapMapper.readValueFromParameterMap(rpcParameters, "test", BigDecimal.class); - } - - @Test - public void readValueFromParameterMapWithBigDecimal() throws TechnicalException, UserException{ - rpcParameters.put("test", new BigDecimal("1234.56")); - assertEquals(new BigDecimal("1234.56"), defaultBigDecimalParameterMapMapper.readValueFromParameterMap(rpcParameters, "test", BigDecimal.class)); - } - - @Test - public void readValueFromParameterMapWithBigOther() throws TechnicalException, UserException{ - rpcParameters.put("test", new Date()); - assertNull(defaultBigDecimalParameterMapMapper.readValueFromParameterMap(rpcParameters, "test", BigDecimal.class)); - } - - @Test - public void writeValueToParameterMap() throws TechnicalException, UserException{ - defaultBigDecimalParameterMapMapper.writeValueToParameterMap(rpcParameters, "test", new BigDecimal("9876.64")); - assertEquals("9876.64", rpcParameters.get("test")); - } - - @Test - public void writeNullValueToParameterMap() throws TechnicalException, UserException{ - defaultBigDecimalParameterMapMapper.writeValueToParameterMap(rpcParameters, "test", null); - assertFalse(rpcParameters.containsKey("test")); - } -} diff --git a/framework/src/test/java/de/hsadmin/module/property/mapping/DefaultBigDecimalPersistentObjectMapperTest.java b/framework/src/test/java/de/hsadmin/module/property/mapping/DefaultBigDecimalPersistentObjectMapperTest.java deleted file mode 100644 index c042261..0000000 --- a/framework/src/test/java/de/hsadmin/module/property/mapping/DefaultBigDecimalPersistentObjectMapperTest.java +++ /dev/null @@ -1,62 +0,0 @@ -package de.hsadmin.module.property.mapping; - -import static org.junit.Assert.assertEquals; - -import java.math.BigDecimal; - -import org.junit.Test; - -import de.hsadmin.common.error.TechnicalException; -import de.hsadmin.common.error.UserException; - -public class DefaultBigDecimalPersistentObjectMapperTest { - - private DefaultBigDecimalPersistentObjectMapper mapper = new DefaultBigDecimalPersistentObjectMapper(); - - @Test - public void readValueFromPersistentObjectHavingEnum() throws TechnicalException, UserException { - SomeBO persistentObject = new SomeBO(new BigDecimal("1234.56")); - assertEquals( new BigDecimal("1234.56"), mapper.readValueFromPersistentObject(persistentObject, "someBigDecimalProp")); - } - - @Test - public void readValueFromPersistentObjectHavingString() throws TechnicalException, UserException { - SomeBO persistentObject = new SomeBO(new BigDecimal("9876.54")); - assertEquals( new BigDecimal("9876.54"), mapper.readValueFromPersistentObject(persistentObject, "someStringProp")); - } - - @Test - public void writeValueToPersistentObject() throws TechnicalException, UserException { - SomeBO persistentObject = new SomeBO(new BigDecimal(0)); - mapper.writeValueToPersistentObject(persistentObject, "someBigDecimalProp", new BigDecimal("3333.44") ); - assertEquals(new BigDecimal("3333.44"), persistentObject.getSomeBigDecimalProp()); - } - - public static class SomeBO { - - private BigDecimal someBigDecimalProp; - private String someStringProp; - - public SomeBO(BigDecimal someProp) { - this.someBigDecimalProp = someProp; - this.someStringProp = someProp.toString(); - } - - public BigDecimal getSomeBigDecimalProp() { - return someBigDecimalProp; - } - - public void setSomeBigDecimalProp(BigDecimal someProp) { - this.someBigDecimalProp = someProp; - } - - public String getSomeStringProp() { - return someStringProp; - } - - public void setSomeStringProp(String someStringProp) { - this.someStringProp = someStringProp; - } - } - -} diff --git a/framework/src/test/java/de/hsadmin/module/property/mapping/DefaultEnumParameterMapMapperTest.java b/framework/src/test/java/de/hsadmin/module/property/mapping/DefaultEnumParameterMapMapperTest.java deleted file mode 100644 index 3e6c671..0000000 --- a/framework/src/test/java/de/hsadmin/module/property/mapping/DefaultEnumParameterMapMapperTest.java +++ /dev/null @@ -1,32 +0,0 @@ -package de.hsadmin.module.property.mapping; - -import static org.junit.Assert.assertEquals; - -import java.util.HashMap; -import java.util.Map; - -import org.junit.Test; - -import de.hsadmin.common.error.TechnicalException; -import de.hsadmin.common.error.UserException; - -public class DefaultEnumParameterMapMapperTest { - - private static enum SomeEnum { A, B }; - - private static final Map rpcParameters = new HashMap(); - static { - rpcParameters.put("testA", "A"); - } - - @Test - public void readValueFromParameterMap() throws TechnicalException, UserException{ - assertEquals(SomeEnum.A, new DefaultEnumParameterMapMapper().readValueFromParameterMap(rpcParameters, "testA", SomeEnum.class)); - } - - @Test - public void writeValueToParameterMap() throws TechnicalException, UserException{ - new DefaultEnumParameterMapMapper().writeValueToParameterMap(rpcParameters, "testB", SomeEnum.B); - assertEquals("B", rpcParameters.get("testB")); - } -} diff --git a/framework/src/test/java/de/hsadmin/module/property/mapping/DefaultEnumPersistentObjectMapperTest.java b/framework/src/test/java/de/hsadmin/module/property/mapping/DefaultEnumPersistentObjectMapperTest.java deleted file mode 100644 index 0e4190e..0000000 --- a/framework/src/test/java/de/hsadmin/module/property/mapping/DefaultEnumPersistentObjectMapperTest.java +++ /dev/null @@ -1,69 +0,0 @@ -package de.hsadmin.module.property.mapping; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -import de.hsadmin.common.error.TechnicalException; -import de.hsadmin.common.error.UserException; - - -public class DefaultEnumPersistentObjectMapperTest { - - - private DefaultEnumPersistentObjectMapper mapper = new DefaultEnumPersistentObjectMapper(); - - @Test - public void readValueFromPersistentObjectHavingEnum() throws TechnicalException, UserException { - SomeBO persistentObject = new SomeBO(SomeEnum.V1); - assertEquals( "V1", mapper.readValueFromPersistentObject(persistentObject, "someEnumProp")); - } - - @Test - public void readValueFromPersistentObjectHavingString() throws TechnicalException, UserException { - SomeBO persistentObject = new SomeBO(SomeEnum.V2); - assertEquals( "V2", mapper.readValueFromPersistentObject(persistentObject, "someStringProp")); - } - - @Test - public void writeValueToPersistentObject() throws TechnicalException, UserException { - SomeBO persistentObject = new SomeBO(SomeEnum.V3); - mapper.writeValueToPersistentObject(persistentObject, "someEnumProp", "V3"); - assertEquals(SomeEnum.V3, persistentObject.getSomeEnumProp()); - } - - public static class SomeBO { - - private SomeEnum someEnumProp; - private String someStringProp; - - public SomeBO(SomeEnum someProp) { - this.someEnumProp = someProp; - this.someStringProp = someProp.name(); - } - - public SomeEnum getSomeEnumProp() { - return someEnumProp; - } - - public void setSomeEnumProp(SomeEnum someProp) { - this.someEnumProp = someProp; - } - - public String getSomeStringProp() { - return someStringProp; - } - - public void setSomeStringProp(String someStringProp) { - this.someStringProp = someStringProp; - } - } - - public static enum SomeEnum { - V1, V2, V3; - } -} - - - - diff --git a/framework/src/test/java/de/hsadmin/service/property/PropertyRemoteTest.java b/framework/src/test/java/de/hsadmin/service/property/PropertyRemoteTest.java deleted file mode 100644 index 6ee50c5..0000000 --- a/framework/src/test/java/de/hsadmin/service/property/PropertyRemoteTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package de.hsadmin.service.property; - -import org.junit.Ignore; -import org.junit.Test; - -import de.hsadmin.test.BaseRemoteTest; - -@Ignore("there is no XmlRpcServlet.properties entry for this remote") -public class PropertyRemoteTest extends BaseRemoteTest { - - @Test - public void canInstantiateMemberShareServiceLocalViaRemoteRegistry() throws Exception { - givenRegisteredModuleLookupFor(PropertyServiceLocal.class); - whenServiceIsRetrievedFromRemoteRegistryKey("property"); - thenModuleInstantiatesServiceOfClass(PropertyService.class); - } -} diff --git a/framework/src/test/java/de/hsadmin/test/BaseRemoteTest.java b/framework/src/test/java/de/hsadmin/test/BaseRemoteTest.java deleted file mode 100644 index f4f3b48..0000000 --- a/framework/src/test/java/de/hsadmin/test/BaseRemoteTest.java +++ /dev/null @@ -1,83 +0,0 @@ -package de.hsadmin.test; - -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Hashtable; -import java.util.Properties; - -import javax.ejb.Stateless; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.junit.Before; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; - -import de.hsadmin.common.error.TechnicalException; -import de.hsadmin.module.Module; -import de.hsadmin.module.ValueObject; -import de.hsadmin.xmlrpc.AbstractRemote; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ - AbstractRemote.class // to intercept `new InitialContext(...)` - }) -public abstract class BaseRemoteTest { -private static final String RPC_SERVLET_PROPERTIES = "org/apache/xmlrpc/webserver/XmlRpcServlet.properties"; - - @Mock - private InitialContext context; - - @Mock - private ValueObject valueObjectMock; - - private String remoteClassName; - - @Before - public void init() throws Exception { - MockitoAnnotations.initMocks(this); - PowerMockito.whenNew(InitialContext.class).withArguments(Mockito.any(Hashtable.class)).thenReturn(context); - } - - protected final InitialContext getInitialContext() { - return context; - } - protected final void givenRegisteredModuleLookupFor(final Class> moduleServiceInterface) throws NamingException, TechnicalException { - String moduleServiceName = moduleServiceInterface.getSimpleName(); // heuristic - @SuppressWarnings("unchecked") - Module moduleService = (Module) Mockito.mock(moduleServiceInterface); - Mockito.when(getInitialContext().lookup(moduleServiceName)).thenReturn(moduleService); - Mockito.when(moduleService.buildVO()).thenReturn(valueObjectMock); - } - - protected final void whenServiceIsRetrievedFromRemoteRegistryKey(final String moduleId) throws IOException { - InputStream is = getClass().getClassLoader().getResourceAsStream(RPC_SERVLET_PROPERTIES); - assertNotNull(RPC_SERVLET_PROPERTIES + " not found or not readable", is);Properties props = new Properties(); - - props.load(is); - assertTrue(RPC_SERVLET_PROPERTIES + " does not contain " + moduleId, props.containsKey(moduleId)); - - remoteClassName = props.get(moduleId).toString(); - } - - protected final void thenModuleInstantiatesServiceOfClass(final Class expectedModuleClass) throws IOException, InstantiationException, IllegalAccessException, ClassNotFoundException { - assertNotNull(expectedModuleClass + " is missing @" + Stateless.class.getSimpleName(), expectedModuleClass.getAnnotation(Stateless.class)); - - AbstractRemote remote = (AbstractRemote) getClass().getClassLoader().loadClass(remoteClassName).newInstance(); - try { - ValueObject vo = remote.createValueObject(); - assertNotNull(remoteClassName + ".createValueObject() returned null", vo); - } catch ( Exception exc ) { - fail("remote proxy " + remoteClassName + " not properly initialized: " + exc); - } - } -} diff --git a/framework/src/test/java/de/hsadmin/test/CauseMatcher.java b/framework/src/test/java/de/hsadmin/test/CauseMatcher.java deleted file mode 100644 index 68adea5..0000000 --- a/framework/src/test/java/de/hsadmin/test/CauseMatcher.java +++ /dev/null @@ -1,28 +0,0 @@ -package de.hsadmin.test; - -import org.hamcrest.Description; -import org.hamcrest.TypeSafeMatcher; - -public class CauseMatcher extends TypeSafeMatcher { - - private final Class expectedExceptionTpe; - private final String expectedMessage; - - public CauseMatcher(Class expectedExceptionTpe, String expectedMessage) { - this.expectedExceptionTpe = expectedExceptionTpe; - this.expectedMessage = expectedMessage; - } - - @Override - protected boolean matchesSafely(final Throwable item) { - return item.getClass().isAssignableFrom(expectedExceptionTpe) - && item.getMessage().contains(expectedMessage); - } - - @Override - public void describeTo(final Description description) { - description - .appendText("expects exception of type ").appendValue(expectedExceptionTpe) - .appendText(" and with message ").appendValue(expectedMessage); - } -} \ No newline at end of file diff --git a/ldap-services/pom.xml b/ldap-services/pom.xml index 8a02994..d290e81 100644 --- a/ldap-services/pom.xml +++ b/ldap-services/pom.xml @@ -5,7 +5,7 @@ de.hsadmin hsadmin-parent - 1.0-SNAPSHOT + 1.0.1 ldap-webapp @@ -16,54 +16,47 @@ de.hsadmin framework - 1.0-SNAPSHOT - - - de.hsadmin - framework - 1.0-SNAPSHOT - test-jar - test + ${hsadmin.version} org.apache.geronimo.specs - geronimo-jpa_2.0_spec + geronimo-jpa_2.2_spec 1.1 provided org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0.1 + geronimo-ejb_3.1_spec + 1.0.2 provided org.apache.geronimo.specs - geronimo-validation_1.0_spec + geronimo-validation_2.0_spec 1.1 org.apache.bval org.apache.bval.bundle - 0.5 + ${bval.version} test org.apache.openjpa openjpa - 2.4.2 + ${openjpa.version} test org.liquibase liquibase-core - 3.5.3 + ${liquibase.version} test org.apache.xmlrpc xmlrpc-server - 3.1.3 + ${xmlrpc.version} javax.servlet @@ -95,51 +88,20 @@ **/XmlRpcServlet.properties - - - make-a-jar - compile - - jar - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - attach-artifacts - package - - attach-artifact - - - - - ${project.basedir}/target/ldap-webapp-1.0-SNAPSHOT.jar - jar - - - - - org.apache.openejb.maven tomee-maven-plugin - 1.7.4 + ${tomee.version} - 1.7.4 + ${tomee.version} webprofile false 8000 ldap-webapp ${project.basedir}/src/test/tomee/conf - org.postgresql:postgresql:9.4.1212.jre7 + ${postgresql.lib} diff --git a/pom.xml b/pom.xml index 4c78360..49ba65e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,179 +1,53 @@ - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 - de.hsadmin - hsadmin-parent - pom - 1.0-SNAPSHOT - HSAdmin Parent Project + de.hsadmin + hsadmin-parent + pom + 1.0.1 + HSAdmin Parent Project - - - 0.0 - 0.0 - 25 - - - - db-migration - framework - cust-services - ldap-services - database-services - web - cli - + + UTF-8 + 1.0.1 + 8.0.4 + 4.0.1 + 4.1.1 + 3.1.2 + 1.2.17 + 3.1.3 + 2.0.4 + org.postgresql:postgresql:42.2.18 + 1.8 + 1.8 + - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.7 - 1.7 - true - true - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - ${argLine} -XX:+AlwaysLockClassLoader - - - - org.jacoco - jacoco-maven-plugin - 0.7.9 - - - default-prepare-agent - - prepare-agent - - - - default-report - prepare-package - - report - - - - default-check - - check - - - - - BUNDLE - - - LINE - COVEREDRATIO - ${jacoco.check.lineRatio} - - - BRANCH - COVEREDRATIO - ${jacoco.check.branchRatio} - - - - - METHOD - - - COMPLEXITY - TOTALCOUNT - ${jacoco.check.complexityMax} - - - - - - - - - - - + + db-migration + framework + cust-services + ldap-services + + web + cli + - - - org.apache.commons - commons-lang3 - 3.5 - - - junit - junit - 4.12 - test - - - org.mockito - mockito-all - 1.10.19 - test - - - org.powermock - powermock-module-junit4 - 1.6.6 - test - - - org.powermock - powermock-api-mockito - 1.6.6 - test - - - com.openpojo - openpojo - 0.8.4 - test - - - pl.pragmatists - JUnitParams - 1.0.4 - test - - - - - - Windows - - - Windows - - - - bat - - - - unix - - - unix - - - - sh - - - + + + org.apache.commons + commons-lang3 + 3.11 + + + junit + junit + 4.13.1 + test + +