From 2851fd54c5ccd85d068c15ec3471b553b0052307 Mon Sep 17 00:00:00 2001 From: rfeng Date: Wed, 9 Jul 2008 23:15:02 +0000 Subject: Defer the creation of WorkManager to avoid the JNDI lookup Also clear the openejb related system properties to avoid warnings in JNDI lookup git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@675379 13f79535-47bb-0310-9956-ffa450edef68 --- .../binding/ejb/UnknownEJBSessionTypeTestCase.java | 28 ++++++++++++---------- .../binding/ejb/UnknownEJBVersionTestCase.java | 3 +++ 2 files changed, 19 insertions(+), 12 deletions(-) (limited to 'java/sca/itest/validation') diff --git a/java/sca/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java b/java/sca/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java index 1cef8a902e..ff94ad7b93 100644 --- a/java/sca/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java +++ b/java/sca/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java @@ -31,33 +31,37 @@ import domain.CustomCompositeBuilder; */ public class UnknownEJBSessionTypeTestCase extends TestCase { - private CustomCompositeBuilder customDomain; + private CustomCompositeBuilder customDomain; @Override protected void setUp() throws Exception { - System.setProperty("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory"); + System.setProperty("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory"); System.setProperty("java.naming.provider.url", "ejbd://localhost:8085"); - System.setProperty("managed", "false"); - + System.setProperty("managed", "false"); + customDomain = CustomCompositeBuilder.getInstance(); try { - customDomain.loadContribution("src/main/resources/bindingejb/UnknownEJBSessionType/account.composite", - "TestContribution", "src/main/resources/bindingejb/UnknownEJBSessionType/"); - } catch (Exception ex){ + customDomain.loadContribution("src/main/resources/bindingejb/UnknownEJBSessionType/account.composite", + "TestContribution", + "src/main/resources/bindingejb/UnknownEJBSessionType/"); + } catch (Exception ex) { //throw ex; } } @Override protected void tearDown() throws Exception { + System.clearProperty("java.naming.factory.initial"); + System.clearProperty("java.naming.provider.url"); + System.clearProperty("managed"); //node.stop(); } public void testCalculator() { - Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); - - assertNotNull(problem); - assertEquals("UnknownEJBSessionType", problem.getMessageId()); + Monitor monitor = customDomain.getMonitorInstance(); + Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + + assertNotNull(problem); + assertEquals("UnknownEJBSessionType", problem.getMessageId()); } } diff --git a/java/sca/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java b/java/sca/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java index bacddc93a8..a192674aeb 100644 --- a/java/sca/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java +++ b/java/sca/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java @@ -50,6 +50,9 @@ public class UnknownEJBVersionTestCase extends TestCase { @Override protected void tearDown() throws Exception { + System.clearProperty("java.naming.factory.initial"); + System.clearProperty("java.naming.provider.url"); + System.clearProperty("managed"); //node.stop(); } -- cgit v1.2.3