From ef53419fcb380b0e95437ddf23900c665cf9a13d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Tue, 27 Dec 2022 19:07:05 +0100 Subject: [PATCH] cleanup --- cdmlib-remote/pom.xml | 10 ++--- .../service/AuthorityControllerTest.java | 17 ++++++-- .../service/MetadataControllerTest.java | 41 ++++++++++++------- .../cdm/remote/view/JsonToCsvViewTest.java | 12 +++++- .../cdm/remote/view/OaiPmhViewTest.java | 2 +- .../cdm/remote/view/RdfViewTest.java | 2 +- .../cdm/test/unitils/FlatFullXmlWriter.java | 9 ++-- .../orm/hibernate/Hibernate5Module.java | 1 - 8 files changed, 60 insertions(+), 34 deletions(-) diff --git a/cdmlib-remote/pom.xml b/cdmlib-remote/pom.xml index 69e63f9879..5eec0e91c0 100644 --- a/cdmlib-remote/pom.xml +++ b/cdmlib-remote/pom.xml @@ -51,13 +51,13 @@ - eu.etaxonomy - cdmlib-io + eu.etaxonomy + cdmlib-test + test - eu.etaxonomy - cdmlib-test - test + eu.etaxonomy + cdmlib-io javax.servlet diff --git a/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/service/AuthorityControllerTest.java b/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/service/AuthorityControllerTest.java index cb2374d511..81938e0907 100644 --- a/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/service/AuthorityControllerTest.java +++ b/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/service/AuthorityControllerTest.java @@ -1,6 +1,13 @@ +/** +* Copyright (C) 2009 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ package eu.etaxonomy.cdm.remote.service; - import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; @@ -21,6 +28,10 @@ import eu.etaxonomy.cdm.model.common.LSID; import eu.etaxonomy.cdm.model.common.LSIDAuthority; import eu.etaxonomy.cdm.test.util.LSIDMatchers; +/** + * @author b.clark + * @date 2009 + */ public class AuthorityControllerTest extends UnitilsJUnit4 { @Mock @@ -45,7 +56,7 @@ public class AuthorityControllerTest extends UnitilsJUnit4 { lsidAuthority = new LSIDAuthority("fred.org"); } catch (MalformedLSIDException e) { } - authorityService = org.easymock.classextension.EasyMock.createMock(LSIDAuthorityService.class); + authorityService = org.easymock.EasyMock.createMock(LSIDAuthorityService.class); authorityController = new AuthorityController(); source = new Object(); expiringResponse = new ExpiringResponse(source, null); @@ -106,4 +117,4 @@ public class AuthorityControllerTest extends UnitilsJUnit4 { EasyMock.replay(authorityService); authorityController.revokeNotificationForeignAuthority(lsid, lsidAuthority); } -} +} \ No newline at end of file diff --git a/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/service/MetadataControllerTest.java b/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/service/MetadataControllerTest.java index 3d09802488..cfc4dffb12 100644 --- a/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/service/MetadataControllerTest.java +++ b/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/service/MetadataControllerTest.java @@ -1,6 +1,13 @@ +/** +* Copyright (C) 2009 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ package eu.etaxonomy.cdm.remote.service; - import static org.junit.Assert.assertTrue; import org.easymock.EasyMock; @@ -23,18 +30,22 @@ import eu.etaxonomy.cdm.model.common.LSID; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.test.util.LSIDMatchers; +/** + * @author b.clark + * @date 2009 + */ public class MetadataControllerTest extends UnitilsJUnit4 { - + @Mock @InjectInto(property = "lsidMetadataService") private LSIDMetadataService metadataService; - + @TestedObject private MetadataController metadataController; - + private LSID lsid; private String[] acceptedFormats; - + @Before public void setUp() { metadataController = new MetadataController(); @@ -44,32 +55,32 @@ public class MetadataControllerTest extends UnitilsJUnit4 { } catch (MalformedLSIDException e) { } acceptedFormats = new String[]{MetadataResponse.RDF_FORMAT}; } - + @Test public void testGetMetadata() throws Exception { Taxon taxon = Taxon.NewInstance(null,null); EasyMock.expect(metadataService.getMetadata(LSIDMatchers.eqLSID(lsid))).andReturn(taxon); EasyMock.replay(metadataService); - - + + ModelAndView modelAndView = metadataController.getMetadata(lsid, "application/xml+rdf"); - + EasyMock.verify(metadataService); - ModelAndViewAssert.assertViewName(modelAndView, "Metadata.rdf"); + ModelAndViewAssert.assertViewName(modelAndView, "Metadata.rdf"); assertTrue(modelAndView.getModel().containsValue(taxon)); } - + @Test(expected = LSIDServerException.class) public void testGetMetadataWithoutAcceptedFormat() throws Exception { - acceptedFormats = new String[]{MetadataResponse.N3_FORMAT,MetadataResponse.XMI_FORMAT}; + acceptedFormats = new String[]{MetadataResponse.N3_FORMAT,MetadataResponse.XMI_FORMAT}; EasyMock.replay(metadataService); - + metadataController.getMetadata(lsid, "application/n3,application/xml+xmi"); } - + @Test(expected = LSIDServerException.class) public void testGetMetadataWithUnknownLSID() throws Exception { - + LSIDServerException lse = new LSIDServerException(LSIDException.UNKNOWN_LSID, "Unknown LSID"); EasyMock.expect(metadataService.getMetadata(LSIDMatchers.eqLSID(lsid))).andThrow(lse); EasyMock.replay(metadataService); diff --git a/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/view/JsonToCsvViewTest.java b/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/view/JsonToCsvViewTest.java index c879697192..65d83f4226 100644 --- a/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/view/JsonToCsvViewTest.java +++ b/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/view/JsonToCsvViewTest.java @@ -1,3 +1,11 @@ +/** +* Copyright (C) 2009 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ package eu.etaxonomy.cdm.remote.view; import java.io.File; @@ -55,7 +63,7 @@ public class JsonToCsvViewTest extends UnitilsJUnit4 { @Before public void setUp() throws Exception { - model = new HashMap(); + model = new HashMap<>(); identifyView = new IdentifyView(); identifyView.setMarshaller(marshaller); @@ -85,7 +93,7 @@ public class JsonToCsvViewTest extends UnitilsJUnit4 { demoRecord.setAuthorName("Author"); demoRecord.setDatasetName("Classification"); - ArrayList recordList = new ArrayList(); + ArrayList recordList = new ArrayList<>(); logger.info(recordList.size()); recordList.add(demoRecord); recordList.add(demoRecord); diff --git a/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/view/OaiPmhViewTest.java b/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/view/OaiPmhViewTest.java index 252be285b7..0f98bef14f 100644 --- a/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/view/OaiPmhViewTest.java +++ b/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/view/OaiPmhViewTest.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2007 EDIT + * Copyright (C) 2009 EDIT * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu * diff --git a/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/view/RdfViewTest.java b/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/view/RdfViewTest.java index 39277a2b5b..1f6d37212f 100644 --- a/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/view/RdfViewTest.java +++ b/cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/view/RdfViewTest.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2007 EDIT + * Copyright (C) 2009 EDIT * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu * diff --git a/cdmlib-test/src/main/java/eu/etaxonomy/cdm/test/unitils/FlatFullXmlWriter.java b/cdmlib-test/src/main/java/eu/etaxonomy/cdm/test/unitils/FlatFullXmlWriter.java index 08bcb5a837..415f66057d 100644 --- a/cdmlib-test/src/main/java/eu/etaxonomy/cdm/test/unitils/FlatFullXmlWriter.java +++ b/cdmlib-test/src/main/java/eu/etaxonomy/cdm/test/unitils/FlatFullXmlWriter.java @@ -13,6 +13,8 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.io.Writer; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.dbunit.dataset.Column; import org.dbunit.dataset.DataSetException; import org.dbunit.dataset.IDataSet; @@ -22,8 +24,6 @@ import org.dbunit.dataset.datatype.TypeCastException; import org.dbunit.dataset.stream.DataSetProducerAdapter; import org.dbunit.dataset.stream.IDataSetConsumer; import org.dbunit.util.xml.XmlWriter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.unitils.dbunit.util.MultiSchemaXmlDataSetReader; /** @@ -40,10 +40,7 @@ import org.unitils.dbunit.util.MultiSchemaXmlDataSetReader; */ public class FlatFullXmlWriter implements IDataSetConsumer{ - /** - * Logger for this class - */ - private static final Logger logger = LoggerFactory.getLogger(FlatFullXmlWriter.class); + private static final Logger logger = LogManager.getLogger(); private static final String DATASET = "dataset"; diff --git a/cdmlib-test/src/main/java/org/unitils/orm/hibernate/Hibernate5Module.java b/cdmlib-test/src/main/java/org/unitils/orm/hibernate/Hibernate5Module.java index 8dc14e36ed..a71c954147 100644 --- a/cdmlib-test/src/main/java/org/unitils/orm/hibernate/Hibernate5Module.java +++ b/cdmlib-test/src/main/java/org/unitils/orm/hibernate/Hibernate5Module.java @@ -17,7 +17,6 @@ import org.unitils.orm.hibernate.util.Hibernate5SessionFactoryLoader; /** * @author a.mueller * @since 03.11.2015 - * */ public class Hibernate5Module extends HibernateModule { -- 2.34.1