Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[cdt-patch] AutomatedIntegrationSuite JUnit suite
New test suite added to run all build, model, parser and failure JUnit tests and produce a report.
Please extract attached zip file in the base plugin directory (or ...\eclipse\workspace) 

Vmir


Index: .classpath
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui.tests/.classpath,v
retrieving revision 1.6
diff -u -r1.6 .classpath
--- .classpath	11 Apr 2003 18:42:56 -0000	1.6
+++ .classpath	23 May 2003 18:08:53 -0000
@@ -22,5 +22,6 @@
    <classpathentry kind="src" path="/org.junit"/>
    <classpathentry kind="src" path="/org.eclipse.update.core"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
+    <classpathentry kind="src" path="suite"/>
    <classpathentry kind="output" path="bin"/>
</classpath>
Index: model/org/eclipse/cdt/core/model/tests/CModelElementsTests.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/CModelElementsTests.java,v 
retrieving revision 1.8
diff -u -r1.8 CModelElementsTests.java
--- model/org/eclipse/cdt/core/model/tests/CModelElementsTests.java 1 May 2003 19:46:40 -0000 1.8 +++ model/org/eclipse/cdt/core/model/tests/CModelElementsTests.java 23 May 2003 18:08:53 -0000 
@@ -45,7 +45,6 @@
import org.eclipse.cdt.internal.core.model.TranslationUnit;
import org.eclipse.cdt.internal.core.model.VariableTemplate;
import org.eclipse.cdt.testplugin.CProjectHelper;
-import org.eclipse.cdt.testplugin.TestPluginLauncher;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
@@ -59,10 +58,6 @@
	private IFile headerFile;
	private NullProgressMonitor monitor;

-	public static void main(String[] args) {
- TestPluginLauncher.run(TestPluginLauncher.getLocationFromProperties(), WorkingCopyTests.class, args); 
-	}
-
	public static Test suite() {
		TestSuite suite= new TestSuite();
		suite.addTest(new CModelElementsTests("testCModelElements"));
@@ -123,7 +118,7 @@
		ArrayList tuPackages = tu.getChildrenOfType(ICElement.C_NAMESPACE);
		INamespace namespace = (INamespace) tuPackages.get(0);
		assertEquals(namespace.getElementName(), new String("MyPackage"));
-		checkLineNumbers((CElement)namespace, 8, 121);
+		checkLineNumbers((CElement)namespace, 8, 130);
		checkClass(namespace);

		checkEnums(namespace);
@@ -470,8 +465,9 @@

	}
private void checkLineNumbers(CElement element, int startLine, int endLine){ 
-//		assertEquals(element.getStartLine(), startLine);
-//		assertEquals(element.getEndLine(), endLine);
+// Remove comments when testBug36379() is fixed
+//		assertEquals(startLine, element.getStartLine());
+//		assertEquals(endLine, element.getEndLine());
	}

}
Index: model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java,v 
retrieving revision 1.4
diff -u -r1.4 ElementDeltaTests.java
--- model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java 21 Apr 2003 20:02:57 -0000 1.4 +++ model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java 23 May 2003 18:08:53 -0000 
@@ -91,7 +91,7 @@
		CModelManager.getDefault().addElementChangedListener(this);
		addedElements = new Vector(10);
		removedElements = new Vector(10);
-		changedElements = new Vector(100);
+		changedElements = new Vector(20);
		CCorePlugin.getDefault().setUseNewParser(true);
	}
