Project

General

Profile

« Previous | Next » 

Revision 3dcbcc9f

Added by Katja Luther over 3 years ago

cleanup

View differences:

eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CdmServerTest.java
22 22
import org.osgi.framework.Bundle;
23 23

  
24 24
import eu.etaxonomy.taxeditor.remoting.server.CdmServerUtils;
25
import eu.etaxonomy.taxeditor.webapp.CdmEmbeddedServerException;
26 25
import eu.etaxonomy.taxeditor.webapp.CdmServer;
27
import eu.etaxonomy.taxeditor.webapp.ICDMServerError;
26
import eu.etaxonomy.taxeditor.workbench.datasource.CdmEmbeddedServerException;
27
import eu.etaxonomy.taxeditor.workbench.datasource.ICDMServerError;
28 28

  
29 29

  
30 30
/**
......
51 51
        Bundle bundle = Platform.getBundle("eu.etaxonomy.taxeditor.test");
52 52
        URL mgdDatasourcesConfigURL = bundle.getEntry("src/test/resources/.cdmLibrary/writableResources/mgd.datasources.xml");
53 53
        File mgdDatasourcesConfigFile = new File(FileLocator.resolve(mgdDatasourcesConfigURL).toURI());
54
        CdmServer cdmServer = new CdmServer("cdmTest", mgdDatasourcesConfigFile);
55
        cdmServer.start(new ICDMServerError() {
56
            @Override
57
            public void handleError(Throwable t) {
58
                Assert.fail("Error starting server. Reason : " + t.getMessage());
59
            }
60
        });
61
        try {
54
        try{
55
            CdmServer cdmServer = new CdmServer("cdmTest", mgdDatasourcesConfigFile);
56
            cdmServer.start(new ICDMServerError() {
57
                @Override
58
                public void handleError(Throwable t) {
59
                    Assert.fail("Error starting server. Reason : " + t.getMessage());
60
                }
61
            });
62 62
            cdmServer.stop();
63
        } catch (Exception e) {
63
        }catch( CdmEmbeddedServerException cese){
64
           cese.printStackTrace();
65
           Assert.fail("Error instantiating server. Reason: " + cese.getMessage());
66
        }catch (Exception e) {
64 67
            e.printStackTrace();
65 68
            Assert.fail("Error stopping server. Reason : " + e.getMessage());
66 69
        }

Also available in: Unified diff