Attachment 2879 Details for Bug 24414 – patch for core.tests.runtime

[patch] patch for core.tests.runtime

org.eclipse.core.tests.runtime-24414-diff.txt (text/plain), 5.63 KB, created by Rafael Chaves

on 2003-01-02 12:24:37 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Rafael Chaves

Created: 2003-01-02 12:24:37 EST

Size: 5.63 KB

patch

obsolete

>Index: src/org/eclipse/core/tests/internal/registrycache/AllTests.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registrycache/AllTests.java,v
>retrieving revision 1.3
>diff -u -r1.3 AllTests.java
>--- src/org/eclipse/core/tests/internal/registrycache/AllTests.java	2 Apr 2002 23:21:14 -0000	1.3
>+++ src/org/eclipse/core/tests/internal/registrycache/AllTests.java	2 Jan 2003 17:17:21 -0000
>@@ -22,6 +22,7 @@
> public static Test suite() {
> 	TestSuite suite = new TestSuite();
> 	suite.addTest(SimpleCacheTests.suite());
>+	suite.addTest(LazyCacheTests.suite());
> 	return suite;
> }
>-}
>+}
>\ No newline at end of file
>Index: src/org/eclipse/core/tests/internal/registrycache/CacheHelpers.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registrycache/CacheHelpers.java,v
>retrieving revision 1.8
>diff -u -r1.8 CacheHelpers.java
>--- src/org/eclipse/core/tests/internal/registrycache/CacheHelpers.java	11 Jun 2002 19:50:01 -0000	1.8
>+++ src/org/eclipse/core/tests/internal/registrycache/CacheHelpers.java	2 Jan 2003 17:17:21 -0000
>@@ -328,7 +328,7 @@
> 		}
> 	}
> 	RegistryCacheReader cacheReader = new RegistryCacheReader(factory);
>-	PluginRegistryModel newRegistry = cacheReader.readPluginRegistry(input, pluginPath, false);
>+	PluginRegistryModel newRegistry = cacheReader.readPluginRegistry(input, pluginPath, true);
> 	return newRegistry;
> }
> public void doCacheWrite(PluginRegistryModel inRegistry, DataOutputStream output, Factory factory) {
>Index: src/org/eclipse/core/tests/internal/registrycache/LazyCacheTests.java
>===================================================================
>RCS file: src/org/eclipse/core/tests/internal/registrycache/LazyCacheTests.java
>diff -N src/org/eclipse/core/tests/internal/registrycache/LazyCacheTests.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/tests/internal/registrycache/LazyCacheTests.java	2 Jan 2003 17:17:21 -0000
>@@ -0,0 +1,67 @@
>+package org.eclipse.core.tests.internal.registrycache;
>+
>+import java.io.*;
>+import java.net.MalformedURLException;
>+import java.net.URL;
>+import java.util.Iterator;
>+import java.util.Map;
>+
>+import junit.framework.Test;
>+import junit.framework.TestSuite;
>+
>+import org.eclipse.core.internal.plugins.*;
>+import org.eclipse.core.internal.runtime.InternalPlatform;
>+import org.eclipse.core.runtime.model.Factory;
>+import org.eclipse.core.runtime.model.PluginRegistryModel;
>+
>+public class LazyCacheTests extends SimpleCacheTests {
>+	public LazyCacheTests() {
>+		super();
>+	}
>+	public LazyCacheTests(String name) {
>+		super(name);
>+	}
>+	public PluginRegistryModel doCacheRead(PluginRegistryModel inRegistry, DataInputStream input, Factory factory) {
>+		// Cobble together a plugin path
>+		Map regIndex = InternalPlatform.getRegIndex();
>+		URL[] pluginPath = null;
>+		if (regIndex != null) {
>+			int entrySize = regIndex.keySet().size();
>+			pluginPath = new URL[entrySize];
>+			int i = 0;
>+			for (Iterator list = regIndex.keySet().iterator(); list.hasNext();) {
>+				String fileName = (String)list.next();
>+				fileName = "file:" + fileName;
>+				try {
>+					pluginPath[i++] = new URL(fileName);
>+				} catch (MalformedURLException badURL) {
>+					assertTrue("2.1 Bad url found for " + fileName + ".", true);
>+				}
>+			}
>+		}
>+		RegistryCacheReader cacheReader = new RegistryCacheLazyReader(factory, new File(DEFAULT_LOCATION), true);
>+		PluginRegistryModel newRegistry = cacheReader.readPluginRegistry(input, pluginPath, true);
>+		return newRegistry;
>+	}
>+	public static Test suite() {
>+		TestSuite suite = new TestSuite("LazyCacheTests");
>+		suite.addTest(new LazyCacheTests("pluginTest"));
>+		suite.addTest(new LazyCacheTests("requiresTest"));
>+		suite.addTest(new LazyCacheTests("libraryTest"));
>+		suite.addTest(new LazyCacheTests("extensionTest"));
>+		suite.addTest(new LazyCacheTests("readOnlyTest"));
>+		suite.addTest(new LazyCacheTests("registryTest"));
>+		suite.addTest(new LazyCacheTests("extExtPtLinkTest"));
>+		suite.addTest(new LazyCacheTests("realRegistryTest"));
>+		suite.addTest(new LazyCacheTests("fragmentTest"));
>+		suite.addTest(new LazyCacheTests("fragmentPluginTest"));
>+		suite.addTest(new LazyCacheTests("fragmentExtensionTest"));
>+		suite.addTest(new LazyCacheTests("fragmentExtExtPtLinkTest"));
>+		suite.addTest(new LazyCacheTests("fragmentLibraryTest"));
>+		suite.addTest(new LazyCacheTests("fragmentReadOnlyTest"));
>+		suite.addTest(new LazyCacheTests("fragmentRequiresTest"));
>+		suite.addTest(new LazyCacheTests("fragmentRegistryTest"));
>+		suite.addTest(new LazyCacheTests("testRegistryEOF"));
>+		return suite;
>+	}	
>+}
>Index: src/org/eclipse/core/tests/internal/registrycache/SimpleCacheTests.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registrycache/SimpleCacheTests.java,v
>retrieving revision 1.7
>diff -u -r1.7 SimpleCacheTests.java
>--- src/org/eclipse/core/tests/internal/registrycache/SimpleCacheTests.java	4 Jul 2002 16:10:19 -0000	1.7
>+++ src/org/eclipse/core/tests/internal/registrycache/SimpleCacheTests.java	2 Jan 2003 17:17:21 -0000
>@@ -1412,7 +1412,7 @@
> 	factory = null;
> }
> public static Test suite() {
>-	TestSuite suite = new TestSuite();
>+	TestSuite suite = new TestSuite("SimpleCacheTests");
> 	suite.addTest(new SimpleCacheTests("pluginTest"));
> 	suite.addTest(new SimpleCacheTests("requiresTest"));
> 	suite.addTest(new SimpleCacheTests("libraryTest"));

Actions: View | Diff

Attachments on bug 24414: 2462 | 2878 | 2879 | 2880 | 2927