diff options
6 files changed, 71 insertions, 58 deletions
diff --git a/plugins/org.eclipse.net4j.tests/.options b/plugins/org.eclipse.net4j.tests/.options new file mode 100644 index 0000000000..3adbf49dcc --- /dev/null +++ b/plugins/org.eclipse.net4j.tests/.options @@ -0,0 +1,3 @@ +# Debugging and tracing options + +org.eclipse.net4j.tests/debug = true diff --git a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF index c301a3d658..b4f234630e 100644 --- a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Activator: org.eclipse.net4j.tests.bundle.Activator +Bundle-Activator: org.eclipse.net4j.tests.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", diff --git a/plugins/org.eclipse.net4j.tests/build.properties b/plugins/org.eclipse.net4j.tests/build.properties index 3419896d3c..70ca82aa6f 100644 --- a/plugins/org.eclipse.net4j.tests/build.properties +++ b/plugins/org.eclipse.net4j.tests/build.properties @@ -23,4 +23,5 @@ bin.includes = META-INF/,\ about.mappings,\ about.properties,\ modeling32.png,\ - plugin.xml + plugin.xml,\ + .options diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ConnectorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ConnectorTest.java index 643f05444b..8720af7648 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ConnectorTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ConnectorTest.java @@ -17,6 +17,7 @@ import org.eclipse.net4j.internal.tcp.TCPAcceptor; import org.eclipse.net4j.internal.tcp.TCPClientConnector; import org.eclipse.net4j.internal.tcp.TCPSelector; import org.eclipse.net4j.tcp.ITCPSelector; +import org.eclipse.net4j.tests.bundle.OM; import org.eclipse.net4j.util.concurrent.ConcurrencyUtil; import org.eclipse.net4j.util.io.IOUtil; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; @@ -241,25 +242,25 @@ public class ConnectorTest extends AbstractOMTest public void testInvalidUser() throws Exception { - ExecutorService threadPool = Executors.newCachedThreadPool(); + threadPool = Executors.newCachedThreadPool(); LifecycleUtil.activate(threadPool); - IBufferPool bufferPool = Net4jUtil.createBufferPool(); + bufferPool = Net4jUtil.createBufferPool(); LifecycleUtil.activate(bufferPool); - Randomizer randomizer = new Randomizer(); + randomizer = new Randomizer(); randomizer.activate(); - UserManager userManager = new UserManager(); + userManager = new UserManager(); userManager.activate(); userManager.addUser(INVALID_USER_ID, PASSWORD); - ChallengeNegotiator challengeNegotiator = new ChallengeNegotiator(); + challengeNegotiator = new ChallengeNegotiator(); challengeNegotiator.setRandomizer(randomizer); challengeNegotiator.setUserManager(userManager); challengeNegotiator.activate(); - TCPSelector selector = new TCPSelector(); + selector = new TCPSelector(); selector.activate(); acceptor = new TCPAcceptor(); @@ -273,15 +274,14 @@ public class ConnectorTest extends AbstractOMTest acceptor.setPort(2036); acceptor.activate(); - PasswordCredentialsProvider credentialsProvider = new PasswordCredentialsProvider(CREDENTIALS); + credentialsProvider = new PasswordCredentialsProvider(CREDENTIALS); LifecycleUtil.activate(credentialsProvider); - ResponseNegotiator responseNegotiator = new ResponseNegotiator(); - + responseNegotiator = new ResponseNegotiator(); responseNegotiator.setCredentialsProvider(credentialsProvider); responseNegotiator.activate(); - TCPClientConnector connector = new TCPClientConnector(); + connector = new TCPClientConnector(); connector.getConfig().setBufferProvider(bufferPool); connector.getConfig().setReceiveExecutor(threadPool); connector.getConfig().setNegotiator(responseNegotiator); @@ -297,35 +297,32 @@ public class ConnectorTest extends AbstractOMTest } catch (ConnectorException ex) { + OM.LOG.info("Expected ConnectorException:", ex); assertTrue(ex.getCause() instanceof NegotiationException); } - finally - { - cleanup(); - } } public void testInvalidPassword() throws Exception { - ExecutorService threadPool = Executors.newCachedThreadPool(); + threadPool = Executors.newCachedThreadPool(); LifecycleUtil.activate(threadPool); - IBufferPool bufferPool = Net4jUtil.createBufferPool(); + bufferPool = Net4jUtil.createBufferPool(); LifecycleUtil.activate(bufferPool); - Randomizer randomizer = new Randomizer(); + randomizer = new Randomizer(); randomizer.activate(); - UserManager userManager = new UserManager(); + userManager = new UserManager(); userManager.activate(); userManager.addUser(USER_ID, INVALID_PASSWORD); - ChallengeNegotiator challengeNegotiator = new ChallengeNegotiator(); + challengeNegotiator = new ChallengeNegotiator(); challengeNegotiator.setRandomizer(randomizer); challengeNegotiator.setUserManager(userManager); challengeNegotiator.activate(); - TCPSelector selector = new TCPSelector(); + selector = new TCPSelector(); selector.activate(); acceptor = new TCPAcceptor(); @@ -339,15 +336,14 @@ public class ConnectorTest extends AbstractOMTest acceptor.setPort(2036); acceptor.activate(); - PasswordCredentialsProvider credentialsProvider = new PasswordCredentialsProvider(CREDENTIALS); + credentialsProvider = new PasswordCredentialsProvider(CREDENTIALS); LifecycleUtil.activate(credentialsProvider); - ResponseNegotiator responseNegotiator = new ResponseNegotiator(); - + responseNegotiator = new ResponseNegotiator(); responseNegotiator.setCredentialsProvider(credentialsProvider); responseNegotiator.activate(); - TCPClientConnector connector = new TCPClientConnector(); + connector = new TCPClientConnector(); connector.getConfig().setBufferProvider(bufferPool); connector.getConfig().setReceiveExecutor(threadPool); connector.getConfig().setNegotiator(responseNegotiator); @@ -363,11 +359,8 @@ public class ConnectorTest extends AbstractOMTest } catch (ConnectorException ex) { + OM.LOG.info("Expected ConnectorException:", ex); assertTrue(ex.getCause() instanceof NegotiationException); } - finally - { - cleanup(); - } } } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bundle/Activator.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bundle/Activator.java deleted file mode 100644 index 0b79912c40..0000000000 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bundle/Activator.java +++ /dev/null @@ -1,28 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - **************************************************************************/ -package org.eclipse.net4j.tests.bundle; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -/** - * @author Eike Stepper - */ -public class Activator implements BundleActivator -{ - public void start(BundleContext context) throws Exception - { - } - - public void stop(BundleContext context) throws Exception - { - } -} diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bundle/OM.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bundle/OM.java new file mode 100644 index 0000000000..cd2e152048 --- /dev/null +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bundle/OM.java @@ -0,0 +1,44 @@ +/*************************************************************************** + * Copyright (c) 2004 - 2008 Eike Stepper, Germany. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + **************************************************************************/ +package org.eclipse.net4j.tests.bundle; + +import org.eclipse.net4j.util.om.OMBundle; +import org.eclipse.net4j.util.om.OMPlatform; +import org.eclipse.net4j.util.om.OSGiActivator; +import org.eclipse.net4j.util.om.log.OMLogger; +import org.eclipse.net4j.util.om.trace.OMTracer; + +/** + * The <em>Operations & Maintenance</em> class of this bundle. + * + * @author Eike Stepper + */ +public abstract class OM +{ + public static final String BUNDLE_ID = "org.eclipse.net4j.tests"; //$NON-NLS-1$ + + public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class); + + public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$ + + public static final OMLogger LOG = BUNDLE.logger(); + + /** + * @author Eike Stepper + */ + public static final class Activator extends OSGiActivator + { + public Activator() + { + super(BUNDLE); + } + } +} |