Attachment 160730 Details for Bug 161566 – fix

[patch] fix

161566.txt (text/plain), 5.56 KB, created by Deepak Azad

on 2010-03-02 23:59:45 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Deepak Azad

Created: 2010-03-02 23:59:45 EST

Size: 5.56 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui.tests
>Index: ui/org/eclipse/jdt/junit/tests/JUnit3TestFinderTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/JUnit3TestFinderTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 JUnit3TestFinderTest.java
>--- ui/org/eclipse/jdt/junit/tests/JUnit3TestFinderTest.java	31 Dec 2008 21:14:27 -0000	1.4
>+++ ui/org/eclipse/jdt/junit/tests/JUnit3TestFinderTest.java	3 Mar 2010 04:49:22 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -16,6 +16,7 @@
> import junit.framework.Test;
> import junit.framework.TestCase;
> 
>+import org.eclipse.jdt.junit.JUnitCore;
> import org.eclipse.jdt.testplugin.JavaProjectHelper;
> import org.eclipse.jdt.testplugin.StringAsserts;
> 
>@@ -29,7 +30,6 @@
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.JavaCore;
> 
>-import org.eclipse.jdt.internal.junit.buildpath.JUnitContainerInitializer;
> import org.eclipse.jdt.internal.junit.launcher.ITestFinder;
> import org.eclipse.jdt.internal.junit.launcher.ITestKind;
> import org.eclipse.jdt.internal.junit.launcher.TestKindRegistry;
>@@ -46,7 +46,7 @@
> 		super.setUp();
> 		fProject= JavaProjectHelper.createJavaProject("TestProject", "bin");
> 		JavaProjectHelper.addRTJar(fProject);
>-		IClasspathEntry cpe= JavaCore.newContainerEntry(JUnitContainerInitializer.JUNIT3_PATH);
>+		IClasspathEntry cpe= JavaCore.newContainerEntry(JUnitCore.JUNIT3_CONTAINER_PATH);
> 		JavaProjectHelper.addToClasspath(fProject, cpe);
> 
> 		fRoot= JavaProjectHelper.addSourceContainer(fProject, "src");
>Index: ui/org/eclipse/jdt/junit/tests/JUnit4TestFinderTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/JUnit4TestFinderTest.java,v
>retrieving revision 1.10
>diff -u -r1.10 JUnit4TestFinderTest.java
>--- ui/org/eclipse/jdt/junit/tests/JUnit4TestFinderTest.java	6 Jan 2010 13:58:19 -0000	1.10
>+++ ui/org/eclipse/jdt/junit/tests/JUnit4TestFinderTest.java	3 Mar 2010 04:49:23 -0000
>@@ -34,7 +34,6 @@
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.JavaCore;
> 
>-import org.eclipse.jdt.internal.junit.buildpath.JUnitContainerInitializer;
> import org.eclipse.jdt.internal.junit.launcher.ITestFinder;
> import org.eclipse.jdt.internal.junit.launcher.ITestKind;
> import org.eclipse.jdt.internal.junit.launcher.TestKindRegistry;
>@@ -52,7 +51,7 @@
> 		super.setUp();
> 		fProject= JavaProjectHelper.createJavaProject("TestProject", "bin");
> 		JavaProjectHelper.addRTJar(fProject);
>-		IClasspathEntry cpe= JavaCore.newContainerEntry(JUnitContainerInitializer.JUNIT4_PATH);
>+		IClasspathEntry cpe= JavaCore.newContainerEntry(JUnitCore.JUNIT4_CONTAINER_PATH);
> 		JavaProjectHelper.addToClasspath(fProject, cpe);
> 		JavaProjectHelper.set15CompilerOptions(fProject);
> 
>Index: ui/org/eclipse/jdt/junit/tests/JUnitWorkspaceTestSetup.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/JUnitWorkspaceTestSetup.java,v
>retrieving revision 1.4
>diff -u -r1.4 JUnitWorkspaceTestSetup.java
>--- ui/org/eclipse/jdt/junit/tests/JUnitWorkspaceTestSetup.java	11 Sep 2008 11:57:35 -0000	1.4
>+++ ui/org/eclipse/jdt/junit/tests/JUnitWorkspaceTestSetup.java	3 Mar 2010 04:49:23 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2008 IBM Corporation and others.
>+ * Copyright (c) 2007, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -15,6 +15,7 @@
> import junit.extensions.TestSetup;
> import junit.framework.Test;
> 
>+import org.eclipse.jdt.junit.JUnitCore;
> import org.eclipse.jdt.testplugin.JavaProjectHelper;
> import org.eclipse.jdt.testplugin.JavaTestPlugin;
> 
>@@ -25,8 +26,6 @@
> import org.eclipse.jdt.core.IPackageFragmentRoot;
> import org.eclipse.jdt.core.JavaCore;
> 
>-import org.eclipse.jdt.internal.junit.buildpath.JUnitContainerInitializer;
>-
> public class JUnitWorkspaceTestSetup extends TestSetup {
> 
> 	public static final String WORKSPACE_PATH= "testresources/JUnitWorkspace/";
>@@ -60,13 +59,13 @@
> 		if (fJUnit4) {
> 			fgProject= JavaProjectHelper.createJavaProject(PROJECT_NAME_4, "bin");
> 			JavaProjectHelper.addRTJar(fgProject);
>-			IClasspathEntry cpe= JavaCore.newContainerEntry(JUnitContainerInitializer.JUNIT4_PATH);
>+			IClasspathEntry cpe= JavaCore.newContainerEntry(JUnitCore.JUNIT4_CONTAINER_PATH);
> 			JavaProjectHelper.addToClasspath(fgProject, cpe);
> 
> 		} else {
> 			fgProject= JavaProjectHelper.createJavaProject(PROJECT_NAME_3, "bin");
> 			JavaProjectHelper.addRTJar13(fgProject);
>-			IClasspathEntry cpe= JavaCore.newContainerEntry(JUnitContainerInitializer.JUNIT3_PATH);
>+			IClasspathEntry cpe= JavaCore.newContainerEntry(JUnitCore.JUNIT3_CONTAINER_PATH);
> 			JavaProjectHelper.addToClasspath(fgProject, cpe);
> 		}
> 		fgRoot= JavaProjectHelper.addSourceContainer(fgProject, SRC_NAME);

Flags:

daniel_megert: iplog+
daniel_megert: review+

Actions: View | Diff

Attachments on bug 161566: 160686 | 160730