diff --git a/core/org.eclipse.cdt.core.tests/ChangeLog b/core/org.eclipse.cdt.core.tests/ChangeLog
index 6090eab6a23..b4220331c66 100644
--- a/core/org.eclipse.cdt.core.tests/ChangeLog
+++ b/core/org.eclipse.cdt.core.tests/ChangeLog
@@ -1,617 +1,622 @@
-2003-07-02 Victor Mozgin
-	Added DOMTests::testBug39501().
-	Improved filtering of expected failures/inconclusives in TortureTest.
-
-2003-06-30 John Camelon
-	Added DOMTests::testAssignmentExpression()
-	Added PreprocessorConditionalTest to ParserTestSuite.  
-
-2003-06-28 John Camelon
-	Completed Quickparse expression representation.  
-	Updated ExpressionEvaluation and associated tests.  
-
-2003-06-26 John Camelon
-	Update IASTExpression. 
-	Move Parser.Backtrack and Parser.EndOfFile to external interface. 
-
-2003-06-25 John Camelon
-	Added DOMFailedTest::testBug39349(). 
-	Added DOMTests::testBug39348().
-
-2003-06-25 John Camelon
-	Create new interface and support for calculating lineNumber/offset mapping.  
-	Updated IASTClassSpecifier for qualified name query.  
-	Began structuring expressions and declarators in Parser for ISourceElementRequestor.  
-	Updated other packages to use new interfaces.  
-	Updated automatedtests/torture test to use new line number information.  
-
-2003-06-24 John Camelon
-	Updates for ISourceElementRequestor - elaborated types & enumerations.  
-
-2003-06-23 John Camelon
-	Factory/constructor signature updates.  
-
-2003-06-17 Victor Mozgin
-	Added MacroTests.java (invocation in AllCoreTests).
-	Added MacroTests.c to resources.
-
-2003-06-17 Sean Evoy
-	Moved the ManagedBuildInfo extension point from the plugin file in org.eclipse.cdt.ui.tests
-	Added new options to sub target for include paths and preprocessor symbols
-	Added test for IManagedBuildPathInfo
-	* build/org/eclipse/cdt/core/build/managed/tests/AllBuildTests.java
-	
-2003-06-17 Brent Nicolle
-	Added Interface tests of IStructure.java.
-
-2003-06-17 Victor Mozgin
-	Added DeclaratorsTests.java (invocation in AllCoreTests).
-	Added DeclaratorsTests.cpp to org.eclipse.cdt.core.model.tests.resources.
-
-2003-06-16 Victor Mozgin
-	Added testOldKRFunctionDeclarations() to DOMTests.
-	Added testKRFunctionDeclarations() to TranslationUnitTests.
-
-2003-06-16 Vladimir Hirsl
-	Added /build, /parser, /failures and /suite directories to the library. 
-	Copied resources from /model/org.eclipse.cdt.core.model.tests.resources
-	                 to /model/org/clipse/cdt/core/model/tests/resources/cmodel.
-	Added class AISResultPrinter to format test results.  
-	Class AutomatedIntegrationSuite now implements IPlatformRunnable.
-
-2003-06-14 Victor Mozgin
-	Moved testBugSingleton192() from LokiFailures to DOMTests.
-	Added testPointersToMembers() and testPointersToMemberFunctions() to DOMTests.
-	Added testBug36290() and testBug36931() to DOMTests.
-
-2003-06-13 John Camelon
-	Added Class/Base infrastructure to public interfaces & requestor callback. 
-	Moved many internal interfaces to external packages. 
-	Organized imports.  
-
-2003-06-13 Victor Mozgin
-	Renamed NullParserCallback into NullSourceElementRequester in AutomatedFramework.
-
-2003-06-13 John Camelon
-	Merged ParserSymbolTable branch back into HEAD.
-
-2003-06-12 John Camelon
-	Get rest of JUnit tests working, will merge back to HEAD branch.  
-
-2003-06-12 John Camelon
-	Introduction of ASTFactory strategy, some restructuring of packages and interfaces.
-	
-2003-06-11 Victor Mozgin
-	Old Java TestCase.txt and TestCase2.txt for partioning testing have been replaced with C/C++ files.
-	Modified AutomatedIntegrationSuite.java so it doesn't produce JUnit warning anymore.
-	All tests in org.eclipse.cdt.ui.tests should pass now.
-
-3003-06-11 Peter Graves
-    Update the test.xml to get the location of org.eclipse.test from a property
-    if set. If the property is not set, it will default to the old value.
-    
-2003-06-11 Victor Mozgin
-	Added TortureTest to test CDT C++ parser with GCC testsuites.
-	GCC testsuites are not included.
-
-2003-06-10 John Camelon
-	Futher pursuit of the golden hammer, symbol table integration. 
-
-2003-06-10 Brent Nicolle
-	Added some Interface tests of (IInclude, IMacro, IStructure).
-	Made sure all the Test Suites have names in the JUnit hierarchy.
-
-2003-06-09 John Camelon
-	First step in replacing IParserCallback with ISourceElementRequestor.  
-	
-2003-06-09 Victor Mozgin
-	Moved testBug36769() from ACEFailedTest.java to DOMTests.java.
-	Removed ACEFailedTest.java as it is empty now.
-	Added DOMTests.testBug36769B(). 
-
-2003-06-09 Victor Mozgin
-	Moved testBug36932() from DOMFailedTest.java to DOMTests.java.
-	Added DOMTests.testBug36932B() and DOMTests.testBug36932C(). 
-
-2003-06-09 Victor Mozgin
-	Moved testBug36701() from ScannerFailedTests.java to ScannerTestCase.java.
-	Renamed it to testBug36701A() and fixed it.
-	Added ScannerTestCase.testBug36701B().
-
-2003-06-07 Victor Mozgin
-	Moved testBug36766A(), testBug36766B() & testBug36766C() from STLFailedTests.java to DOMTests.java.
-	Renamed them to testBug36766and36769x(), as they cover both PRs.
-	Added testBug36766and36769D() - test for templated destructor.
-
-2003-06-05 John Camelon
-	Moved testBug23478A() & testBug23478B() from failed tests to TranslationUnitTests.java.
-	Removed TranslationUnitFailedTests.java as it was empty. 
-
-2003-05-29 Andrew Niefer
-	Modified tests to support eType & PtrOp changes in core
-	Added ParserSymbolTableTest::testTemplateParameterAsParent
-	Added ParserSymbolTableTest::testTemplateInstanceAsParent
-	Added ParserSymbolTableTest::testTemplateParameterDefaults
-	Added ParserSymbolTableTest::testTemplateParameterAsFunctionArgument
-	started ParserSymbolTableTest::incompletetestTemplateSpecialization
-
-2003-05-26 John Camelon
-	Rollback PST/Parser integration.
-
-2003-05-13 Andrew Niefer	
-	Modified ParserSymbolTableTest to use new interface
-
-2003-05-08 Andrew Niefer
-	Added ParserSymbolTableTest::testMarkRollback
-
-2003-05-06 John Camelon
-	Further integration of SymbolTable into Parser, some refactoring. 
-
-2003-05-05 John Camelon/Andrew Niefer
-	Added CrossReferenceTests to ParserTestSuite to test symbol-table/DOM interworking.
-
-2003-05-05 Andrew Niefer
-	Rewrote ParserSymbolTableTest to reflect structural changes to the symbol table.
-
-2003-05-01 Andrew Niefer
-	Updated FractionalAutomatedTest to use threads
-	Modified ScannerTestCase::testBug36287
-	Added ScannerTestCase::testBug37011
-	Added ScannerTestCase::testOtherPreprocessorDefines
-
-2003-04-28 John Camelon
-	Moved testBug36730() & testBug37019() from DOMFailedTests to DOMTests.
-
-2003-04-28 Andrew Niefer
-	Added DOMFailedTest::testBug37019
-	Added DOMFailedTest::testBug36932
-	Added ScannerFailedTest::testBug37011
-
-2003-04-28 John Camelon
-	Added DOMTests::testOrder().  
-
-2003-04-28 Peter Graves
-	* model/org/eclipse/cdt/core/model/tests/BinaryTests:
-	Updated to remove a few small errors, and deal with some changes
-	to the core CDT
-	 
-2003-04-27 John Camelon
-	Added testBug36932() to DOMTests. 
-	Moved testBugFunctor758() from LokiFailures to DOMTests.
-	Moved testBug36704() from DOMFailedTest to DOMTests.  
-	Moved testBug36699() from DOMFailedTest to DOMTests.  
-	Moved testBug36691() from DOMFailedTest to DOMTests.  
-
-2003-04-25 Andrew Niefer
-	Moved ACEFailedTest::testBug36771 to DOMTests
-	Moved DOMFailedTest::testBug36714 to DOMTests
-	Updated ScannerTestCase::testBug36816
-	
-2003-04-25 John Camelon
-	Added DOMTests::testBug36852(). 
-	Added DOMTests::testBug36764().
-	Moved DOMFailedTests::testBug36702() to DOMTests(). 
-
-2003-04-24 John Camelon
-	Moved fixed tests from FailedTests to DOMTests. 
-	Added DOMTests::testBug36799().
-	Cleaned up tests to reduce amount of code necessary to maintain these things. 
-
-2003-04-24 John Camelon
-	Moved fixed tests from FailedTests to DOMTests. 
-	Added LokiFailures.java to failed tests directory.
-
-2003-04-24 Andrew Niefer
-	Added AutomatedFramework.java
-	Added FractionalAutomatedTest (which derives from AutomatedFramework)
-	Refactored AutomatedTest to derive from AutomatdFramework
-	Added ScannerTestCase.testBug36816
-	Added ScannerTestCase.testBug36255	
-
-2003-04-24 John Camelon
-	Fixed Java 1.3 compliance issue w/AutomatedTest.java
-	Fixed False failure in HelloWorld.java.  
-
-2003-04-21 John Camelon
-	Updated DOMTests::testBug36247(). 
-	Moved testBug36692(), testBug36703(), testBug36708(), testBug36707(), testBug36689()
-	and testBug36690() from DOMFailedTests to DOMTests and updated them. 
-
-2003-04-20 John Camelon
-	Added DOMTests::testBug36551().
-	Adjusted AutomatedTest to turn on line numbering. 
-	Added DOMFailedTests and 11 failed test cases.  
-
-2003-04-17 Andrew Niefer
-	Added ScannerTestCase::testBug36695()
-	Moved ScannerFailedTest::testBug36521 to ScannerTestCase::testBug36521()
-	Moved ScannerFailedTest::testBug36509 to ScannerTestCase::testBug36509()
-	Moved ScannerFailedTest::testBug36475 to ScannerTestCase::testBug36475() 
-	Updated ScannerTestCase::testBug36047
-	Updated ScannerTestCase::testBug36045
-
-2003-04-17 John Camelon
-	Updated DOMTests::testBug36600().
-	Updated LineNumberTest::testDOMLineNos().  
-	Added DOMTests::testBug36559().  
-
-2003-04-17 Andrew Niefer
-	Added AutomatedTest
-	Added resources.cFiles
-	Added resources.cppFiles
-
-2003-04-16 John Camelon
-	Added DOMTests::testBug36532().
-	Added DOMTests::testBug36432(). 
-	Added DOMTests::testBug36594().
-	Added DOMTests::testBug36600(). 
-	Added DOMTests::testArrayOfPointerToFunctions(). 
-
-2003-04-15 John Camelon
-	Added ScannerTestCase::testBug36434().
-	Added ScannerTestCase::testMultipleLines(). 
-	Added ParserTestSuite. 
-	Added LineNumberTest.
-	Updated CModelElementsTests to set the Nature of the C++ project appropriately.
-
-2003-04-15 Andrew Niefer
-	Moved ScannerFailedTest::testBug36047 to ScannerTestCase::testBug36047
-	Added ScannerFailedTest::testBug36475
-
-2003-04-13 John Camelon
-	Added DOMTests::testPointersToFunctions.  
-
-2003-04-11 John Camelon
-	Added DOMTests::testBug36247().  
-
-2003-04-11 Andrew Niefer
-	Moved ScannerFailedTest::testBug36316 to ScannerTestCase::testBug36316
-	Added ScannerFailedTest::testBug36047
-	Added ScannerTestCase::testNestedRecursiveDefines
-
-2003-04-10 John Camelon
-	Added DOMTests::testBug36237().
-
-2003-04-09 John Camelon
-	Removed all the old Code Model Builder source that was no longer being used (NewModelBuilder.java, etc.). 
-	Moved all the files in parser.util directory to the dom.  
-	Organized imports. 
-	Added DOMTests::testTemplateDeclarationOfMethod().
-	Added DOMTests::testBug36250().  
-	Added DOMTests::testBug36240(). 
-	Added DOMTests::testBug36254().
-
-2003-04-09 John Camelon
-	Updated ScannerTest::testBug36045().
-	Added ScannerTest::testBug36287().
-	Added DOMTests::testBug36288(). 
-
-2003-04-06 Andrew Niefer
-	Added ParserSymbolTableTest::testOverloadRanking()
-
-2003-04-04 Alain Magloire
-	* src/org/eclipse/cdt/testplugin/util/VerifyDialog.java:
-	Remove some warnings.
-
-2003-04-03 John Camelon
-	Updated ScannerTest::testSimpleIfdef() for bug36019.  
-	Updated ScannerTest::testNumerics() for bug36020.  
-	Added ScannerTest::testBug36045().  
-	Updated DOMTests::testTemplateDeclaration() for template grammar updates.  
-
-2003-04-01 Andrew Niefer
-	ParserSymbolTableTest. modifications to using declaration tests to reflect changes in the
-	symbol table.  Also added testUserDefinedConversionSequences()
-
-2003-04-01 John Camelon
-	Added testBug35906() to DOMTests.
-
-2003-03-31 John Camelon
-	Added testStruct() to DOMTests.  
-	Added test35892()to ScannerTest. 
-
-2003-03-31 Andrew Niefer
-	In ParserSymbolTableTest, renamed testFunctionResolution_2() to testFunctionResolution_PointersAndBaseClasses(),
-	and modified to reflect changes in function resolution.  
-	Added testFunctionResolution_TypedefsAndPointers().
-	
-2003-03-31 John Camelon
-	Added testWeirdStrings() and testNumerics() to ScannerTestCase. 
-	Added testTemplateSpecialization(), testTemplateDeclaration(), testBug26467(), 
-	  testTypedef() and testTemplateInstantiation() to DOMTests.
-
-2003-03-28 John Camelon
-	Added testConstructorChain() and testASMDefinition() to DOMTests.
-
-2003-03-27 Alain Magloire
-	Changes were done in the Core Model API, the hierarchy is now
-	ICModel
-		ICProject
-			ICContainer
-				ITranslationUnit
-				IArchive
-				IBinary
-	We adjust the tests.
-	* model/org/eclipse/cdt/core/model/tests/ArchiveTests.java
-	* model/org/eclipse/cdt/core/model/tests/BinaryTests.java
-	* model/org/eclipse/cdt/core/model/tests/TranslationUniTests.java
-	* model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java
-
-2003-03-26 Andrew Niefer
-	In ParserSymbolTableTest : 
-		updated all tests to reflect TypeInfo changes
-		Added testFunctionResolution() & testFunctionResolution_2() in
-
-2003-03-25 John Camelon
-	Added testDeclSpecifier(), testNamespaceDefinition(), testLinkageSpecification(), 
-	testUsingClauses() and testEnumSpecifier() to DOMTests.
-
-2003-03-23 John Camelon
-	Added ptrOperator() test to DOMTests.  
-	Added testFunctionModifiers() test to DOMTests.
-	Added testArrays() test to DOMTests.
-
-2003-03-20 Alain Magloire
-
-	Patch from Amer Hoda, tests for the CElement deltas for Translation Units.
-	* model/org/eclipse/cdt/core/model/tests/ElementDeltaTest.java
-	* model/org/eclipse/cdt/core/model/tests/resource/WorkingCopyTestStart.h
-	
-2003-03-19 Alain Magloire
-	Patch from Amer Hoda, introducing a simple test for the core model.
-	* model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java
-	* model/org/eclipse/cdt/core/model/tests/resource/WorkingCopyTestStart.h
-
-2003-03-18 John Camelon
-	Updated DOMTests to validate simple case of a function declaration with multiple parameters.  
-	* parser/org/eclipse/cdt/core/parser/tests/DOMTests.java
-
-2003-03-11 John Camelon
-	Updated DOMTests for core.internal.parser change of merging DeclarationSpecifier and DeclSpecifier
-	Organized imports
-	* parser/org/eclipse/cdt/core/parser/tests/DOMTests.java
-	* parser/org/eclipse/cdt/core/parser/tests/ParserSymbolTableTest.java
-
-2003-03-10 John Camelon
-	Added macro pasting tests
-
-2003-03-06 Andrew Niefer
-	Added tests for exercising Namespaces & using directives in new parser's symbol table
-
-2003-03-04 Doug Schaefer
-	This is a pretty big patch, but it is the merge of the NewParser1 branch into the HEAD branch.  lder "parser") 
-	JUnit tests for testing various pieces (source folder "parser" in cdt.ui.tests. 
-
-2003-01-29 Peter Graves
-
-    Fixed the warnings when accessing static methods
-    * src/org/eclipse/cdt/testplugin/util/DialogCheck.java:
-    * src/org/eclipse/cdt/testplugin/CTestPlugin.java
-    * src/org/eclipse/cdt/testplugin/TestWorkbench.java
-    * ChangeLog: make all entries have the same formatting
-
-2002-12-17 Peter Graves
-
-    * plugin.xml,test.xml: Some simple cleanups to remove refrences to the jdt and
-	to move closer to automated running
-    
-2002-11-27 Alain Magloire
-
-	* model/org/eclipse/cdt/core/model/tests/CModelTests.java:
-	Use CoreModel.getDefault().
-
-2002-10-30 Alain Magloire
-
-	* model/org/eclipse/cdt/core/model/tests/CModelTests.java (testGetNatureID):
-	The fields and the methods use in this test was removed from the CoreModel class.
-	(testHasNature): The method use in this case was refactor in the classes
-	CProjectNature and CCProjectNature, fix the test.
-
-2002-10-18 Peter Graves
-
-	src/org/eclipse/cdt/testplugin/CProjectHelper.jada
-    Cleanup of the CProjectHelper file to remove unused imports, commeted out code etc.
-    
-=======
-2003-04-21 Andrew Niefer
-	Added DOMFailedTests::testBug36713()
-	Added DOMFailedTests::testBug36714()
-	Added DOMFailedTests::testBug36717()
-	Added DOMFailedTests::testBug36730()
-
-2003-04-21 Andrew Niefer
-	Added ScannerTestCase::testBug36695()
-	Moved ScannerFailedTest::testBug36521 to ScannerTestCase::testBug36521()
-	Moved ScannerFailedTest::testBug36509 to ScannerTestCase::testBug36509()
-	Moved ScannerFailedTest::testBug36475 to ScannerTestCase::testBug36475() 
-	Updated ScannerTestCase::testBug36047
-	Updated ScannerTestCase::testBug36045
-
-2003-04-20 John Camelon
-	Added DOMTests::testBug36551().
-	Adjusted AutomatedTest to turn on line numbering. 
-	Added DOMFailedTests and 11 failed test cases.  
-
-2003-04-17 John Camelon
-	Updated DOMTests::testBug36600().
-	Updated LineNumberTest::testDOMLineNos().  
-	Added DOMTests::testBug36559().  
-
-2003-04-17 Andrew Niefer
-	Added AutomatedTest
-	Added resources.cFiles
-	Added resources.cppFiles
-
-2003-04-16 John Camelon
-	Added DOMTests::testBug36532().
-	Added DOMTests::testBug36432(). 
-	Added DOMTests::testBug36594().
-	Added DOMTests::testBug36600(). 
-	Added DOMTests::testArrayOfPointerToFunctions(). 
-
-2003-04-15 John Camelon
-	Added ScannerTestCase::testBug36434().
-	Added ScannerTestCase::testMultipleLines(). 
-	Added ParserTestSuite. 
-	Added LineNumberTest.
-	Updated CModelElementsTests to set the Nature of the C++ project appropriately.
-
-2003-04-15 Andrew Niefer
-	Moved ScannerFailedTest::testBug36047 to ScannerTestCase::testBug36047
-	Added ScannerFailedTest::testBug36475
-
-2003-04-13 John Camelon
-	Added DOMTests::testPointersToFunctions.  
-
-2003-04-11 John Camelon
-	Added DOMTests::testBug36247().  
-
-2003-04-11 Andrew Niefer
-	Moved ScannerFailedTest::testBug36316 to ScannerTestCase::testBug36316
-	Added ScannerFailedTest::testBug36047
-	Added ScannerTestCase::testNestedRecursiveDefines
-
-2003-04-10 John Camelon
-	Added DOMTests::testBug36237().
-
-2003-04-09 John Camelon
-	Removed all the old Code Model Builder source that was no longer being used (NewModelBuilder.java, etc.). 
-	Moved all the files in parser.util directory to the dom.  
-	Organized imports. 
-	Added DOMTests::testTemplateDeclarationOfMethod().
-	Added DOMTests::testBug36250().  
-	Added DOMTests::testBug36240(). 
-	Added DOMTests::testBug36254().
-
-2003-04-09 John Camelon
-	Updated ScannerTest::testBug36045().
-	Added ScannerTest::testBug36287().
-	Added DOMTests::testBug36288(). 
-
-2003-04-06 Andrew Niefer
-	Added ParserSymbolTableTest::testOverloadRanking()
-
-2003-04-04 Alain Magloire
-	* src/org/eclipse/cdt/testplugin/util/VerifyDialog.java:
-	Remove some warnings.
-
-2003-04-03 John Camelon
-	Updated ScannerTest::testSimpleIfdef() for bug36019.  
-	Updated ScannerTest::testNumerics() for bug36020.  
-	Added ScannerTest::testBug36045().  
-	Updated DOMTests::testTemplateDeclaration() for template grammar updates.  
-
-2003-04-01 Andrew Niefer
-	ParserSymbolTableTest. modifications to using declaration tests to reflect changes in the
-	symbol table.  Also added testUserDefinedConversionSequences()
-
-2003-04-01 John Camelon
-	Added testBug35906() to DOMTests.
-
-2003-03-31 John Camelon
-	Added testStruct() to DOMTests.  
-	Added test35892()to ScannerTest. 
-
-2003-03-31 Andrew Niefer
-	In ParserSymbolTableTest, renamed testFunctionResolution_2() to testFunctionResolution_PointersAndBaseClasses(),
-	and modified to reflect changes in function resolution.  
-	Added testFunctionResolution_TypedefsAndPointers().
-	
-2003-03-31 John Camelon
-	Added testWeirdStrings() and testNumerics() to ScannerTestCase. 
-	Added testTemplateSpecialization(), testTemplateDeclaration(), testBug26467(), 
-	  testTypedef() and testTemplateInstantiation() to DOMTests.
-
-2003-03-28 John Camelon
-	Added testConstructorChain() and testASMDefinition() to DOMTests.
-
-2003-03-27 Alain Magloire
-	Changes were done in the Core Model API, the hierarchy is now
-	ICModel
-		ICProject
-			ICContainer
-				ITranslationUnit
-				IArchive
-				IBinary
-	We adjust the tests.
-	* model/org/eclipse/cdt/core/model/tests/ArchiveTests.java
-	* model/org/eclipse/cdt/core/model/tests/BinaryTests.java
-	* model/org/eclipse/cdt/core/model/tests/TranslationUniTests.java
-	* model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java
-
-2003-03-26 Andrew Niefer
-	In ParserSymbolTableTest : 
-		updated all tests to reflect TypeInfo changes
-		Added testFunctionResolution() & testFunctionResolution_2() in
-
-2003-03-25 John Camelon
-	Added testDeclSpecifier(), testNamespaceDefinition(), testLinkageSpecification(), 
-	testUsingClauses() and testEnumSpecifier() to DOMTests.
-
-2003-03-23 John Camelon
-	Added ptrOperator() test to DOMTests.  
-	Added testFunctionModifiers() test to DOMTests.
-	Added testArrays() test to DOMTests.
-
-2003-03-20 Alain Magloire
-
-	Patch from Amer Hoda, tests for the CElement deltas for Translation Units.
-	* model/org/eclipse/cdt/core/model/tests/ElementDeltaTest.java
-	* model/org/eclipse/cdt/core/model/tests/resource/WorkingCopyTestStart.h
-	
-2003-03-19 Alain Magloire
-	Patch from Amer Hoda, introducing a simple test for the core model.
-	* model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java
-	* model/org/eclipse/cdt/core/model/tests/resource/WorkingCopyTestStart.h
-
-2003-03-18 John Camelon
-	Updated DOMTests to validate simple case of a function declaration with multiple parameters.  
-	* parser/org/eclipse/cdt/core/parser/tests/DOMTests.java
-
-2003-03-11 John Camelon
-	Updated DOMTests for core.internal.parser change of merging DeclarationSpecifier and DeclSpecifier
-	Organized imports
-	* parser/org/eclipse/cdt/core/parser/tests/DOMTests.java
-	* parser/org/eclipse/cdt/core/parser/tests/ParserSymbolTableTest.java
-
-2003-03-10 John Camelon
-	Added macro pasting tests
-
-2003-03-06 Andrew Niefer
-	Added tests for exercising Namespaces & using directives in new parser's symbol table
-
-2003-03-04 Doug Schaefer
-	This is a pretty big patch, but it is the merge of the NewParser1 branch into the HEAD branch.  lder "parser") 
-	JUnit tests for testing various pieces (source folder "parser" in cdt.ui.tests. 
-
-2003-01-29 Peter Graves
-
-    Fixed the warnings when accessing static methods
-    * src/org/eclipse/cdt/testplugin/util/DialogCheck.java:
-    * src/org/eclipse/cdt/testplugin/CTestPlugin.java
-    * src/org/eclipse/cdt/testplugin/TestWorkbench.java
-    * ChangeLog: make all entries have the same formatting
-
-2002-12-17 Peter Graves
-
-    * plugin.xml,test.xml: Some simple cleanups to remove refrences to the jdt and
-	to move closer to automated running
-    
-2002-11-27 Alain Magloire
-
-	* model/org/eclipse/cdt/core/model/tests/CModelTests.java:
-	Use CoreModel.getDefault().
-
-2002-10-30 Alain Magloire
-
-	* model/org/eclipse/cdt/core/model/tests/CModelTests.java (testGetNatureID):
-	The fields and the methods use in this test was removed from the CoreModel class.
-	(testHasNature): The method use in this case was refactor in the classes
-	CProjectNature and CCProjectNature, fix the test.
-
-2002-10-18 Peter Graves
-
-	src/org/eclipse/cdt/testplugin/CProjectHelper.jada
-    Cleanup of the CProjectHelper file to remove unused imports, commeted out code etc.
-    
->>>>>>> 1.36
+2003-07-03 Bogdan Gheorghe
+	Added IndexManagerTest::testAddNewFileToIndex()
+	Added IndexManagerTest::testRemoveProjectFromIndex()
+	Added IndexManagerTest::testRemoveFileFromIndex()
+	
+2003-07-02 Victor Mozgin
+	Added DOMTests::testBug39501().
+	Improved filtering of expected failures/inconclusives in TortureTest.
+
+2003-06-30 John Camelon
+	Added DOMTests::testAssignmentExpression()
+	Added PreprocessorConditionalTest to ParserTestSuite.  
+
+2003-06-28 John Camelon
+	Completed Quickparse expression representation.  
+	Updated ExpressionEvaluation and associated tests.  
+
+2003-06-26 John Camelon
+	Update IASTExpression. 
+	Move Parser.Backtrack and Parser.EndOfFile to external interface. 
+
+2003-06-25 John Camelon
+	Added DOMFailedTest::testBug39349(). 
+	Added DOMTests::testBug39348().
+
+2003-06-25 John Camelon
+	Create new interface and support for calculating lineNumber/offset mapping.  
+	Updated IASTClassSpecifier for qualified name query.  
+	Began structuring expressions and declarators in Parser for ISourceElementRequestor.  
+	Updated other packages to use new interfaces.  
+	Updated automatedtests/torture test to use new line number information.  
+
+2003-06-24 John Camelon
+	Updates for ISourceElementRequestor - elaborated types & enumerations.  
+
+2003-06-23 John Camelon
+	Factory/constructor signature updates.  
+
+2003-06-17 Victor Mozgin
+	Added MacroTests.java (invocation in AllCoreTests).
+	Added MacroTests.c to resources.
+
+2003-06-17 Sean Evoy
+	Moved the ManagedBuildInfo extension point from the plugin file in org.eclipse.cdt.ui.tests
+	Added new options to sub target for include paths and preprocessor symbols
+	Added test for IManagedBuildPathInfo
+	* build/org/eclipse/cdt/core/build/managed/tests/AllBuildTests.java
+	
+2003-06-17 Brent Nicolle
+	Added Interface tests of IStructure.java.
+
+2003-06-17 Victor Mozgin
+	Added DeclaratorsTests.java (invocation in AllCoreTests).
+	Added DeclaratorsTests.cpp to org.eclipse.cdt.core.model.tests.resources.
+
+2003-06-16 Victor Mozgin
+	Added testOldKRFunctionDeclarations() to DOMTests.
+	Added testKRFunctionDeclarations() to TranslationUnitTests.
+
+2003-06-16 Vladimir Hirsl
+	Added /build, /parser, /failures and /suite directories to the library. 
+	Copied resources from /model/org.eclipse.cdt.core.model.tests.resources
+	                 to /model/org/clipse/cdt/core/model/tests/resources/cmodel.
+	Added class AISResultPrinter to format test results.  
+	Class AutomatedIntegrationSuite now implements IPlatformRunnable.
+
+2003-06-14 Victor Mozgin
+	Moved testBugSingleton192() from LokiFailures to DOMTests.
+	Added testPointersToMembers() and testPointersToMemberFunctions() to DOMTests.
+	Added testBug36290() and testBug36931() to DOMTests.
+
+2003-06-13 John Camelon
+	Added Class/Base infrastructure to public interfaces & requestor callback. 
+	Moved many internal interfaces to external packages. 
+	Organized imports.  
+
+2003-06-13 Victor Mozgin
+	Renamed NullParserCallback into NullSourceElementRequester in AutomatedFramework.
+
+2003-06-13 John Camelon
+	Merged ParserSymbolTable branch back into HEAD.
+
+2003-06-12 John Camelon
+	Get rest of JUnit tests working, will merge back to HEAD branch.  
+
+2003-06-12 John Camelon
+	Introduction of ASTFactory strategy, some restructuring of packages and interfaces.
+	
+2003-06-11 Victor Mozgin
+	Old Java TestCase.txt and TestCase2.txt for partioning testing have been replaced with C/C++ files.
+	Modified AutomatedIntegrationSuite.java so it doesn't produce JUnit warning anymore.
+	All tests in org.eclipse.cdt.ui.tests should pass now.
+
+3003-06-11 Peter Graves
+    Update the test.xml to get the location of org.eclipse.test from a property
+    if set. If the property is not set, it will default to the old value.
+    
+2003-06-11 Victor Mozgin
+	Added TortureTest to test CDT C++ parser with GCC testsuites.
+	GCC testsuites are not included.
+
+2003-06-10 John Camelon
+	Futher pursuit of the golden hammer, symbol table integration. 
+
+2003-06-10 Brent Nicolle
+	Added some Interface tests of (IInclude, IMacro, IStructure).
+	Made sure all the Test Suites have names in the JUnit hierarchy.
+
+2003-06-09 John Camelon
+	First step in replacing IParserCallback with ISourceElementRequestor.  
+	
+2003-06-09 Victor Mozgin
+	Moved testBug36769() from ACEFailedTest.java to DOMTests.java.
+	Removed ACEFailedTest.java as it is empty now.
+	Added DOMTests.testBug36769B(). 
+
+2003-06-09 Victor Mozgin
+	Moved testBug36932() from DOMFailedTest.java to DOMTests.java.
+	Added DOMTests.testBug36932B() and DOMTests.testBug36932C(). 
+
+2003-06-09 Victor Mozgin
+	Moved testBug36701() from ScannerFailedTests.java to ScannerTestCase.java.
+	Renamed it to testBug36701A() and fixed it.
+	Added ScannerTestCase.testBug36701B().
+
+2003-06-07 Victor Mozgin
+	Moved testBug36766A(), testBug36766B() & testBug36766C() from STLFailedTests.java to DOMTests.java.
+	Renamed them to testBug36766and36769x(), as they cover both PRs.
+	Added testBug36766and36769D() - test for templated destructor.
+
+2003-06-05 John Camelon
+	Moved testBug23478A() & testBug23478B() from failed tests to TranslationUnitTests.java.
+	Removed TranslationUnitFailedTests.java as it was empty. 
+
+2003-05-29 Andrew Niefer
+	Modified tests to support eType & PtrOp changes in core
+	Added ParserSymbolTableTest::testTemplateParameterAsParent
+	Added ParserSymbolTableTest::testTemplateInstanceAsParent
+	Added ParserSymbolTableTest::testTemplateParameterDefaults
+	Added ParserSymbolTableTest::testTemplateParameterAsFunctionArgument
+	started ParserSymbolTableTest::incompletetestTemplateSpecialization
+
+2003-05-26 John Camelon
+	Rollback PST/Parser integration.
+
+2003-05-13 Andrew Niefer	
+	Modified ParserSymbolTableTest to use new interface
+
+2003-05-08 Andrew Niefer
+	Added ParserSymbolTableTest::testMarkRollback
+
+2003-05-06 John Camelon
+	Further integration of SymbolTable into Parser, some refactoring. 
+
+2003-05-05 John Camelon/Andrew Niefer
+	Added CrossReferenceTests to ParserTestSuite to test symbol-table/DOM interworking.
+
+2003-05-05 Andrew Niefer
+	Rewrote ParserSymbolTableTest to reflect structural changes to the symbol table.
+
+2003-05-01 Andrew Niefer
+	Updated FractionalAutomatedTest to use threads
+	Modified ScannerTestCase::testBug36287
+	Added ScannerTestCase::testBug37011
+	Added ScannerTestCase::testOtherPreprocessorDefines
+
+2003-04-28 John Camelon
+	Moved testBug36730() & testBug37019() from DOMFailedTests to DOMTests.
+
+2003-04-28 Andrew Niefer
+	Added DOMFailedTest::testBug37019
+	Added DOMFailedTest::testBug36932
+	Added ScannerFailedTest::testBug37011
+
+2003-04-28 John Camelon
+	Added DOMTests::testOrder().  
+
+2003-04-28 Peter Graves
+	* model/org/eclipse/cdt/core/model/tests/BinaryTests:
+	Updated to remove a few small errors, and deal with some changes
+	to the core CDT
+	 
+2003-04-27 John Camelon
+	Added testBug36932() to DOMTests. 
+	Moved testBugFunctor758() from LokiFailures to DOMTests.
+	Moved testBug36704() from DOMFailedTest to DOMTests.  
+	Moved testBug36699() from DOMFailedTest to DOMTests.  
+	Moved testBug36691() from DOMFailedTest to DOMTests.  
+
+2003-04-25 Andrew Niefer
+	Moved ACEFailedTest::testBug36771 to DOMTests
+	Moved DOMFailedTest::testBug36714 to DOMTests
+	Updated ScannerTestCase::testBug36816
+	
+2003-04-25 John Camelon
+	Added DOMTests::testBug36852(). 
+	Added DOMTests::testBug36764().
+	Moved DOMFailedTests::testBug36702() to DOMTests(). 
+
+2003-04-24 John Camelon
+	Moved fixed tests from FailedTests to DOMTests. 
+	Added DOMTests::testBug36799().
+	Cleaned up tests to reduce amount of code necessary to maintain these things. 
+
+2003-04-24 John Camelon
+	Moved fixed tests from FailedTests to DOMTests. 
+	Added LokiFailures.java to failed tests directory.
+
+2003-04-24 Andrew Niefer
+	Added AutomatedFramework.java
+	Added FractionalAutomatedTest (which derives from AutomatedFramework)
+	Refactored AutomatedTest to derive from AutomatdFramework
+	Added ScannerTestCase.testBug36816
+	Added ScannerTestCase.testBug36255	
+
+2003-04-24 John Camelon
+	Fixed Java 1.3 compliance issue w/AutomatedTest.java
+	Fixed False failure in HelloWorld.java.  
+
+2003-04-21 John Camelon
+	Updated DOMTests::testBug36247(). 
+	Moved testBug36692(), testBug36703(), testBug36708(), testBug36707(), testBug36689()
+	and testBug36690() from DOMFailedTests to DOMTests and updated them. 
+
+2003-04-20 John Camelon
+	Added DOMTests::testBug36551().
+	Adjusted AutomatedTest to turn on line numbering. 
+	Added DOMFailedTests and 11 failed test cases.  
+
+2003-04-17 Andrew Niefer
+	Added ScannerTestCase::testBug36695()
+	Moved ScannerFailedTest::testBug36521 to ScannerTestCase::testBug36521()
+	Moved ScannerFailedTest::testBug36509 to ScannerTestCase::testBug36509()
+	Moved ScannerFailedTest::testBug36475 to ScannerTestCase::testBug36475() 
+	Updated ScannerTestCase::testBug36047
+	Updated ScannerTestCase::testBug36045
+
+2003-04-17 John Camelon
+	Updated DOMTests::testBug36600().
+	Updated LineNumberTest::testDOMLineNos().  
+	Added DOMTests::testBug36559().  
+
+2003-04-17 Andrew Niefer
+	Added AutomatedTest
+	Added resources.cFiles
+	Added resources.cppFiles
+
+2003-04-16 John Camelon
+	Added DOMTests::testBug36532().
+	Added DOMTests::testBug36432(). 
+	Added DOMTests::testBug36594().
+	Added DOMTests::testBug36600(). 
+	Added DOMTests::testArrayOfPointerToFunctions(). 
+
+2003-04-15 John Camelon
+	Added ScannerTestCase::testBug36434().
+	Added ScannerTestCase::testMultipleLines(). 
+	Added ParserTestSuite. 
+	Added LineNumberTest.
+	Updated CModelElementsTests to set the Nature of the C++ project appropriately.
+
+2003-04-15 Andrew Niefer
+	Moved ScannerFailedTest::testBug36047 to ScannerTestCase::testBug36047
+	Added ScannerFailedTest::testBug36475
+
+2003-04-13 John Camelon
+	Added DOMTests::testPointersToFunctions.  
+
+2003-04-11 John Camelon
+	Added DOMTests::testBug36247().  
+
+2003-04-11 Andrew Niefer
+	Moved ScannerFailedTest::testBug36316 to ScannerTestCase::testBug36316
+	Added ScannerFailedTest::testBug36047
+	Added ScannerTestCase::testNestedRecursiveDefines
+
+2003-04-10 John Camelon
+	Added DOMTests::testBug36237().
+
+2003-04-09 John Camelon
+	Removed all the old Code Model Builder source that was no longer being used (NewModelBuilder.java, etc.). 
+	Moved all the files in parser.util directory to the dom.  
+	Organized imports. 
+	Added DOMTests::testTemplateDeclarationOfMethod().
+	Added DOMTests::testBug36250().  
+	Added DOMTests::testBug36240(). 
+	Added DOMTests::testBug36254().
+
+2003-04-09 John Camelon
+	Updated ScannerTest::testBug36045().
+	Added ScannerTest::testBug36287().
+	Added DOMTests::testBug36288(). 
+
+2003-04-06 Andrew Niefer
+	Added ParserSymbolTableTest::testOverloadRanking()
+
+2003-04-04 Alain Magloire
+	* src/org/eclipse/cdt/testplugin/util/VerifyDialog.java:
+	Remove some warnings.
+
+2003-04-03 John Camelon
+	Updated ScannerTest::testSimpleIfdef() for bug36019.  
+	Updated ScannerTest::testNumerics() for bug36020.  
+	Added ScannerTest::testBug36045().  
+	Updated DOMTests::testTemplateDeclaration() for template grammar updates.  
+
+2003-04-01 Andrew Niefer
+	ParserSymbolTableTest. modifications to using declaration tests to reflect changes in the
+	symbol table.  Also added testUserDefinedConversionSequences()
+
+2003-04-01 John Camelon
+	Added testBug35906() to DOMTests.
+
+2003-03-31 John Camelon
+	Added testStruct() to DOMTests.  
+	Added test35892()to ScannerTest. 
+
+2003-03-31 Andrew Niefer
+	In ParserSymbolTableTest, renamed testFunctionResolution_2() to testFunctionResolution_PointersAndBaseClasses(),
+	and modified to reflect changes in function resolution.  
+	Added testFunctionResolution_TypedefsAndPointers().
+	
+2003-03-31 John Camelon
+	Added testWeirdStrings() and testNumerics() to ScannerTestCase. 
+	Added testTemplateSpecialization(), testTemplateDeclaration(), testBug26467(), 
+	  testTypedef() and testTemplateInstantiation() to DOMTests.
+
+2003-03-28 John Camelon
+	Added testConstructorChain() and testASMDefinition() to DOMTests.
+
+2003-03-27 Alain Magloire
+	Changes were done in the Core Model API, the hierarchy is now
+	ICModel
+		ICProject
+			ICContainer
+				ITranslationUnit
+				IArchive
+				IBinary
+	We adjust the tests.
+	* model/org/eclipse/cdt/core/model/tests/ArchiveTests.java
+	* model/org/eclipse/cdt/core/model/tests/BinaryTests.java
+	* model/org/eclipse/cdt/core/model/tests/TranslationUniTests.java
+	* model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java
+
+2003-03-26 Andrew Niefer
+	In ParserSymbolTableTest : 
+		updated all tests to reflect TypeInfo changes
+		Added testFunctionResolution() & testFunctionResolution_2() in
+
+2003-03-25 John Camelon
+	Added testDeclSpecifier(), testNamespaceDefinition(), testLinkageSpecification(), 
+	testUsingClauses() and testEnumSpecifier() to DOMTests.
+
+2003-03-23 John Camelon
+	Added ptrOperator() test to DOMTests.  
+	Added testFunctionModifiers() test to DOMTests.
+	Added testArrays() test to DOMTests.
+
+2003-03-20 Alain Magloire
+
+	Patch from Amer Hoda, tests for the CElement deltas for Translation Units.
+	* model/org/eclipse/cdt/core/model/tests/ElementDeltaTest.java
+	* model/org/eclipse/cdt/core/model/tests/resource/WorkingCopyTestStart.h
+	
+2003-03-19 Alain Magloire
+	Patch from Amer Hoda, introducing a simple test for the core model.
+	* model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java
+	* model/org/eclipse/cdt/core/model/tests/resource/WorkingCopyTestStart.h
+
+2003-03-18 John Camelon
+	Updated DOMTests to validate simple case of a function declaration with multiple parameters.  
+	* parser/org/eclipse/cdt/core/parser/tests/DOMTests.java
+
+2003-03-11 John Camelon
+	Updated DOMTests for core.internal.parser change of merging DeclarationSpecifier and DeclSpecifier
+	Organized imports
+	* parser/org/eclipse/cdt/core/parser/tests/DOMTests.java
+	* parser/org/eclipse/cdt/core/parser/tests/ParserSymbolTableTest.java
+
+2003-03-10 John Camelon
+	Added macro pasting tests
+
+2003-03-06 Andrew Niefer
+	Added tests for exercising Namespaces & using directives in new parser's symbol table
+
+2003-03-04 Doug Schaefer
+	This is a pretty big patch, but it is the merge of the NewParser1 branch into the HEAD branch.  lder "parser") 
+	JUnit tests for testing various pieces (source folder "parser" in cdt.ui.tests. 
+
+2003-01-29 Peter Graves
+
+    Fixed the warnings when accessing static methods
+    * src/org/eclipse/cdt/testplugin/util/DialogCheck.java:
+    * src/org/eclipse/cdt/testplugin/CTestPlugin.java
+    * src/org/eclipse/cdt/testplugin/TestWorkbench.java
+    * ChangeLog: make all entries have the same formatting
+
+2002-12-17 Peter Graves
+
+    * plugin.xml,test.xml: Some simple cleanups to remove refrences to the jdt and
+	to move closer to automated running
+    
+2002-11-27 Alain Magloire
+
+	* model/org/eclipse/cdt/core/model/tests/CModelTests.java:
+	Use CoreModel.getDefault().
+
+2002-10-30 Alain Magloire
+
+	* model/org/eclipse/cdt/core/model/tests/CModelTests.java (testGetNatureID):
+	The fields and the methods use in this test was removed from the CoreModel class.
+	(testHasNature): The method use in this case was refactor in the classes
+	CProjectNature and CCProjectNature, fix the test.
+
+2002-10-18 Peter Graves
+
+	src/org/eclipse/cdt/testplugin/CProjectHelper.jada
+    Cleanup of the CProjectHelper file to remove unused imports, commeted out code etc.
+    
+=======
+2003-04-21 Andrew Niefer
+	Added DOMFailedTests::testBug36713()
+	Added DOMFailedTests::testBug36714()
+	Added DOMFailedTests::testBug36717()
+	Added DOMFailedTests::testBug36730()
+
+2003-04-21 Andrew Niefer
+	Added ScannerTestCase::testBug36695()
+	Moved ScannerFailedTest::testBug36521 to ScannerTestCase::testBug36521()
+	Moved ScannerFailedTest::testBug36509 to ScannerTestCase::testBug36509()
+	Moved ScannerFailedTest::testBug36475 to ScannerTestCase::testBug36475() 
+	Updated ScannerTestCase::testBug36047
+	Updated ScannerTestCase::testBug36045
+
+2003-04-20 John Camelon
+	Added DOMTests::testBug36551().
+	Adjusted AutomatedTest to turn on line numbering. 
+	Added DOMFailedTests and 11 failed test cases.  
+
+2003-04-17 John Camelon
+	Updated DOMTests::testBug36600().
+	Updated LineNumberTest::testDOMLineNos().  
+	Added DOMTests::testBug36559().  
+
+2003-04-17 Andrew Niefer
+	Added AutomatedTest
+	Added resources.cFiles
+	Added resources.cppFiles
+
+2003-04-16 John Camelon
+	Added DOMTests::testBug36532().
+	Added DOMTests::testBug36432(). 
+	Added DOMTests::testBug36594().
+	Added DOMTests::testBug36600(). 
+	Added DOMTests::testArrayOfPointerToFunctions(). 
+
+2003-04-15 John Camelon
+	Added ScannerTestCase::testBug36434().
+	Added ScannerTestCase::testMultipleLines(). 
+	Added ParserTestSuite. 
+	Added LineNumberTest.
+	Updated CModelElementsTests to set the Nature of the C++ project appropriately.
+
+2003-04-15 Andrew Niefer
+	Moved ScannerFailedTest::testBug36047 to ScannerTestCase::testBug36047
+	Added ScannerFailedTest::testBug36475
+
+2003-04-13 John Camelon
+	Added DOMTests::testPointersToFunctions.  
+
+2003-04-11 John Camelon
+	Added DOMTests::testBug36247().  
+
+2003-04-11 Andrew Niefer
+	Moved ScannerFailedTest::testBug36316 to ScannerTestCase::testBug36316
+	Added ScannerFailedTest::testBug36047
+	Added ScannerTestCase::testNestedRecursiveDefines
+
+2003-04-10 John Camelon
+	Added DOMTests::testBug36237().
+
+2003-04-09 John Camelon
+	Removed all the old Code Model Builder source that was no longer being used (NewModelBuilder.java, etc.). 
+	Moved all the files in parser.util directory to the dom.  
+	Organized imports. 
+	Added DOMTests::testTemplateDeclarationOfMethod().
+	Added DOMTests::testBug36250().  
+	Added DOMTests::testBug36240(). 
+	Added DOMTests::testBug36254().
+
+2003-04-09 John Camelon
+	Updated ScannerTest::testBug36045().
+	Added ScannerTest::testBug36287().
+	Added DOMTests::testBug36288(). 
+
+2003-04-06 Andrew Niefer
+	Added ParserSymbolTableTest::testOverloadRanking()
+
+2003-04-04 Alain Magloire
+	* src/org/eclipse/cdt/testplugin/util/VerifyDialog.java:
+	Remove some warnings.
+
+2003-04-03 John Camelon
+	Updated ScannerTest::testSimpleIfdef() for bug36019.  
+	Updated ScannerTest::testNumerics() for bug36020.  
+	Added ScannerTest::testBug36045().  
+	Updated DOMTests::testTemplateDeclaration() for template grammar updates.  
+
+2003-04-01 Andrew Niefer
+	ParserSymbolTableTest. modifications to using declaration tests to reflect changes in the
+	symbol table.  Also added testUserDefinedConversionSequences()
+
+2003-04-01 John Camelon
+	Added testBug35906() to DOMTests.
+
+2003-03-31 John Camelon
+	Added testStruct() to DOMTests.  
+	Added test35892()to ScannerTest. 
+
+2003-03-31 Andrew Niefer
+	In ParserSymbolTableTest, renamed testFunctionResolution_2() to testFunctionResolution_PointersAndBaseClasses(),
+	and modified to reflect changes in function resolution.  
+	Added testFunctionResolution_TypedefsAndPointers().
+	
+2003-03-31 John Camelon
+	Added testWeirdStrings() and testNumerics() to ScannerTestCase. 
+	Added testTemplateSpecialization(), testTemplateDeclaration(), testBug26467(), 
+	  testTypedef() and testTemplateInstantiation() to DOMTests.
+
+2003-03-28 John Camelon
+	Added testConstructorChain() and testASMDefinition() to DOMTests.
+
+2003-03-27 Alain Magloire
+	Changes were done in the Core Model API, the hierarchy is now
+	ICModel
+		ICProject
+			ICContainer
+				ITranslationUnit
+				IArchive
+				IBinary
+	We adjust the tests.
+	* model/org/eclipse/cdt/core/model/tests/ArchiveTests.java
+	* model/org/eclipse/cdt/core/model/tests/BinaryTests.java
+	* model/org/eclipse/cdt/core/model/tests/TranslationUniTests.java
+	* model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java
+
+2003-03-26 Andrew Niefer
+	In ParserSymbolTableTest : 
+		updated all tests to reflect TypeInfo changes
+		Added testFunctionResolution() & testFunctionResolution_2() in
+
+2003-03-25 John Camelon
+	Added testDeclSpecifier(), testNamespaceDefinition(), testLinkageSpecification(), 
+	testUsingClauses() and testEnumSpecifier() to DOMTests.
+
+2003-03-23 John Camelon
+	Added ptrOperator() test to DOMTests.  
+	Added testFunctionModifiers() test to DOMTests.
+	Added testArrays() test to DOMTests.
+
+2003-03-20 Alain Magloire
+
+	Patch from Amer Hoda, tests for the CElement deltas for Translation Units.
+	* model/org/eclipse/cdt/core/model/tests/ElementDeltaTest.java
+	* model/org/eclipse/cdt/core/model/tests/resource/WorkingCopyTestStart.h
+	
+2003-03-19 Alain Magloire
+	Patch from Amer Hoda, introducing a simple test for the core model.
+	* model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java
+	* model/org/eclipse/cdt/core/model/tests/resource/WorkingCopyTestStart.h
+
+2003-03-18 John Camelon
+	Updated DOMTests to validate simple case of a function declaration with multiple parameters.  
+	* parser/org/eclipse/cdt/core/parser/tests/DOMTests.java
+
+2003-03-11 John Camelon
+	Updated DOMTests for core.internal.parser change of merging DeclarationSpecifier and DeclSpecifier
+	Organized imports
+	* parser/org/eclipse/cdt/core/parser/tests/DOMTests.java
+	* parser/org/eclipse/cdt/core/parser/tests/ParserSymbolTableTest.java
+
+2003-03-10 John Camelon
+	Added macro pasting tests
+
+2003-03-06 Andrew Niefer
+	Added tests for exercising Namespaces & using directives in new parser's symbol table
+
+2003-03-04 Doug Schaefer
+	This is a pretty big patch, but it is the merge of the NewParser1 branch into the HEAD branch.  lder "parser") 
+	JUnit tests for testing various pieces (source folder "parser" in cdt.ui.tests. 
+
+2003-01-29 Peter Graves
+
+    Fixed the warnings when accessing static methods
+    * src/org/eclipse/cdt/testplugin/util/DialogCheck.java:
+    * src/org/eclipse/cdt/testplugin/CTestPlugin.java
+    * src/org/eclipse/cdt/testplugin/TestWorkbench.java
+    * ChangeLog: make all entries have the same formatting
+
+2002-12-17 Peter Graves
+
+    * plugin.xml,test.xml: Some simple cleanups to remove refrences to the jdt and
+	to move closer to automated running
+    
+2002-11-27 Alain Magloire
+
+	* model/org/eclipse/cdt/core/model/tests/CModelTests.java:
+	Use CoreModel.getDefault().
+
+2002-10-30 Alain Magloire
+
+	* model/org/eclipse/cdt/core/model/tests/CModelTests.java (testGetNatureID):
+	The fields and the methods use in this test was removed from the CoreModel class.
+	(testHasNature): The method use in this case was refactor in the classes
+	CProjectNature and CCProjectNature, fix the test.
+
+2002-10-18 Peter Graves
+
+	src/org/eclipse/cdt/testplugin/CProjectHelper.jada
+    Cleanup of the CProjectHelper file to remove unused imports, commeted out code etc.
+    
+>>>>>>> 1.36
diff --git a/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/IndexManagerTest.java b/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/IndexManagerTest.java
index 3cae6252fa8..2e99f3da53a 100644
--- a/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/IndexManagerTest.java
+++ b/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/IndexManagerTest.java
@@ -67,9 +67,6 @@ public class IndexManagerTest extends TestCase {
 			fail("Unable to create project");
 		//Add a file to the project
 		importFile("mail.cpp","resources/indexer/mail.cpp");	
-		//Start up the index manager
-		//indexManager = new IndexManager();
-		//indexManager.reset();
 	}
 	/*
 	 * @see TestCase#tearDown()
@@ -77,7 +74,9 @@ public class IndexManagerTest extends TestCase {
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		//Delete project
-		//testProject.delete(true,monitor);
+		if (testProject.exists()){
+			testProject.delete(true,monitor);
+		}
 	}
 
 	public static Test suite() { 
@@ -144,7 +143,6 @@ public class IndexManagerTest extends TestCase {
 		//By doing this, we force the Index Manager to indexAll()
 		indexManager = CCorePlugin.getDefault().getCoreModel().getIndexManager();
 		indexManager.setEnabled(testProject,true);
-		
 		Thread.sleep(15000);
 		IIndex ind = indexManager.getIndex(testProject.getFullPath(),true,true);
 		char[] prefix = "typeDecl/".toCharArray();
@@ -171,5 +169,90 @@ public class IndexManagerTest extends TestCase {
 		}
 	}
 	
+	public void testAddNewFileToIndex() throws Exception{
+		//Enable indexing on the created project
+		//By doing this, we force the Index Manager to indexAll()
+		indexManager = CCorePlugin.getDefault().getCoreModel().getIndexManager();
+		indexManager.setEnabled(testProject,true);
+		Thread.sleep(15000);
+		//Make sure project got added to index
+		IPath testProjectPath = testProject.getFullPath();
+		IIndex ind = indexManager.getIndex(testProjectPath,true,true);
+		assertTrue("Index exists for project",ind != null);
+		//Add a new file to the project, give it some time to index
+		importFile("DocumentManager.h","resources/indexer/DocumentManager.h");
+		Thread.sleep(10000);
+		ind = indexManager.getIndex(testProjectPath,true,true);
+		char[] prefix = "typeDecl/C/CDocumentManager/".toCharArray();
+		String [] entryResultModel ={"EntryResult: word=typeDecl/C/CDocumentManager/, refs={ 1 }"};
+		IEntryResult[] eresults =ind.queryEntries(prefix);
+		
+		if (eresults.length != entryResultModel.length)
+			fail("Entry Result length different from model");
+			
+		for (int i=0;i<eresults.length; i++)
+		{
+			assertEquals(entryResultModel[i],eresults[i].toString());
+		}
+	}
+
+	public void testRemoveProjectFromIndex() throws Exception{
+	  //Enable indexing on the created project
+	  //By doing this, we force the Index Manager to indexAll()
+	  indexManager = CCorePlugin.getDefault().getCoreModel().getIndexManager();
+	  indexManager.setEnabled(testProject,true);
+	  Thread.sleep(15000);
+	  //Make sure project got added to index
+	  IPath testProjectPath = testProject.getFullPath();
+	  IIndex ind = indexManager.getIndex(testProjectPath,true,true);
+	  assertTrue("Index exists for project",ind != null);
+	  //Delete the project
+	  testProject.delete(true,monitor);
+	  //See if the index is still there
+	  ind = indexManager.getIndex(testProjectPath,true,true);
+	  assertTrue("Index deleted",ind == null);
+	}
+	
+	public void testRemoveFileFromIndex() throws Exception{
+	 //Enable indexing on the created project
+	 //By doing this, we force the Index Manager to indexAll()
+	 indexManager = CCorePlugin.getDefault().getCoreModel().getIndexManager();
+	 indexManager.setEnabled(testProject,true);
+	 Thread.sleep(15000);
+	 //Make sure project got added to index
+	 IPath testProjectPath = testProject.getFullPath();
+	 IIndex ind = indexManager.getIndex(testProjectPath,true,true);
+	 assertTrue("Index exists for project",ind != null);
+	 //Add a new file to the project
+	 importFile("DocumentManager.h","resources/indexer/DocumentManager.h");
+	 Thread.sleep(10000);
+	 //Do a "before" deletion comparison
+	 ind = indexManager.getIndex(testProjectPath,true,true);
+	 char[] prefix = "typeDecl/".toCharArray();
+	 IEntryResult[] eresults = ind.queryEntries(prefix);
+	 String [] entryResultBeforeModel ={"EntryResult: word=typeDecl/C/CDocumentManager/, refs={ 1 }", "EntryResult: word=typeDecl/C/Mail/, refs={ 2 }", "EntryResult: word=typeDecl/C/Unknown/, refs={ 2 }", "EntryResult: word=typeDecl/C/container/, refs={ 2 }", "EntryResult: word=typeDecl/C/first_class/, refs={ 2 }", "EntryResult: word=typeDecl/C/postcard/, refs={ 2 }"};
+	 if (eresults.length != entryResultBeforeModel.length)
+			fail("Entry Result length different from model");	
+	 
+	 for (int i=0;i<eresults.length; i++)
+	 {
+		assertEquals(entryResultBeforeModel[i],eresults[i].toString());
+	 }
+	 //Delete mail.cpp from the project, give some time to remove index
+	 IResource resourceHdl = testProject.findMember("mail.cpp") ;
+	 resourceHdl.delete(true,monitor);
+	 Thread.sleep(10000);
+	 //See if the index is still there
+	 ind = indexManager.getIndex(testProjectPath,true,true);
+	 eresults = ind.queryEntries(prefix);
+	 String [] entryResultAfterModel ={"EntryResult: word=typeDecl/C/CDocumentManager/, refs={ 1 }"};
+	 if (eresults.length != entryResultAfterModel.length)
+		fail("Entry Result length different from model");
+		
+	 for (int i=0;i<eresults.length; i++)
+     {
+		assertEquals(entryResultAfterModel[i],eresults[i].toString());
+	 }
+	}
 	
 }
diff --git a/core/org.eclipse.cdt.core.tests/resources/indexer/DocumentManager.cpp b/core/org.eclipse.cdt.core.tests/resources/indexer/DocumentManager.cpp
new file mode 100644
index 00000000000..75fb2e02b13
--- /dev/null
+++ b/core/org.eclipse.cdt.core.tests/resources/indexer/DocumentManager.cpp
@@ -0,0 +1,25 @@
+#include "StdAfx.h"
+#include "documentmanager.h"
+
+CDocumentManager::CDocumentManager(void)
+{
+}
+
+CDocumentManager::~CDocumentManager(void)
+{
+}
+
+void CDocumentManager::addToControlMap(UINT threadID, IUnknown * theControl)
+{
+	_controlMap.insert(MUL2IUnk_Pair(threadID,theControl));
+}
+
+void CDocumentManager::getControl(ULONG threadID, IUnknown ** theControl)
+{
+	if (_controlMap.find(threadID) != _controlMap.end())
+	{
+		theControl = &_controlMap[threadID];
+	}
+
+	
+}
diff --git a/core/org.eclipse.cdt.core.tests/resources/indexer/DocumentManager.h b/core/org.eclipse.cdt.core.tests/resources/indexer/DocumentManager.h
new file mode 100644
index 00000000000..868c2281986
--- /dev/null
+++ b/core/org.eclipse.cdt.core.tests/resources/indexer/DocumentManager.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <map>
+
+typedef  map<ULONG, IUnknown *> MUL2IUnk;
+typedef pair <ULONG, IUnknown *> MUL2IUnk_Pair;
+
+class CDocumentManager
+{
+public:
+	CDocumentManager(void);
+	~CDocumentManager(void);
+
+private:
+	MUL2IUnk _controlMap;
+
+public:
+	void addToControlMap(UINT threadID, IUnknown * theControl);
+	void getControl(ULONG threadID, IUnknown ** theControl);
+};