Bug 312980 - [JSF2.0] "attrs" JSF 2.0 virtual property of a component available in pre-JSF2.0 apps ---[REWORK + FIX CORRESPONDING JUNITS]---

Bug 340093 - [JSF2.0] Need version mechanism for determining what implicit components are valid

2 files changed, 13 insertions, 0 deletions

diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestDefaultPropertyResolver.java b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestDefaultPropertyResolver.java
index 9bba12cd3..cb600f7f0 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestDefaultPropertyResolver.java
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestDefaultPropertyResolver.java
@@ -254,6 +254,7 @@ public class TestDefaultPropertyResolver extends TestCase
 
         final DefaultDTPropertyResolver propResolver =
             new DefaultDTPropertyResolver();
+		propResolver.setProject(_jdtTestEnvironment.getProjectEnvironment().getTestProject());
         final ISymbol[] properties = propResolver.getAllProperties(symbol);
         assertEquals(NUM_PROPERTIES_TEST_BEAN_1, properties.length);
         final Map<String, ISymbol> checkProps = new HashMap<String, ISymbol>();
@@ -309,6 +310,7 @@ public class TestDefaultPropertyResolver extends TestCase
 
         final DefaultDTPropertyResolver propResolver =
             new DefaultDTPropertyResolver();
+		propResolver.setProject(_jdtTestEnvironment.getProjectEnvironment().getTestProject());
         final ISymbol[] properties = propResolver.getAllProperties(symbol);
         // there no design-time identifiable properties
         // note that this is different that what JDTBeanIntrospector returns
@@ -354,6 +356,7 @@ public class TestDefaultPropertyResolver extends TestCase
 
         final DefaultDTPropertyResolver propResolver =
             new DefaultDTPropertyResolver();
+		propResolver.setProject(_jdtTestEnvironment.getProjectEnvironment().getTestProject());
         final ISymbol[] properties = propResolver.getAllProperties(symbol);
 
         // should have three properties
@@ -419,6 +422,7 @@ public class TestDefaultPropertyResolver extends TestCase
 
         final DefaultDTPropertyResolver propResolver =
             new DefaultDTPropertyResolver();
+		propResolver.setProject(_jdtTestEnvironment.getProjectEnvironment().getTestProject());
         {
             final ISymbol[] properties = propResolver.getAllProperties(symbol);
             assertEquals(2, properties.length); // should have defined property
@@ -489,6 +493,7 @@ public class TestDefaultPropertyResolver extends TestCase
 
         final DefaultDTPropertyResolver propResolver =
             new DefaultDTPropertyResolver();
+		propResolver.setProject(_jdtTestEnvironment.getProjectEnvironment().getTestProject());
         ISymbol[] properties = propResolver.getAllProperties(symbol);
 
         // should be two properties: mapProp and class
@@ -527,6 +532,7 @@ public class TestDefaultPropertyResolver extends TestCase
 
         final DefaultDTPropertyResolver propResolver =
             new DefaultDTPropertyResolver();
+		propResolver.setProject(_jdtTestEnvironment.getProjectEnvironment().getTestProject());
 
         // test array of strings property
         {
@@ -650,6 +656,7 @@ public class TestDefaultPropertyResolver extends TestCase
 
         final DefaultDTPropertyResolver propResolver =
             new DefaultDTPropertyResolver();
+		propResolver.setProject(_jdtTestEnvironment.getProjectEnvironment().getTestProject());
         final ISymbol[] properties = propResolver.getAllProperties(symbol);
 
         // should have no properties since a list won't be treated like
@@ -686,6 +693,7 @@ public class TestDefaultPropertyResolver extends TestCase
 
         final DefaultDTPropertyResolver propResolver =
             new DefaultDTPropertyResolver();
+		propResolver.setProject(_jdtTestEnvironment.getProjectEnvironment().getTestProject());
         ISymbol[] properties = propResolver.getAllProperties(symbol);
 
         // should be just one property plus Object.class
@@ -725,6 +733,7 @@ public class TestDefaultPropertyResolver extends TestCase
 
         final DefaultDTPropertyResolver propResolver =
             new DefaultDTPropertyResolver();
+		propResolver.setProject(_jdtTestEnvironment.getProjectEnvironment().getTestProject());
         ISymbol[] properties = propResolver.getAllProperties(symbol);
 
         // should be just one property plus Object.class
@@ -762,6 +771,7 @@ public class TestDefaultPropertyResolver extends TestCase
 
         final DefaultDTPropertyResolver propResolver =
             new DefaultDTPropertyResolver();
+		propResolver.setProject(_jdtTestEnvironment.getProjectEnvironment().getTestProject());
         final ISymbol propSymbol = propResolver.getProperty(symbol, "anyProp");
 
         assertNotNull(propSymbol);
@@ -796,6 +806,7 @@ public class TestDefaultPropertyResolver extends TestCase
 
         final DefaultDTPropertyResolver propResolver =
             new DefaultDTPropertyResolver();
+		propResolver.setProject(_jdtTestEnvironment.getProjectEnvironment().getTestProject());
         {
             ISymbol oneDot = propResolver.getProperty(symbol, "one");
             assertNotNull(oneDot);
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestJSF20ImplicitVariables.java b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestJSF20ImplicitVariables.java
index 40af98cb1..f5171e61c 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestJSF20ImplicitVariables.java
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/src/org/eclipse/jst/jsf/designtime/tests/TestJSF20ImplicitVariables.java
@@ -131,6 +131,7 @@ public class TestJSF20ImplicitVariables extends TestCase
 		assertEquals(ERuntimeSource.BUILT_IN_SYMBOL_LITERAL, ((IInstanceSymbol)symbol).getRuntimeSource());
 		
 		DefaultDTPropertyResolver propresolver = new DefaultDTPropertyResolver();
+		propresolver.setProject(_jdtTestEnvironment.getProjectEnvironment().getTestProject());
 		ISymbol[] props = propresolver.getAllProperties(symbol);
 		assertContainsVariable(props, ATTRS_SYMBOL_NAME);
 //		assertContainsVariable(props, "attributes"); //need real jars on cp
@@ -154,6 +155,7 @@ public class TestJSF20ImplicitVariables extends TestCase
 		assertEquals(ERuntimeSource.BUILT_IN_SYMBOL_LITERAL, ((IInstanceSymbol)symbol).getRuntimeSource());
 		
 		DefaultDTPropertyResolver propresolver = new DefaultDTPropertyResolver();
+		propresolver.setProject(_jdtTestEnvironment.getProjectEnvironment().getTestProject());
 		ISymbol[] props = propresolver.getAllProperties(symbol);
 		assertContainsVariable(props, ATTRS_SYMBOL_NAME);
 //		assertContainsVariable(props, "attributes");		//need real jars on cp