From 3c7584ad4c41372de27777a080ed7151e3a2df31 Mon Sep 17 00:00:00 2001
From: David Inglis <dinglis@qnx.com>
Date: Tue, 9 Mar 2004 23:46:12 +0000
Subject: [PATCH] fixed standard build test to create cprojects

---
 core/org.eclipse.cdt.core.tests/ChangeLog                    | 3 +++
 .../cdt/core/build/managed/tests/StandardBuildTests.java     | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/org.eclipse.cdt.core.tests/ChangeLog b/core/org.eclipse.cdt.core.tests/ChangeLog
index 956b61e5d23..a93b6f7ee9e 100644
--- a/core/org.eclipse.cdt.core.tests/ChangeLog
+++ b/core/org.eclipse.cdt.core.tests/ChangeLog
@@ -1,3 +1,6 @@
+2004-03-09 David Inglis
+	Fixed StandardBuildTest to create a CProject
+	
 2004-03-09 Andrew Niefer
 	Added CompletionParseTest.testBug52948
 
diff --git a/core/org.eclipse.cdt.core.tests/build/org/eclipse/cdt/core/build/managed/tests/StandardBuildTests.java b/core/org.eclipse.cdt.core.tests/build/org/eclipse/cdt/core/build/managed/tests/StandardBuildTests.java
index 99b4967cf72..7dfadf69453 100644
--- a/core/org.eclipse.cdt.core.tests/build/org/eclipse/cdt/core/build/managed/tests/StandardBuildTests.java
+++ b/core/org.eclipse.cdt.core.tests/build/org/eclipse/cdt/core/build/managed/tests/StandardBuildTests.java
@@ -10,6 +10,7 @@ import junit.framework.TestSuite;
 import org.eclipse.cdt.core.CCProjectNature;
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.CProjectNature;
+import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.core.parser.IScannerInfo;
 import org.eclipse.cdt.core.parser.IScannerInfoChangeListener;
 import org.eclipse.cdt.core.parser.IScannerInfoProvider;
@@ -19,6 +20,7 @@ import org.eclipse.cdt.make.core.MakeCorePlugin;
 import org.eclipse.cdt.make.core.MakeProjectNature;
 import org.eclipse.cdt.make.core.MakeScannerInfo;
 import org.eclipse.cdt.make.core.MakeScannerProvider;
+import org.eclipse.cdt.testplugin.CProjectHelper;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRoot;
@@ -185,7 +187,7 @@ public class StandardBuildTests extends TestCase {
 		if (!project.isOpen()) {
 			project.open(null);
 		}
-
+		CCorePlugin.getDefault().convertProjectToC(project, new NullProgressMonitor(), MakeCorePlugin.MAKE_PROJECT_ID);
 		return project;	
 	}
 
@@ -266,7 +268,6 @@ public class StandardBuildTests extends TestCase {
 		try {
 			project = createProject(PROJECT_NAME); 
 			// Convert the new project to a standard make project
-			CCorePlugin.getDefault().convertProjectToCC(project, new NullProgressMonitor(), MakeCorePlugin.MAKE_PROJECT_ID);
 			MakeProjectNature.addNature(project, null);
 		} catch (CoreException e) {
 			fail("StandardBuildTest testProjectCreation failed creating project: " + e.getLocalizedMessage());