Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rwxr-xr-xtests/bundles/org.eclipse.ecf.tests.remoteservice/.classpath2
-rwxr-xr-xtests/bundles/org.eclipse.ecf.tests.remoteservice/META-INF/MANIFEST.MF6
-rwxr-xr-xtests/bundles/org.eclipse.ecf.tests.remoteservice/src/org/eclipse/ecf/tests/remoteservice/generic/ServiceTrackerTest.java5
-rwxr-xr-xtests/bundles/org.eclipse.ecf.tests.remoteservice/src/org/eclipse/ecf/tests/remoteservice/generic/TransparentProxyTest.java4
-rwxr-xr-xtests/bundles/org.eclipse.ecf.tests.remoteservice/src/org/eclipse/ecf/tests/remoteservice/r_osgi/TransparentProxyTest.java4
5 files changed, 10 insertions, 11 deletions
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice/.classpath b/tests/bundles/org.eclipse.ecf.tests.remoteservice/.classpath
index 304e86186..64c5e31b7 100755
--- a/tests/bundles/org.eclipse.ecf.tests.remoteservice/.classpath
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.remoteservice/META-INF/MANIFEST.MF
index 114cca954..e52e98caa 100755
--- a/tests/bundles/org.eclipse.ecf.tests.remoteservice/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice/META-INF/MANIFEST.MF
@@ -6,11 +6,11 @@ Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.eclipse.ecf.tests.remoteservice.Activator
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ecf,
+Require-Bundle: org.eclipse.equinox.common;bundle-version="3.4.0",
+ org.eclipse.ecf,
org.eclipse.ecf.tests,
org.eclipse.ecf.remoteservice,
- org.junit,
- org.eclipse.equinox.common
+ org.junit
Eclipse-LazyStart: true
Export-Package: org.eclipse.ecf.tests.remoteservice
Import-Package: org.osgi.framework;version="1.4.0",
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice/src/org/eclipse/ecf/tests/remoteservice/generic/ServiceTrackerTest.java b/tests/bundles/org.eclipse.ecf.tests.remoteservice/src/org/eclipse/ecf/tests/remoteservice/generic/ServiceTrackerTest.java
index a063b988d..e8ee445c1 100755
--- a/tests/bundles/org.eclipse.ecf.tests.remoteservice/src/org/eclipse/ecf/tests/remoteservice/generic/ServiceTrackerTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice/src/org/eclipse/ecf/tests/remoteservice/generic/ServiceTrackerTest.java
@@ -15,12 +15,10 @@ import java.util.Dictionary;
import java.util.Hashtable;
import org.eclipse.ecf.remoteservice.Constants;
-import org.eclipse.ecf.remoteservice.IRemoteService;
import org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter;
import org.eclipse.ecf.tests.remoteservice.AbstractServiceTrackerTest;
import org.eclipse.ecf.tests.remoteservice.Activator;
import org.eclipse.ecf.tests.remoteservice.IConcatService;
-import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
/**
@@ -84,6 +82,7 @@ public class ServiceTrackerTest extends AbstractServiceTrackerTest {
sleep(3000);
}
+ /*
public void testRemoteServiceWithServiceTracker() throws Exception {
final IRemoteServiceContainerAdapter[] adapters = getRemoteServiceAdapters();
// client [0]/adapter[0] is the service 'server'
@@ -109,5 +108,5 @@ public class ServiceTrackerTest extends AbstractServiceTrackerTest {
sleep(3000);
st.close();
}
-
+ */
}
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice/src/org/eclipse/ecf/tests/remoteservice/generic/TransparentProxyTest.java b/tests/bundles/org.eclipse.ecf.tests.remoteservice/src/org/eclipse/ecf/tests/remoteservice/generic/TransparentProxyTest.java
index 114c81004..3eee9198c 100755
--- a/tests/bundles/org.eclipse.ecf.tests.remoteservice/src/org/eclipse/ecf/tests/remoteservice/generic/TransparentProxyTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice/src/org/eclipse/ecf/tests/remoteservice/generic/TransparentProxyTest.java
@@ -15,7 +15,6 @@ import java.util.Dictionary;
import java.util.Hashtable;
import org.eclipse.ecf.remoteservice.Constants;
-import org.eclipse.ecf.remoteservice.IRemoteService;
import org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter;
import org.eclipse.ecf.tests.remoteservice.AbstractRemoteServiceTest;
import org.eclipse.ecf.tests.remoteservice.Activator;
@@ -82,6 +81,7 @@ public class TransparentProxyTest extends AbstractRemoteServiceTest {
sleep(3000);
}
+ /*
public void testIRemoteService() throws Exception {
final IRemoteServiceContainerAdapter[] adapters = getRemoteServiceAdapters();
// client [0]/adapter[0] is the service 'server'
@@ -104,5 +104,5 @@ public class TransparentProxyTest extends AbstractRemoteServiceTest {
remoteService.callAsynch(createRemoteConcat("OSGi ", "Sucks (sic)"), createRemoteCallListener());
sleep(3000);
}
-
+ */
}
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice/src/org/eclipse/ecf/tests/remoteservice/r_osgi/TransparentProxyTest.java b/tests/bundles/org.eclipse.ecf.tests.remoteservice/src/org/eclipse/ecf/tests/remoteservice/r_osgi/TransparentProxyTest.java
index 0295ce3ee..2e10442ba 100755
--- a/tests/bundles/org.eclipse.ecf.tests.remoteservice/src/org/eclipse/ecf/tests/remoteservice/r_osgi/TransparentProxyTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice/src/org/eclipse/ecf/tests/remoteservice/r_osgi/TransparentProxyTest.java
@@ -16,7 +16,6 @@ import java.util.Hashtable;
import org.eclipse.ecf.core.IContainer;
import org.eclipse.ecf.remoteservice.Constants;
-import org.eclipse.ecf.remoteservice.IRemoteService;
import org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter;
import org.eclipse.ecf.tests.remoteservice.AbstractRemoteServiceTest;
import org.eclipse.ecf.tests.remoteservice.Activator;
@@ -131,6 +130,7 @@ public class TransparentProxyTest extends AbstractRemoteServiceTest {
* in here).
* @throws Exception
*/
+ /*
public void testIRemoteService() throws Exception {
final IRemoteServiceContainerAdapter[] adapters = getRemoteServiceAdapters();
// client [0]/adapter[0] is the service 'server'
@@ -153,5 +153,5 @@ public class TransparentProxyTest extends AbstractRemoteServiceTest {
remoteService.callAsynch(createRemoteConcat("OSGi ", "Sucks (sic)"), createRemoteCallListener());
sleep(3000);
}
-
+ */
}

Back to the top