Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'tests/org.eclipse.team.tests.core')
-rw-r--r--tests/org.eclipse.team.tests.core/ftp.properties2
-rw-r--r--tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/TargetProviderTests.java3
-rw-r--r--tests/org.eclipse.team.tests.core/webdav.properties2
3 files changed, 4 insertions, 3 deletions
diff --git a/tests/org.eclipse.team.tests.core/ftp.properties b/tests/org.eclipse.team.tests.core/ftp.properties
index d2eb6c326..0043b8eb1 100644
--- a/tests/org.eclipse.team.tests.core/ftp.properties
+++ b/tests/org.eclipse.team.tests.core/ftp.properties
@@ -1,4 +1,4 @@
-target=ftp
+target=org.eclipse.team.ftp
test_dir=target
location=ftp://ftp.server/path
username=username
diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/TargetProviderTests.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/TargetProviderTests.java
index e797f5c26..130024e7c 100644
--- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/TargetProviderTests.java
+++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/TargetProviderTests.java
@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.Path;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.target.TargetManager;
import org.eclipse.team.core.target.TargetProvider;
+import org.eclipse.team.internal.core.target.UrlUtil;
/**
* A set of test cases for org.eclipse.team.core.target.TargetProvider
@@ -61,7 +62,7 @@ public class TargetProviderTests extends TeamTest {
IProject project = getNamedTestProject("urlretrieval");
TargetManager.map(project, getSite(), new Path(properties.getProperty("test_dir")));
TargetProvider target = TargetManager.getProvider(project);
- String goodurl =new URL(new URL(properties.getProperty("location")), properties.getProperty("test_dir")).toString();
+ String goodurl = UrlUtil.concat(properties.getProperty("location"), new Path(properties.getProperty("test_dir"))).toString();
assertEquals(goodurl, target.getURL().toString());
}
/**
diff --git a/tests/org.eclipse.team.tests.core/webdav.properties b/tests/org.eclipse.team.tests.core/webdav.properties
index eb0c9c0ab..d3b3d31ee 100644
--- a/tests/org.eclipse.team.tests.core/webdav.properties
+++ b/tests/org.eclipse.team.tests.core/webdav.properties
@@ -1,4 +1,4 @@
-target=webdav
+target=org.eclipse.team.webdav
test_dir=target
location=http://web.dav.server/path
httpClient.username=username

Back to the top