Move xml validation to base test class
authorCherian Mathew <c.mathew@bgbm.org>
Mon, 29 Jun 2015 10:47:50 +0000 (12:47 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Mon, 29 Jun 2015 10:47:50 +0000 (12:47 +0200)
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/TermServiceRequestExecutor.java
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/application/CdmApplicationRemoteControllerTest.java [deleted file]

index 809cb29b63e8ad670a8292904395ba46fa1d6d9a..5991563ad7803dd2560426904bd5b5acdcdee47e 100644 (file)
@@ -37,7 +37,7 @@ public class TermServiceRequestExecutor extends CdmServiceRequestExecutor {
                            terms.addAll((List<DefinedTermBase>)rir.getValue());
 
                            for(DefinedTermBase<?> term : terms) {
-                               cdmServiceCacher.put(term.getUuid(), term);
+                               cdmServiceCacher.load(term);
                            }
                            termTypeMap.put((TermType)ri.getArguments()[0], rir);
                        }
diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/application/CdmApplicationRemoteControllerTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/application/CdmApplicationRemoteControllerTest.java
deleted file mode 100644 (file)
index bfd10cf..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-/**
- * Copyright (C) 2015 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.taxeditor.application;
-
-import org.junit.Test;
-
-import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteController;
-import eu.etaxonomy.cdm.common.monitor.NullProgressMonitor;
-import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
-import eu.etaxonomy.taxeditor.httpinvoker.BaseRemotingTest;
-import eu.etaxonomy.taxeditor.httpinvoker.CDMServer;
-import eu.etaxonomy.taxeditor.remoting.source.CdmRemoteSource;
-
-/**
- * @author cmathew
- * @date 26 May 2015
- *
- */
-public class CdmApplicationRemoteControllerTest extends BaseRemotingTest {
-
-
-    @Test
-    public void initApplicationControllerTest() {
-        CdmRemoteSource crs = CdmRemoteSource.NewInstance(CDMServer.getInstance().getName(),
-                CDMServer.getInstance().getHost(),
-                CDMServer.getInstance().getPort(),
-                CDMServer.getInstance().getContextPath(),
-                NomenclaturalCode.ICNAFP);
-        // first initialize with validation to make sure the xml is valid
-        CdmApplicationRemoteController.NewInstance(crs,
-                true,
-                new NullProgressMonitor(),
-                null);
-    }
-}