private static void addNatureToProject(IProject proj, String natureId, IProgressMonitor monitor) throws CoreException { 
@@ -122,79 +122,116 @@
		wcBuf.setContents ("\n class Hello{ \n};");
		wc.reconcile();
		wc.commit(true, monitor);
+		assertChangedElement(ICElement.C_MODEL, "");
+		assertChangedElement(ICElement.C_PROJECT, "TestProject1");
+		assertChangedElement(ICElement.C_UNIT, "WorkingCopyTest.h");
		assertAddedElement(ICElement.C_CLASS, "Hello");
+		assertRemovedElement(ICElement.C_INCLUDE, "stdio.h");
+		assertEmptyDelta();

		// add the field x
		wcBuf.setContents ("\n class Hello{\n int x; \n};");
		wc.reconcile();
		wc.commit(true, monitor);
+		assertChangedElement(ICElement.C_MODEL, "");
+		assertChangedElement(ICElement.C_PROJECT, "TestProject1");
+		assertChangedElement(ICElement.C_UNIT, "WorkingCopyTest.h");
+		assertChangedElement(ICElement.C_CLASS, "Hello");
		assertAddedElement(ICElement.C_FIELD, "x");
+		assertEmptyDelta();

		// add the method setValue
wcBuf.setContents ("\n class Hello{\n int x; \n void setValue(int val); \n};"); 
		wc.reconcile();
		wc.commit(true, monitor);
+		assertChangedElement(ICElement.C_MODEL, "");
+		assertChangedElement(ICElement.C_PROJECT, "TestProject1");
+		assertChangedElement(ICElement.C_UNIT, "WorkingCopyTest.h");
+		assertChangedElement(ICElement.C_CLASS, "Hello");
		assertAddedElement(ICElement.C_METHOD_DECLARATION, "setValue");
+		assertEmptyDelta();

		// rename x to y
		// this is not a change, this is add and remove
wcBuf.setContents ("\n class Hello{\n int y; \n void setValue(int val); \n};"); 
		wc.reconcile();
		wc.commit(true, monitor);
+		assertChangedElement(ICElement.C_MODEL, "");
+		assertChangedElement(ICElement.C_PROJECT, "TestProject1");
+		assertChangedElement(ICElement.C_UNIT, "WorkingCopyTest.h");
+		assertChangedElement(ICElement.C_CLASS, "Hello");
		assertAddedElement(ICElement.C_FIELD, "y");
		assertRemovedElement(ICElement.C_FIELD, "x");
+		assertEmptyDelta();

		// remove the method
		wcBuf.setContents ("\n class Hello{\n String y; \n};");
		wc.reconcile();
		wc.commit(true, monitor);
+		assertChangedElement(ICElement.C_MODEL, "");
+		assertChangedElement(ICElement.C_PROJECT, "TestProject1");
+		assertChangedElement(ICElement.C_UNIT, "WorkingCopyTest.h");
+		assertChangedElement(ICElement.C_CLASS, "Hello");
+		assertChangedElement(ICElement.C_FIELD, "y");
		assertRemovedElement(ICElement.C_METHOD_DECLARATION, "setValue");
+		assertEmptyDelta();

		// remove the field
		wcBuf.setContents ("\n class Hello{ \n};");
		wc.reconcile();
		wc.commit(true, monitor);
+		assertChangedElement(ICElement.C_MODEL, "");
+		assertChangedElement(ICElement.C_PROJECT, "TestProject1");
+		assertChangedElement(ICElement.C_UNIT, "WorkingCopyTest.h");
+		assertChangedElement(ICElement.C_CLASS, "Hello");
		assertRemovedElement(ICElement.C_FIELD, "y");
+		assertEmptyDelta();

		// remove the class
		wcBuf.setContents ("");
		wc.reconcile();
		wc.commit(true, monitor);
+		assertChangedElement(ICElement.C_MODEL, "");
+		assertChangedElement(ICElement.C_PROJECT, "TestProject1");
+		assertChangedElement(ICElement.C_UNIT, "WorkingCopyTest.h");
		assertRemovedElement(ICElement.C_CLASS, "Hello");
+		assertEmptyDelta();

		wc.destroy();
		assertFalse(wc.exists());
	}

	public void assertAddedElement(int elementType, String elementName){
-		System.out.println("Printing Added List: ");
		if(!isElementInList(elementType, elementName, addedElements))
			fail("Element NOT found in Added list");
	}
	public void assertRemovedElement(int elementType, String elementName){
-		System.out.println("Printing Removed List: ");
		if(!isElementInList(elementType, elementName, removedElements))
			fail("Element NOT found in Removed list");
	}
	public void assertChangedElement(int elementType, String elementName){
-		System.out.println("Printing Changed List: ");
		if(!isElementInList(elementType, elementName, changedElements))
			fail("Element NOT found in Changed list");
	}
