Author: jmarino
Date: Sat Oct 7 01:23:33 2006
New Revision: 453859
URL: http://svn.apache.org/viewvc?view=rev&rev=453859
Log:
avoid side-effects in JNDI property factory unit test
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java?view=diff&rev=453859&r1=453858&r2=453859
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/JNDIPropertyFactoryTestCase.java
Sat Oct 7 01:23:33 2006
@@ -21,18 +21,26 @@
public class JNDIPropertyFactoryTestCase extends TestCase {
public void testCreate() throws Exception {
- System.setProperty(Context.INITIAL_CONTEXT_FACTORY,
MockInitialContextFactory.class.getName());
- JNDIPropertyFactory factory = new JNDIPropertyFactory();
- Element element = EasyMock.createMock(Element.class);
- EasyMock.expect(element.getTextContent()).andReturn("foo");
- EasyMock.replay(element);
- Document doc = EasyMock.createMock(Document.class);
- EasyMock.expect(doc.getDocumentElement()).andReturn(element);
- EasyMock.replay(doc);
- PropertyValue<?> value = new MockPropertyValue<Type>();
- value.setValue(doc);
- JNDIObjectFactory<?> jndiFactory = (JNDIObjectFactory<?>)
factory.createObjectFactory(null, value);
- assertEquals("bar", jndiFactory.getInstance());
+ String old = System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
+ try {
+ System.setProperty(Context.INITIAL_CONTEXT_FACTORY,
MockInitialContextFactory.class.getName());
+ JNDIPropertyFactory factory = new JNDIPropertyFactory();
+ Element element = EasyMock.createMock(Element.class);
+ EasyMock.expect(element.getTextContent()).andReturn("foo");
+ EasyMock.replay(element);
+ Document doc = EasyMock.createMock(Document.class);
+ EasyMock.expect(doc.getDocumentElement()).andReturn(element);
+ EasyMock.replay(doc);
+ PropertyValue<?> value = new MockPropertyValue<Type>();
+ value.setValue(doc);
+ JNDIObjectFactory<?> jndiFactory = (JNDIObjectFactory<?>)
factory.createObjectFactory(null, value);
+ assertEquals("bar", jndiFactory.getInstance());
+ } finally {
+ System.clearProperty(Context.INITIAL_CONTEXT_FACTORY);
+ if (old != null) {
+ System.setProperty(Context.INITIAL_CONTEXT_FACTORY, old);
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
