Author: tchemit Date: 2014-02-27 17:42:36 +0100 (Thu, 27 Feb 2014) New Revision: 958 Url: http://codelutin.com/projects/echobase/repository/revisions/958 Log: fix tests Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryServiceTest.java Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java 2014-02-27 15:52:37 UTC (rev 957) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java 2014-02-27 16:42:36 UTC (rev 958) @@ -89,7 +89,9 @@ @Before public void setUp() throws Exception { this.serviceContext = fakeServiceContext; - this.fakeServiceContext.inject(this); + if (fakeServiceContext!=null) { + fakeServiceContext.inject(this); + } } protected EchoBaseUser createFakeUser() { Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java 2014-02-27 15:52:37 UTC (rev 957) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java 2014-02-27 16:42:36 UTC (rev 958) @@ -159,7 +159,7 @@ @Override protected void finished(Description description) { super.finished(description); - if (!echoBaseTopiaApplicationContext.isClosed()) { + if (echoBaseTopiaApplicationContext!=null && !echoBaseTopiaApplicationContext.isClosed()) { echoBaseTopiaApplicationContext.closeContext(); } } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryServiceTest.java 2014-02-27 15:52:37 UTC (rev 957) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryServiceTest.java 2014-02-27 16:42:36 UTC (rev 958) @@ -46,12 +46,6 @@ @Inject ExportQueryService exportQueryService; -// @Before -// public void setup() { -// exportQueryService = getExportQueryService(); -// } - - @Ignore @Test public void processLibreOfficeSqlQuery() throws Exception {