+	public void assertEmptyDelta() {
+		assertTrue(addedElements.isEmpty());
+		assertTrue(removedElements.isEmpty());
+		assertTrue(changedElements.isEmpty());
+	}
public boolean isElementInList(int elementType, String elementName, Vector elementList) { 
		boolean found = false;
		Iterator i = elementList.iterator();
		while( i.hasNext()){
			ICElement element = (ICElement)i.next();
-
-			System.out.print("ElementName " + element.getElementName());
-			System.out.println("  ElementType " + element.getElementType());

			if ((element.getElementName().equals(elementName)) &&
				(element.getElementType() == elementType)){
					// return true;
					// just to print the whole list
					found = true;
+					// Remove the element
+					elementList.remove(element);
+					break;
				}
		}
		//return false;
@@ -218,37 +255,25 @@
		int flags= delta.getFlags();
		ICElement element= delta.getElement();

-		System.out.print("Processing " + element);
		// handle open and closing of a solution or project
		if ((flags & ICElementDelta.F_CLOSED) != 0) {
-			System.out.println("  Element Closed");
		}
		if ((flags & ICElementDelta.F_OPENED) != 0) {
-			System.out.println("  Element Opened");
		}
-
		if (kind == ICElementDelta.REMOVED) {
-			System.out.println("  Element Removed");
			removedElements.add(element);
		}
-
		if (kind == ICElementDelta.ADDED) {
-			System.out.println("  Element Added");
			addedElements.add(element);
		}
-
		if (kind == ICElementDelta.CHANGED) {
-			System.out.println("  Element Changed");
			changedElements.add(element);

			if (flags == ICElementDelta.F_MODIFIERS)	{
-				System.out.println("  Modifiers changed");
			}
			if (flags == ICElementDelta.F_CONTENT)	{
-				System.out.println("  Contents changed");
			}
			if (flags == ICElementDelta.F_CHILDREN)	{
-				System.out.println("  Children changed");
			}
		}

@@ -257,5 +282,5 @@
			processDelta(affectedChildren[i]);
		}
	}
-
+
}
Index: model/org/eclipse/cdt/core/model/tests/TranslationUnitTests.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitTests.java,v 
retrieving revision 1.5
diff -u -r1.5 TranslationUnitTests.java
--- model/org/eclipse/cdt/core/model/tests/TranslationUnitTests.java 9 Apr 2003 21:12:09 -0000 1.5 +++ model/org/eclipse/cdt/core/model/tests/TranslationUnitTests.java 23 May 2003 18:08:53 -0000 
@@ -269,6 +269,7 @@
    /***
     * Simple sanity tests for the getInclude call
     */
+/* Reintroduce this test when Bug# 23478 is fixed
    public void testGetInclude() {
        IInclude myInclude;
        int x;
@@ -285,9 +286,11 @@


    }
+*/
    /***
     * Simple sanity tests for the getIncludes call
     */
+/* Reintroduce this test when Bug# 23478 is fixed
    public void testGetIncludes() throws CModelException {
        IInclude myIncludes[];
        String includes[]={"stdio.h", "unistd.h"};
@@ -302,8 +305,6 @@
        }
        assertTrue(myExp.getMissingString(), myExp.gotAll());
        assertTrue(myExp.getExtraString(), !myExp.gotExtra());
-
-
    }
-
+*/
}

_________________________________________________________________
Tired of spam? Get advanced junk mail protection with MSN 8. http://join.msn.com/?page=features/junkmail

Attachment: tests added.zip
Description: Zip compressed data

Back to the top