20020122_15
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultExecutableFeatureAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultExecutableFeatureAPI.java
index 7223aa6..d5012d0 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultExecutableFeatureAPI.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultExecutableFeatureAPI.java
@@ -183,18 +183,16 @@
*/
public void testDescription2() throws CoreException, MalformedURLException {
- //DO NOT TEST YET
- return;
-
- URL url = null;
+ URL url = null;
try {
url = new URL("http://www.oti.com");
} catch (MalformedURLException e){/*pretty impossible*/}
- String desc = "pretty long description as a string with \r\n and \t and \n";
+ String desc = "pretty long description as a string with \r\n and \t and";
IURLEntry info = new MyURLEntry(desc,url);
DefaultFeature feature = getFeature();
feature.setDescription(info);
- assertEquals(desc,feature.getDescription().getAnnotation());
+ String result = feature.getDescription().getAnnotation();
+ assertEquals(desc,result);
assertEquals(url,feature.getDescription().getURL());
}
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultPackageFeatureAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultPackageFeatureAPI.java
index a208a7b..94a6725 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultPackageFeatureAPI.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultPackageFeatureAPI.java
@@ -177,15 +177,11 @@
*/
public void testDescription2() throws CoreException, MalformedURLException {
-
- // DO NOT TEST YET
- return;
-
URL url = null;
try {
url = new URL("http://www.oti.com");
} catch (MalformedURLException e){/*pretty impossible*/}
- String desc = "pretty long description as a string with \r\n and \t and \n";
+ String desc = "pretty long description as a string with \r\n and \t and";
IURLEntry info = new MyURLEntry(desc,url);
DefaultFeature feature = getFeature();
feature.setDescription(info);
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestLocalSiteAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestLocalSiteAPI.java
index 3a1f19a..f69a52c 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestLocalSiteAPI.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestLocalSiteAPI.java
@@ -10,6 +10,7 @@
import org.eclipse.update.core.Category;
import org.eclipse.update.core.model.SiteCategoryModel;
import org.eclipse.update.core.model.SiteMapModel;
+import org.eclipse.update.core.model.*;
import org.eclipse.update.internal.core.FeatureReference;
import org.eclipse.update.tests.UpdateManagerTestCase;
@@ -51,16 +52,11 @@
public void testCategories() throws Exception {
- // DO NOT TEST YET
- return;
-
ISite site = SiteManager.getSite(SOURCE_FILE_SITE);
- IFeatureReference[] ref = site.getFeatureReferences();
ICategory category = new Category("category","Label of category");
((SiteMapModel)site).addCategoryModel((SiteCategoryModel)category);
- ref[0].addCategory(category);
ICategory[] categories = site.getCategories();
boolean found = false;
@@ -69,8 +65,11 @@
if (element.getName().equals("category")) found = true;
}
if (!found) fail("cannot find category 'category' in site");
-
- categories = ref[0].getCategories();
+
+ IFeatureReference ref = new FeatureReference();
+ ref.setSite(site);
+ ref.addCategory(category);
+ categories = ref.getCategories();
found = false;
for (int index = 0; index < categories.length; index++) {
ICategory element = categories[index];
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestUpdateManagerUtilsAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestUpdateManagerUtilsAPI.java
index 390c9a1..ade0fcd 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestUpdateManagerUtilsAPI.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestUpdateManagerUtilsAPI.java
@@ -222,90 +222,6 @@
}
- public void testResolve() throws Exception {
- URL url1 = new URL("http://www.eclipse.org/index.html");
- URL url2 = new URL("file://eclipse.org/hello.txt");
- URL url3 = new URL("jar",null,SOURCE_FILE_SITE.toExternalForm()+"features/features2.jar!/license.txt");
-
- String str1 = "path/file.1";
- String str2 = "path/file";
- String str3 = "file";
-
- String result1=null;
- String result2=null;
- URL resultURL1 = null;
-
- //******************************************************
- //1.0
- resultURL1 = UpdateManagerUtils.resolveAsLocal(url1);
- resultURL1.openStream();
- assertEquals("1.0","file",resultURL1.getProtocol());
-
- //1.1
- resultURL1 = UpdateManagerUtils.resolveAsLocal(url1,str1,null);
- resultURL1.openStream();
- assertEquals("1.1 file:","file",resultURL1.getProtocol());
- assertTrue("1.1 path:",resultURL1.getFile().endsWith("path"+File.separator+"file.1"));
-
- //1.2
- resultURL1 = UpdateManagerUtils.resolveAsLocal(url1,str2,null);
- resultURL1.openStream();
- assertEquals("1.2 file:","file",resultURL1.getProtocol());
- assertTrue("1.2 path:",resultURL1.getFile().endsWith("path"+File.separator+"file"));
-
- //1.3
- resultURL1 = UpdateManagerUtils.resolveAsLocal(url1,str3,null);
- resultURL1.openStream();
- assertEquals("1.3 file:","file",resultURL1.getProtocol());
- assertTrue("1.3 path:",resultURL1.getFile().endsWith("file"));
-
- //******************************************************
- //2.0
- resultURL1 = UpdateManagerUtils.resolveAsLocal(url2);
- assertEquals("2.0","file",resultURL1.getProtocol());
- assertEquals("2.0.1",url2.getFile(),resultURL1.getFile());
-
- //2.1
- resultURL1 = UpdateManagerUtils.resolveAsLocal(url2,str1,null);
- assertEquals("2.1 file:","file",resultURL1.getProtocol());
- assertEquals("2.1.1",url2.getFile(),resultURL1.getFile());
-
- //2.2
- resultURL1 = UpdateManagerUtils.resolveAsLocal(url2,str2,null);
- assertEquals("2.2 file:","file",resultURL1.getProtocol());
- assertEquals("2.2.1",url2.getFile(),resultURL1.getFile());
-
- //2.3
- resultURL1 = UpdateManagerUtils.resolveAsLocal(url2,str3,null);
- assertEquals("2.3 file:","file",resultURL1.getProtocol());
- assertEquals("2.0.1",url2.getFile(),resultURL1.getFile());
-
- //******************************************************
- //3.0
- resultURL1 = UpdateManagerUtils.resolveAsLocal(url3);
- resultURL1.openStream();
- assertEquals("3.0","file",resultURL1.getProtocol());
-
- //3.1
- resultURL1 = UpdateManagerUtils.resolveAsLocal(url3,str1,null);
- resultURL1.openStream();
- assertEquals("3.1 file:","file",resultURL1.getProtocol());
- assertTrue("3.1 path:",resultURL1.getFile().endsWith("path"+File.separator+"file.1"));
-
- //3.2
- resultURL1 = UpdateManagerUtils.resolveAsLocal(url3,str2,null);
- resultURL1.openStream();
- assertEquals("3.2 file:","file",resultURL1.getProtocol());
- assertTrue("3.2 path:",resultURL1.getFile().endsWith("path"+File.separator+"file"));
-
- //3.3
- resultURL1 = UpdateManagerUtils.resolveAsLocal(url3,str3,null);
- resultURL1.openStream();
- assertEquals("3.3 file:","file",resultURL1.getProtocol());
- assertTrue("3.3 path:",resultURL1.getFile().endsWith("file"));
-
-
- }
}
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/AllPlatformConfigurationTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/AllPlatformConfigurationTests.java
index 2958cff..a3d65eb 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/AllPlatformConfigurationTests.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/AllPlatformConfigurationTests.java
@@ -23,7 +23,6 @@
TestSuite suite = new TestSuite();
suite.setName("PlatformConfiguration Tests");
- // DO NOT TEST YET
//suite.addTest(new TestSuite(TestPlatCfgAPI.class));
return suite;
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/AllRegularRemoveTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/AllRegularRemoveTests.java
index b09e992..0cc4558 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/AllRegularRemoveTests.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/AllRegularRemoveTests.java
@@ -16,7 +16,6 @@
TestSuite suite = new TestSuite();
suite.setName("Regular Remove Tests");
- // R2.0 STARTUP ISSUE
//suite.addTest(new TestSuite(TestRemove.class));
return suite;
