summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-01 00:48:58 (EDT)
committerEike Stepper2007-08-01 00:48:58 (EDT)
commit3599f5c55ab02ac2b9abdaeb49160b3dc89ca7c1 (patch)
treec7aeefa037daecc55716728f2fa80c81b18ea52e
parent092f2b8fbcdbcf29114ad8193282f61295f38fcb (diff)
downloadcdo-3599f5c55ab02ac2b9abdaeb49160b3dc89ca7c1.zip
cdo-3599f5c55ab02ac2b9abdaeb49160b3dc89ca7c1.tar.gz
cdo-3599f5c55ab02ac2b9abdaeb49160b3dc89ca7c1.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.net4j.tests/Net4j MonitorTest.launch2
-rw-r--r--plugins/org.eclipse.net4j.tests/Net4j SynchronizingCorrelatorTest.launch18
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java1
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java (renamed from plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractOMTest.java)2
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java (renamed from plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/MonitorTest.java)2
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java (renamed from plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SynchronizingCorrelatorTest.java)2
7 files changed, 16 insertions, 15 deletions
diff --git a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
index ce95c3b..114aee0 100644
--- a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
@@ -11,5 +11,5 @@ Require-Bundle: org.eclipse.core.runtime,
org.junit;visibility:=reexport,
org.eclipse.net4j.tcp;visibility:=reexport
Export-Package: org.eclipse.net4j.tests,
- org.eclipse.net4j.tests.bundle,
- org.eclipse.net4j.tests.signal
+ org.eclipse.net4j.tests.signal,
+ org.eclipse.net4j.util.tests
diff --git a/plugins/org.eclipse.net4j.tests/Net4j MonitorTest.launch b/plugins/org.eclipse.net4j.tests/Net4j MonitorTest.launch
index 0b87a1c..7a5ed97 100644
--- a/plugins/org.eclipse.net4j.tests/Net4j MonitorTest.launch
+++ b/plugins/org.eclipse.net4j.tests/Net4j MonitorTest.launch
@@ -15,6 +15,6 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.net4j.tests.MonitorTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.net4j.util.tests.MonitorTest"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.net4j.tests"/>
</launchConfiguration>
diff --git a/plugins/org.eclipse.net4j.tests/Net4j SynchronizingCorrelatorTest.launch b/plugins/org.eclipse.net4j.tests/Net4j SynchronizingCorrelatorTest.launch
index 4bc3197..1dee275 100644
--- a/plugins/org.eclipse.net4j.tests/Net4j SynchronizingCorrelatorTest.launch
+++ b/plugins/org.eclipse.net4j.tests/Net4j SynchronizingCorrelatorTest.launch
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.net4j.tests.SynchronizingCorrelatorTest"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.net4j.tests"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/org.eclipse.net4j.tests"/>
</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.net4j.util.tests.SynchronizingCorrelatorTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.net4j.tests"/>
</launchConfiguration>
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java
index 0f28a3a..4a6512e 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java
@@ -16,6 +16,7 @@ import org.eclipse.net4j.internal.tcp.TCPSelectorFactory;
import org.eclipse.net4j.internal.tcp.TCPSelectorInjector;
import org.eclipse.net4j.tcp.ITCPConstants;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
+import org.eclipse.net4j.util.tests.AbstractOMTest;
import org.eclipse.internal.net4j.Acceptor;
import org.eclipse.internal.net4j.Connector;
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractOMTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
index c7eb2e4..b358294 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractOMTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.tests;
+package org.eclipse.net4j.util.tests;
import org.eclipse.net4j.internal.util.om.log.PrintLogHandler;
import org.eclipse.net4j.internal.util.om.trace.PrintTraceHandler;
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/MonitorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java
index e3f079e..1fd7554 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/MonitorTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.tests;
+package org.eclipse.net4j.util.tests;
import org.eclipse.net4j.util.om.monitor.IllegalMonitorNestingException;
import org.eclipse.net4j.util.om.monitor.MonitorAlreadyBegunException;
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SynchronizingCorrelatorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java
index 8afbd5f..1f9a1ca 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SynchronizingCorrelatorTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.tests;
+package org.eclipse.net4j.util.tests;
import org.eclipse.net4j.internal.util.concurrent.SynchronizingCorrelator;
import org.eclipse.net4j.util.concurrent.ISynchronizer;