commit 66ded6140de8a67c01dc1f99c3218a085e48fbb2
author rsrinivasan <rsrinivasan> Wed May 12 06:15:19 2010 +0000
committer rsrinivasan <rsrinivasan> Wed May 12 06:15:19 2010 +0000
tree 0e8029292b61392241c80258cc88a400008bc37e
parent e91b1489fa98bb207be2f72ff1ebda0aa2a8e3b8

 Bug 312475 -  JUnit failures in metadata and pagedesigner tests

jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.xml

diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.xml b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.xml
index edbadcf..3b82522 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.xml
@@ -79,11 +79,12 @@
             class="org.eclipse.jst.jsf.common.metadata.tests.updated.FakeDomainQueryFactory">
       </factory>
    </extension>
+
 <!--   
    <extension
          point="org.eclipse.jst.jsf.common.mdModelManagerFactory">
       <factory
-            class="org.eclipse.jst.jsf.common.metadata.tests.TestMDModelManagerFactory">
+            class="org.eclipse.jst.jsf.common.metadata.tests.updated.TestMDModelManagerFactory">
       </factory>
    </extension>
 -->   

jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/common/metadata/tests/updated/MetaDataModelManagerFactoryTests.java

diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/common/metadata/tests/updated/MetaDataModelManagerFactoryTests.java b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/common/metadata/tests/updated/MetaDataModelManagerFactoryTests.java
index 64e70f1..1ec0ed4 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/common/metadata/tests/updated/MetaDataModelManagerFactoryTests.java
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/common/metadata/tests/updated/MetaDataModelManagerFactoryTests.java
@@ -42,7 +42,7 @@
 	
 //// test extension disabled becuz it screws up tests	
 //	public void testExtPtMDModelManagerSetup() {
-//		IMetaDataModelManager mgr = MetaDataModelManagerFactory.getMetaDataModelManagerInstance(projectTestEnvironment.getTestProject());
+//		IMetaDataModelManager mgr = MetaDataModelManagerFactory.getMetaDataModelManagerInstance(_project);
 //		assertNotNull(mgr);
 //		assertEquals("TestMDModelManager", mgr.getClass().getSimpleName());;
 //	}

jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/common/metadata/tests/updated/TestMDModelManagerFactory.java

diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/common/metadata/tests/updated/TestMDModelManagerFactory.java b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/common/metadata/tests/updated/TestMDModelManagerFactory.java
index 827a7ce..b39a42f 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/common/metadata/tests/updated/TestMDModelManagerFactory.java
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/common/metadata/tests/updated/TestMDModelManagerFactory.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.jst.jsf.common.metadata.tests.updated;
 
-import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.jst.jsf.common.metadata.Model;
 import org.eclipse.jst.jsf.common.metadata.internal.AbstractMetaDataModelManager;
 import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelContext;
@@ -21,7 +21,7 @@
 
 public class TestMDModelManagerFactory implements IMetaDataModelManagerFactory {
 
-	public IMetaDataModelManager getInstance(IProject project) {
+	public IMetaDataModelManager getInstance(IResource projectOrWorkspaceRoot) {
 		return new TestMDModelManager();
 	}