Attachment 73019 Details for Bug 95288 – Proposed fix and regression test

[patch] Proposed fix and regression test

95288.txt (text/plain), 3.33 KB, created by Jerome Lanneluc

on 2007-07-04 06:36:32 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jerome Lanneluc

Created: 2007-07-04 06:36:32 EDT

Size: 3.33 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core.tests.model
>Index: src/org/eclipse/jdt/core/tests/model/CreatePackageTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CreatePackageTests.java,v
>retrieving revision 1.7
>diff -u -r1.7 CreatePackageTests.java
>--- src/org/eclipse/jdt/core/tests/model/CreatePackageTests.java	27 Apr 2007 16:02:33 -0000	1.7
>+++ src/org/eclipse/jdt/core/tests/model/CreatePackageTests.java	4 Jul 2007 10:36:50 -0000
>@@ -10,7 +10,10 @@
>  *******************************************************************************/
> package org.eclipse.jdt.core.tests.model;
> 
>+import org.eclipse.core.resources.IResource;
>+import org.eclipse.core.resources.IWorkspaceRunnable;
> import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.jdt.core.*;
> 
> import junit.framework.Test;
>@@ -93,6 +96,21 @@
> 	assertCreation(frag);
> 	assertTrue("Fragment return not correct", frag.getElementName().equals("A"));
> }
>+/*
>+ * Ensures that a package fragment can be created inside an operation with a
>+ * package fragment root scheduling rule.
>+ * (regression test for 95288 [model] CreatePackageFragmentOperation runs with wrong ISchedulingRule)
>+ */
>+public void testCreatePackageFragment5() throws CoreException {
>+	IWorkspaceRunnable runnable = new IWorkspaceRunnable(){
>+		public void run(IProgressMonitor monitor) throws CoreException {
>+			IPackageFragmentRoot root= getPackageFragmentRoot("P", "");
>+			IPackageFragment frag= root.createPackageFragment("p", false, monitor);
>+			assertCreation(frag);
>+		}
>+	};
>+	getWorkspace().run(runnable, getProject("P"), IResource.NONE, null);
>+}
> /**
>  * Ensures that a package fragment that already exists is not duplicated in the package
>  * fragment root.
>#P org.eclipse.jdt.core
>Index: model/org/eclipse/jdt/internal/core/CreatePackageFragmentOperation.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreatePackageFragmentOperation.java,v
>retrieving revision 1.35
>diff -u -r1.35 CreatePackageFragmentOperation.java
>--- model/org/eclipse/jdt/internal/core/CreatePackageFragmentOperation.java	16 Mar 2007 18:28:58 -0000	1.35
>+++ model/org/eclipse/jdt/internal/core/CreatePackageFragmentOperation.java	4 Jul 2007 10:36:51 -0000
>@@ -16,6 +16,7 @@
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.Path;
>+import org.eclipse.core.runtime.jobs.ISchedulingRule;
> import org.eclipse.jdt.core.IJavaElement;
> import org.eclipse.jdt.core.IJavaModelStatus;
> import org.eclipse.jdt.core.IJavaModelStatusConstants;
>@@ -110,6 +111,13 @@
> 		done();
> 	}
> }
>+protected ISchedulingRule getSchedulingRule() {
>+	if (this.pkgName.length == 0)
>+		return null; // no resource is going to be created
>+	IResource parentResource = getParentElement().getResource();
>+	IResource resource = ((IContainer) parentResource).getFolder(new Path(this.pkgName[0]));
>+	return resource.getWorkspace().getRuleFactory().createRule(resource);
>+}
> /**
>  * Possible failures: <ul>
>  *  <li>NO_ELEMENTS_TO_PROCESS - the root supplied to the operation is

Actions: View | Diff

Attachments on bug 95288: 73019