Attachment 136252 Details for Bug 276562 – Fix and regression test v01

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix and regression test v01

patch.txt (text/plain), 3.38 KB, created by John Arthorne

on 2009-05-18 22:14:37 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Arthorne

Created: 2009-05-18 22:14:37 EDT

Size: 3.38 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.tests
>Index: src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java,v
>retrieving revision 1.38
>diff -u -r1.38 MetadataRepositoryManagerTest.java
>--- src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java	13 May 2009 19:48:41 -0000	1.38
>+++ src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java	19 May 2009 02:10:45 -0000
>@@ -17,8 +17,8 @@
> import java.util.*;
> import junit.framework.Test;
> import junit.framework.TestSuite;
>-import org.eclipse.core.runtime.IStatus;
>-import org.eclipse.core.runtime.NullProgressMonitor;
>+import org.eclipse.core.runtime.*;
>+import org.eclipse.core.runtime.jobs.Job;
> import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
> import org.eclipse.equinox.internal.p2.core.helpers.URLUtil;
> import org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager;
>@@ -212,6 +212,45 @@
> 	}
> 
> 	/**
>+	 * Tests contention for the repository load lock
>+	 */
>+	public void testLoadContention() {
>+		File site = getTestData("Repositoy", "/testData/metadataRepo/good/");
>+		final URI location = site.toURI();
>+		final List<Exception> failures = new ArrayList<Exception>();
>+		final IMetadataRepositoryManager repoManager = getMetadataRepositoryManager();
>+		class LoadJob extends Job {
>+			LoadJob() {
>+				super("");
>+			}
>+
>+			@Override
>+			protected IStatus run(IProgressMonitor monitor) {
>+				for (int i = 0; i < 100; i++) {
>+					try {
>+						repoManager.loadRepository(location, null);
>+					} catch (Exception e) {
>+						failures.add(e);
>+					}
>+				}
>+				return Status.OK_STATUS;
>+			}
>+		}
>+		Job job1 = new LoadJob();
>+		Job job2 = new LoadJob();
>+		job1.schedule();
>+		job2.schedule();
>+		try {
>+			job1.join();
>+			job2.join();
>+		} catch (InterruptedException e) {
>+			fail("4.99", e);
>+		}
>+		if (!failures.isEmpty())
>+			fail("1.0", failures.iterator().next());
>+	}
>+
>+	/**
> 	 * Tests loading a repository that does not exist throws an appropriate exception.
> 	 */
> 	public void testLoadMissingRepository() throws IOException {
>#P org.eclipse.equinox.p2.repository
>Index: src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java,v
>retrieving revision 1.9
>diff -u -r1.9 AbstractRepositoryManager.java
>--- src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java	14 May 2009 18:51:41 -0000	1.9
>+++ src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java	19 May 2009 02:10:48 -0000
>@@ -592,6 +592,8 @@
> 
> 	protected IRepository loadRepository(URI location, IProgressMonitor monitor, String type, int flags) throws ProvisionException {
> 		checkValidLocation(location);
>+		if (monitor == null)
>+			monitor = new NullProgressMonitor();
> 		boolean added = false;
> 		IRepository result = null;
>

Actions: View | Diff

Attachments on bug 276562: 136252