Attachment #160730 for bug #161566




/*******************************************************************************
 * 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

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;


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;

		super.setUp();
		fProject= JavaProjectHelper.createJavaProject("TestProject", "bin");
		JavaProjectHelper.addRTJar(fProject);
		IClasspathEntry cpe= JavaCore.newContainerEntry(JUnitCore.JUNIT3_CONTAINER_PATH);
		JavaProjectHelper.addToClasspath(fProject, cpe);

		fRoot= JavaProjectHelper.addSourceContainer(fProject, "src");

Lines 34-40 Link Here

(-)ui/org/eclipse/jdt/junit/tests/JUnit4TestFinderTest.java (-2 / +1 lines)
34	import org.eclipse.jdt.core.IType;	34	import org.eclipse.jdt.core.IType;
35	import org.eclipse.jdt.core.JavaCore;	35	import org.eclipse.jdt.core.JavaCore;
36		36
37	import org.eclipse.jdt.internal.junit.buildpath.JUnitContainerInitializer;
38	import org.eclipse.jdt.internal.junit.launcher.ITestFinder;	37	import org.eclipse.jdt.internal.junit.launcher.ITestFinder;
39	import org.eclipse.jdt.internal.junit.launcher.ITestKind;	38	import org.eclipse.jdt.internal.junit.launcher.ITestKind;
40	import org.eclipse.jdt.internal.junit.launcher.TestKindRegistry;	39	import org.eclipse.jdt.internal.junit.launcher.TestKindRegistry;
Lines 52-58 Link Here
52	super.setUp();	51	super.setUp();
53	fProject= JavaProjectHelper.createJavaProject("TestProject", "bin");	52	fProject= JavaProjectHelper.createJavaProject("TestProject", "bin");
54	JavaProjectHelper.addRTJar(fProject);	53	JavaProjectHelper.addRTJar(fProject);
55	IClasspathEntry cpe= JavaCore.newContainerEntry(JUnitContainerInitializer.JUNIT4_PATH);	54	IClasspathEntry cpe= JavaCore.newContainerEntry(JUnitCore.JUNIT4_CONTAINER_PATH);
56	JavaProjectHelper.addToClasspath(fProject, cpe);	55	JavaProjectHelper.addToClasspath(fProject, cpe);
57	JavaProjectHelper.set15CompilerOptions(fProject);	56	JavaProjectHelper.set15CompilerOptions(fProject);
58		57




/*******************************************************************************
 * 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

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;


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/";

		if (fJUnit4) {
			fgProject= JavaProjectHelper.createJavaProject(PROJECT_NAME_4, "bin");
			JavaProjectHelper.addRTJar(fgProject);
			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(JUnitCore.JUNIT3_CONTAINER_PATH);
			JavaProjectHelper.addToClasspath(fgProject, cpe);
		}
		fgRoot= JavaProjectHelper.addSourceContainer(fgProject, SRC_NAME);

Return to bug 161566

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/junit/tests/JUnit3TestFinderTest.java (-3 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 16-21 Link Here
16	import junit.framework.Test;	16	import junit.framework.Test;
17	import junit.framework.TestCase;	17	import junit.framework.TestCase;
18		18
		19	import org.eclipse.jdt.junit.JUnitCore;
19	import org.eclipse.jdt.testplugin.JavaProjectHelper;	20	import org.eclipse.jdt.testplugin.JavaProjectHelper;
20	import org.eclipse.jdt.testplugin.StringAsserts;	21	import org.eclipse.jdt.testplugin.StringAsserts;
21		22
Lines 29-35 Link Here
29	import org.eclipse.jdt.core.IType;	30	import org.eclipse.jdt.core.IType;
30	import org.eclipse.jdt.core.JavaCore;	31	import org.eclipse.jdt.core.JavaCore;
31		32
32	import org.eclipse.jdt.internal.junit.buildpath.JUnitContainerInitializer;
33	import org.eclipse.jdt.internal.junit.launcher.ITestFinder;	33	import org.eclipse.jdt.internal.junit.launcher.ITestFinder;
34	import org.eclipse.jdt.internal.junit.launcher.ITestKind;	34	import org.eclipse.jdt.internal.junit.launcher.ITestKind;
35	import org.eclipse.jdt.internal.junit.launcher.TestKindRegistry;	35	import org.eclipse.jdt.internal.junit.launcher.TestKindRegistry;
Lines 46-52 Link Here
46	super.setUp();	46	super.setUp();
47	fProject= JavaProjectHelper.createJavaProject("TestProject", "bin");	47	fProject= JavaProjectHelper.createJavaProject("TestProject", "bin");
48	JavaProjectHelper.addRTJar(fProject);	48	JavaProjectHelper.addRTJar(fProject);
49	IClasspathEntry cpe= JavaCore.newContainerEntry(JUnitContainerInitializer.JUNIT3_PATH);	49	IClasspathEntry cpe= JavaCore.newContainerEntry(JUnitCore.JUNIT3_CONTAINER_PATH);
50	JavaProjectHelper.addToClasspath(fProject, cpe);	50	JavaProjectHelper.addToClasspath(fProject, cpe);
51		51
52	fRoot= JavaProjectHelper.addSourceContainer(fProject, "src");	52	fRoot= JavaProjectHelper.addSourceContainer(fProject, "src");

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/junit/tests/JUnitWorkspaceTestSetup.java (-5 / +4 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007, 2008 IBM Corporation and others.	2	* Copyright (c) 2007, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 15-20 Link Here
15	import junit.extensions.TestSetup;	15	import junit.extensions.TestSetup;
16	import junit.framework.Test;	16	import junit.framework.Test;
17		17
		18	import org.eclipse.jdt.junit.JUnitCore;
18	import org.eclipse.jdt.testplugin.JavaProjectHelper;	19	import org.eclipse.jdt.testplugin.JavaProjectHelper;
19	import org.eclipse.jdt.testplugin.JavaTestPlugin;	20	import org.eclipse.jdt.testplugin.JavaTestPlugin;
20		21
Lines 25-32 Link Here
25	import org.eclipse.jdt.core.IPackageFragmentRoot;	26	import org.eclipse.jdt.core.IPackageFragmentRoot;
26	import org.eclipse.jdt.core.JavaCore;	27	import org.eclipse.jdt.core.JavaCore;
27		28
28	import org.eclipse.jdt.internal.junit.buildpath.JUnitContainerInitializer;
29
30	public class JUnitWorkspaceTestSetup extends TestSetup {	29	public class JUnitWorkspaceTestSetup extends TestSetup {
31		30
32	public static final String WORKSPACE_PATH= "testresources/JUnitWorkspace/";	31	public static final String WORKSPACE_PATH= "testresources/JUnitWorkspace/";
Lines 60-72 Link Here
60	if (fJUnit4) {	59	if (fJUnit4) {
61	fgProject= JavaProjectHelper.createJavaProject(PROJECT_NAME_4, "bin");	60	fgProject= JavaProjectHelper.createJavaProject(PROJECT_NAME_4, "bin");
62	JavaProjectHelper.addRTJar(fgProject);	61	JavaProjectHelper.addRTJar(fgProject);
63	IClasspathEntry cpe= JavaCore.newContainerEntry(JUnitContainerInitializer.JUNIT4_PATH);	62	IClasspathEntry cpe= JavaCore.newContainerEntry(JUnitCore.JUNIT4_CONTAINER_PATH);
64	JavaProjectHelper.addToClasspath(fgProject, cpe);	63	JavaProjectHelper.addToClasspath(fgProject, cpe);
65		64
66	} else {	65	} else {
67	fgProject= JavaProjectHelper.createJavaProject(PROJECT_NAME_3, "bin");	66	fgProject= JavaProjectHelper.createJavaProject(PROJECT_NAME_3, "bin");
68	JavaProjectHelper.addRTJar13(fgProject);	67	JavaProjectHelper.addRTJar13(fgProject);
69	IClasspathEntry cpe= JavaCore.newContainerEntry(JUnitContainerInitializer.JUNIT3_PATH);	68	IClasspathEntry cpe= JavaCore.newContainerEntry(JUnitCore.JUNIT3_CONTAINER_PATH);
70	JavaProjectHelper.addToClasspath(fgProject, cpe);	69	JavaProjectHelper.addToClasspath(fgProject, cpe);
71	}	70	}
72	fgRoot= JavaProjectHelper.addSourceContainer(fgProject, SRC_NAME);	71	fgRoot= JavaProjectHelper.addSourceContainer(fgProject, SRC_NAME);