From 080dc7c00fec52837689201c3b7ed595c608d134 Mon Sep 17 00:00:00 2001 From: tosmers Date: Wed, 16 Mar 2016 18:20:15 +0000 Subject: [PATCH] changes test for the FileMarshaller and deletes opencsv maven dependency git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@3932 8810af33-2d31-482b-a856-94f89814c4df --- ccm-core/pom.xml | 5 --- .../docrepo/portation/FilePortationTest.java | 38 ++++++++----------- 2 files changed, 15 insertions(+), 28 deletions(-) diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index b33757784..b6f157ccd 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -183,11 +183,6 @@ test - - com.opencsv - opencsv - - com.fasterxml.jackson.core jackson-core diff --git a/ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/FilePortationTest.java b/ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/FilePortationTest.java index 439fa26d0..c9cfd4a69 100644 --- a/ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/FilePortationTest.java +++ b/ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/FilePortationTest.java @@ -38,22 +38,26 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.docrepo.File; -import org.libreccm.docrepo.FileRepository; +import org.libreccm.docrepo.FileMarshaller; import org.libreccm.jpa.EntityManagerProducer; import org.libreccm.jpa.utils.MimeTypeConverter; import org.libreccm.l10n.LocalizedString; +import org.libreccm.portation.Format; import org.libreccm.tests.categories.IntegrationTest; import org.libreccm.testutils.EqualsVerifier; import org.libreccm.workflow.Workflow; import javax.inject.Inject; +import java.util.Collections; import java.util.Date; +import java.util.List; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; /** + * + * * * @author Tobias Osmers * @version 13/01/2016 @@ -67,15 +71,11 @@ public class FilePortationTest { private static final Logger log = Logger.getLogger(FilePortationTest.class); @Inject - private FileRepository fileRepository; + private FileMarshaller fileMarshaller; private static File file; - private static String filename = - "src/test/resources/datasets/org/libreccm/docrepo" + - "/FilePortationTest/csv/exportTest.csv"; - - public FilePortationTest() { - } + private static String filePath = + "src/test/resources/datasets/org/libreccm/docrepo/FilePortationTest/"; @BeforeClass public static void setUpClass() { @@ -137,21 +137,13 @@ public class FilePortationTest { .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml"); } - // TODO add test methods here. - // The methods must be annotated with annotation @Test. For example: - // - // @Test - // public void hello() {} + @Test - public void csvShouldBeCreated() { - java.io.File old = new java.io.File(filename); - if (old.exists()) - old.delete(); + public void xmlShouldBeCreated() { + fileMarshaller.prepare(Format.XML, filePath + "test1.xml"); + List fileList = Collections.singletonList(file); - // TODO: test file export - - java.io.File file = new java.io.File(filename); - assertTrue(file.exists() && !file.isDirectory()); + fileMarshaller.exportList(fileList); } @Test @@ -162,6 +154,6 @@ public class FilePortationTest { @Test @InSequence(10) public void repoIsInjected() { - assertThat(fileRepository, is(not(nullValue()))); + assertThat(fileMarshaller, is(not(nullValue()))); } }