Enabled 1.2 facet and project creation. Added basic faces-config model validator.

2 files changed, 51 insertions, 1 deletions

diff --git a/jsf/tests/org.eclipse.jst.jsf.core.tests/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.core.tests/META-INF/MANIFEST.MF
index 03308e6..194fef5 100644
--- a/jsf/tests/org.eclipse.jst.jsf.core.tests/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.jsf.core.tests/META-INF/MANIFEST.MF
@@ -29,7 +29,8 @@ Require-Bundle: org.eclipse.jst.jsf.core,
  org.eclipse.wst.xml.core,
  org.eclipse.jst.jsp.core,
  org.eclipse.jst.jsf.test.util,
- org.eclipse.jst.jsf.common
+ org.eclipse.jst.jsf.common,
+ org.eclipse.wst.validation
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.jst.jsf.core.tests;x-friends:="org.eclipse.jst.jsf.ui.tests",
  org.eclipse.jst.jsf.core.tests.jsflibraryregistry,
diff --git a/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/appconfig/validation/AppConfigValidationUtilTestCase.java b/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/appconfig/validation/AppConfigValidationUtilTestCase.java
new file mode 100644
index 0000000..5406d31
--- /dev/null
+++ b/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/appconfig/validation/AppConfigValidationUtilTestCase.java
@@ -0,0 +1,49 @@
+package org.eclipse.jst.jsf.core.tests.appconfig.validation;
+
+
+
+import junit.framework.TestCase;
+
+import org.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidationUtil;
+import org.eclipse.jst.jsf.validation.internal.appconfig.DiagnosticFactory;
+import org.eclipse.jst.jsf.validation.internal.appconfig.ILocalizedMessage;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+
+/**
+ * Unit tests for AppConfigValidationUtil
+ * 
+ * @author cbateman
+ *
+ */
+public class AppConfigValidationUtilTestCase extends TestCase 
+{
+    /**
+     * test validateELExpression method
+     */
+    public void testValidateELExpression()
+    {
+        final String validELString1 = "#{x.y}";
+        final String validELString2 = "#{a.b.c}";
+        final String inValidEmptyExpr = "#{}";
+        final String inValidNoBraces = "x.y";
+        final String inValidSyntaxInEL = "#{x.[}";
+        
+        assertNull(AppConfigValidationUtil.validateELExpression(validELString1));
+        assertNull(AppConfigValidationUtil.validateELExpression(validELString2));
+        
+        IMessage message = AppConfigValidationUtil.validateELExpression(inValidEmptyExpr);
+        assertNotNull(message);
+        assertEquals(DiagnosticFactory.SYNTAX_ERROR_IN_EL_ID, 
+                ((ILocalizedMessage)message).getErrorCode());
+        
+        message = AppConfigValidationUtil.validateELExpression(inValidNoBraces);
+        assertNotNull(message);
+        assertEquals(DiagnosticFactory.EL_EXPR_MUST_BE_IN_HASH_BRACES_ID, 
+                ((ILocalizedMessage)message).getErrorCode());
+
+        message = AppConfigValidationUtil.validateELExpression(inValidSyntaxInEL);
+        assertNotNull(message);
+        assertEquals(DiagnosticFactory.SYNTAX_ERROR_IN_EL_ID, 
+                ((ILocalizedMessage)message).getErrorCode());
+    }
+}