Attachment 76754 Details for Bug 195624 – Patch for 3.3.1

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

[patch] Patch for 3.3.1

195624_331_patch.txt (text/plain), 7.62 KB, created by Markus Keller

on 2007-08-23 06:46:49 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Keller

Created: 2007-08-23 06:46:49 EDT

Size: 7.62 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.junit
>Index: src/org/eclipse/jdt/internal/junit/model/TestRunHandler.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/model/TestRunHandler.java,v
>retrieving revision 1.3
>diff -u -r1.3 TestRunHandler.java
>--- src/org/eclipse/jdt/internal/junit/model/TestRunHandler.java	28 Mar 2007 14:43:42 -0000	1.3
>+++ src/org/eclipse/jdt/internal/junit/model/TestRunHandler.java	23 Aug 2007 10:48:41 -0000
>@@ -83,6 +83,7 @@
> 			} else {
> 				fTestRunSession.reset(); 
> 			}
>+			fTestSuite= fTestRunSession.getTestRoot();
> 			
> 		} else if (qName.equals(IXMLTags.NODE_TESTSUITES)) { 
> 			// support Ant's 'junitreport' task; create suite from NODE_TESTSUITE
>@@ -93,12 +94,12 @@
> 			if (fTestRunSession == null) {
> 				// support standalone suites and Ant's 'junitreport' task:
> 				fTestRunSession= new TestRunSession(name, null);
>+				fTestSuite= fTestRunSession.getTestRoot();
> 			}
> 			
> 			String pack= attributes.getValue(IXMLTags.ATTR_PACKAGE);
> 			String suiteName= pack == null ? name : pack + "." + name; //$NON-NLS-1$
>-			TestSuiteElement parent= fTestSuite == null ? fTestRunSession.getTestRoot() : fTestSuite;
>-			fTestSuite= (TestSuiteElement) fTestRunSession.createTestElement(parent, getNextId(), suiteName, true, 0);
>+			fTestSuite= (TestSuiteElement) fTestRunSession.createTestElement(fTestSuite, getNextId(), suiteName, true, 0);
> 			fNotRun.push(Boolean.valueOf(attributes.getValue(IXMLTags.ATTR_INCOMPLETE)));
> 			
> 		} else if (qName.equals(IXMLTags.NODE_PROPERTIES) || qName.equals(IXMLTags.NODE_PROPERTY)) {
>#P org.eclipse.jdt.ui.tests
>Index: ui/org/eclipse/jdt/junit/tests/AbstractTestRunSessionSerializationTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/AbstractTestRunSessionSerializationTests.java,v
>retrieving revision 1.1
>diff -u -r1.1 AbstractTestRunSessionSerializationTests.java
>--- ui/org/eclipse/jdt/junit/tests/AbstractTestRunSessionSerializationTests.java	19 Mar 2007 10:07:33 -0000	1.1
>+++ ui/org/eclipse/jdt/junit/tests/AbstractTestRunSessionSerializationTests.java	23 Aug 2007 10:48:43 -0000
>@@ -31,6 +31,8 @@
> import org.eclipse.swt.widgets.Display;
> 
> import org.eclipse.jdt.core.ICompilationUnit;
>+import org.eclipse.jdt.core.IJavaElement;
>+import org.eclipse.jdt.core.IMethod;
> import org.eclipse.jdt.core.IPackageFragment;
> import org.eclipse.jdt.core.IPackageFragmentRoot;
> import org.eclipse.jdt.core.IType;
>@@ -57,7 +59,7 @@
> 		String fSerialized;
> 	}
> 	
>-	private SerializationResult launchTest(IType typeToLaunch) throws Exception {
>+	private SerializationResult launchTest(IJavaElement elementToLaunch) throws Exception {
> 		final SerializationResult result= new SerializationResult();
> 
> 		TestRunListener testRunListener= new TestRunListener() {
>@@ -69,7 +71,7 @@
> 		
> 		JUnitCore.addTestRunListener(testRunListener); 
> 		try {
>-			new AbstractTestRunListenerTest().launchJUnit(typeToLaunch);
>+			new AbstractTestRunListenerTest().launchJUnit(elementToLaunch);
> 			assertTrue(new DisplayHelper(){
> 				protected boolean condition() {
> 					return result.fTestRunSession != null;
>@@ -86,7 +88,7 @@
> 		return result;
> 	}
> 
>-	private void runExportImport(IType test, String expectedXML) throws Exception {
>+	private void runExportImport(IJavaElement test, String expectedXML) throws Exception {
> 		SerializationResult serializationResult= launchTest(test);
> 		assertEqualXML(expectedXML, serializationResult.fSerialized);
> 		
>@@ -222,4 +224,19 @@
> 		JUnitModel.importTestRunSession(testFile); // no contents check for now...
> 	}
> 	
>+	protected void runMethodTest(String testType, String method) throws Exception {
>+		IPackageFragmentRoot root= JUnitWorkspaceTestSetup.getRoot();
>+		IPackageFragment pack= root.getPackageFragment("pack");
>+		ICompilationUnit cu= pack.getCompilationUnit(testType + ".java");
>+		IType testCase= cu.findPrimaryType();
>+		IMethod testMethod= testCase.getMethod(method, new String[0]);
>+		
>+		Path expectedPath= new Path(JUnitWorkspaceTestSetup.getProjectPath() + "xml/" + testType + "_" + method + ".xml");
>+		File expectedFile= JavaTestPlugin.getDefault().getFileInPlugin(expectedPath);
>+		String expected= getContents(new FileInputStream(expectedFile));
>+		runExportImport(testMethod, expected);
>+		
>+		//ant cannot run single test methods
>+	}
>+	
> }
>Index: ui/org/eclipse/jdt/junit/tests/TestRunSessionSerializationTests3.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/TestRunSessionSerializationTests3.java,v
>retrieving revision 1.1
>diff -u -r1.1 TestRunSessionSerializationTests3.java
>--- ui/org/eclipse/jdt/junit/tests/TestRunSessionSerializationTests3.java	19 Mar 2007 10:07:33 -0000	1.1
>+++ ui/org/eclipse/jdt/junit/tests/TestRunSessionSerializationTests3.java	23 Aug 2007 10:48:43 -0000
>@@ -37,6 +37,12 @@
> 		runCUTest(test);
> 	}
> 	
>+	public void testATestCase_testSucceed() throws Exception {
>+		String testType= "ATestCase";
>+		String method= "testSucceed";
>+		runMethodTest(testType, method);
>+	}
>+
> 	public void testATestSuite() throws Exception {
> 		String test= "ATestSuite";
> 		runCUTest(test);
>Index: ui/org/eclipse/jdt/junit/tests/AbstractTestRunListenerTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/AbstractTestRunListenerTest.java,v
>retrieving revision 1.2
>diff -u -r1.2 AbstractTestRunListenerTest.java
>--- ui/org/eclipse/jdt/junit/tests/AbstractTestRunListenerTest.java	13 Mar 2007 10:37:04 -0000	1.2
>+++ ui/org/eclipse/jdt/junit/tests/AbstractTestRunListenerTest.java	23 Aug 2007 10:48:43 -0000
>@@ -112,7 +112,7 @@
> 		return aTestCase;
> 	}
> 
>-	protected void launchJUnit(IType aTestCase) throws CoreException {
>+	protected void launchJUnit(IJavaElement aTest) throws CoreException {
> 		ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, null);
> 		
> 		ILaunchManager lm = DebugPlugin.getDefault().getLaunchManager();
>@@ -157,7 +157,7 @@
> 		};
> 		lm.addLaunchListener(launchesListener);
> 		
>-		ILaunchConfiguration configuration= TestJUnitLaunchShortcut.createConfiguration(aTestCase);
>+		ILaunchConfiguration configuration= TestJUnitLaunchShortcut.createConfiguration(aTest);
> 		try {
> 			configuration.launch(ILaunchManager.RUN_MODE, null);
> 			new DisplayHelper() {
>@@ -174,8 +174,8 @@
> 			fail("Launch has not terminated");
> 	}
> 	
>-	protected String[] launchJUnit(IType aTestCase, final TestRunLog log) throws CoreException {
>-		launchJUnit(aTestCase);
>+	protected String[] launchJUnit(IJavaElement aTest, final TestRunLog log) throws CoreException {
>+		launchJUnit(aTest);
> 		
> 		new DisplayHelper(){
> 			protected boolean condition() {
>Index: testresources/JUnitWorkspace/JUnitTests/xml/ATestCase_testSucceed.xml
>===================================================================
>RCS file: testresources/JUnitWorkspace/JUnitTests/xml/ATestCase_testSucceed.xml
>diff -N testresources/JUnitWorkspace/JUnitTests/xml/ATestCase_testSucceed.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ testresources/JUnitWorkspace/JUnitTests/xml/ATestCase_testSucceed.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,4 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<testrun name="ATestCase.testSucceed" project="JUnitTests" tests="1" started="1" failures="0" errors="0" ignored="0">
>+<testcase name="testSucceed" classname="pack.ATestCase"/>
>+</testrun>

Actions: View | Diff

Attachments on bug 195624: 73196 | 73197 | 76754