Author: mareshkau Date: 2011-02-23 12:08:32 -0500 (Wed, 23 Feb 2011) New Revision: 29286 Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.classpath trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.project trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/.jsdtscope trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.jdt.core.prefs trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.common.component trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/JavaSource/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/WebContent/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/WebContent/META-INF/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/WebContent/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/WebContent/WEB-INF/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/WebContent/WEB-INF/classes/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/WebContent/WEB-INF/lib/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/WebContent/WEB-INF/web.xml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/WebContent/externalization-validator-test-case-1.xhtml trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/I18nValidatorTest.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java Log: https://issues.jboss.org/browse/JBIDE-7003, junit has been added Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.classpath =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.classpath (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.classpath 2011-02-23 17:08:32 UTC (rev 29286) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="JavaSource"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"> + <attributes> + <attribute name="owner.project.facets" value="jst.web"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_23"> + <attributes> + <attribute name="owner.project.facets" value="java"/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> +</classpath> Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.project =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.project (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.project 2011-02-23 17:08:32 UTC (rev 29286) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>i18nTestProject</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.jst.web.kb.kbbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.jboss.tools.jsf.jsfnature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + </natures> +</projectDescription> Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/.jsdtscope =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/.jsdtscope (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/.jsdtscope 2011-02-23 17:08:32 UTC (rev 29286) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="WebContent"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> + <attributes> + <attribute name="hide" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> + <classpathentry kind="output" path=""/> +</classpath> Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.jdt.core.prefs 2011-02-23 17:08:32 UTC (rev 29286) @@ -0,0 +1,8 @@ +#Wed Feb 23 17:07:39 EET 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.common.component 2011-02-23 17:08:32 UTC (rev 29286) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="i18nTestProject"> + <wb-resource deploy-path="/" source-path="/WebContent"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> + <property name="context-root" value="i18nTestProject"/> + <property name="java-output-path" value="/i18nTestProject/WebContent/WEB-INF/classes"/> + </wb-module> +</project-modules> Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml 2011-02-23 17:08:32 UTC (rev 29286) @@ -0,0 +1,7 @@ +<root> + <facet id="jst.jsf"> + <node name="libprov"> + <attribute name="provider-id" value="jsf-user-library-provider"/> + </node> + </facet> +</root> Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-02-23 17:08:32 UTC (rev 29286) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="Apache Tomcat v6.0"/> + <fixed facet="jst.jsf"/> + <fixed facet="wst.jsdt.web"/> + <fixed facet="java"/> + <fixed facet="jst.web"/> + <installed facet="java" version="1.6"/> + <installed facet="jst.web" version="2.5"/> + <installed facet="jst.jsf" version="1.2"/> + <installed facet="wst.jsdt.web" version="1.0"/> +</faceted-project> Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-02-23 17:08:32 UTC (rev 29286) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-02-23 17:08:32 UTC (rev 29286) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/WebContent/META-INF/MANIFEST.MF 2011-02-23 17:08:32 UTC (rev 29286) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/WebContent/WEB-INF/web.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/WebContent/WEB-INF/web.xml 2011-02-23 17:08:32 UTC (rev 29286) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5"> + <description>Facelets StarterKit</description> + <display-name>i18nTestProject</display-name> + <context-param> + <param-name>com.sun.faces.validateXml</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>com.sun.faces.verifyObjects</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>facelets.REFRESH_PERIOD</param-name> + <param-value>2</param-value> + </context-param> + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>client</param-value> + </context-param> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/WebContent/externalization-validator-test-case-1.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/WebContent/externalization-validator-test-case-1.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/i18nTestProject/WebContent/externalization-validator-test-case-1.xhtml 2011-02-23 17:08:32 UTC (rev 29286) @@ -0,0 +1,15 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> +<f:view contentType="text/html" /> +<h:head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>First JSF 2.0 application</title> +</h:head> +<body> +String shou ld be validated as need to be externalized +<h:outputText value="Another strign for externalization" /> +#{el.sting} +</body> +</html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-02-23 15:07:02 UTC (rev 29285) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-02-23 17:08:32 UTC (rev 29286) @@ -30,6 +30,7 @@ import org.jboss.tools.jsf.test.refactoring.MessagePropertyRefactoringTest; import org.jboss.tools.jsf.test.refactoring.MethodRefactoringTest; import org.jboss.tools.jsf.test.validation.ELValidatorTest; +import org.jboss.tools.jsf.test.validation.I18nValidatorTest; import org.jboss.tools.jsf.test.validation.JSF2ComponentsValidatorTest; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ProjectImportTestSetup; @@ -79,6 +80,10 @@ JSF2RefactoringTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$ new String[] { "projects/JSF2ComponentsValidator" }, //$NON-NLS-1$ new String[] { "JSF2ComponentsValidator" })); //$NON-NLS-1$ + suite.addTest(new ProjectImportTestSetup(new TestSuite( + I18nValidatorTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$ + new String[] { "projects/i18nTestProject" }, //$NON-NLS-1$ + new String[] { "i18nTestProject" })); //$NON-NLS-1$ suite.addTest(new ProjectImportTestSetup(new TestSuite(ELValidatorTest.class),"org.jboss.tools.jsf.test","projects/JSFKickStartOldFormat","JSFKickStartOldFormat") { @Override protected void setUp() throws Exception { Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/I18nValidatorTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/I18nValidatorTest.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/I18nValidatorTest.java 2011-02-23 17:08:32 UTC (rev 29286) @@ -0,0 +1,47 @@ +/******************************************************************************* + * Copyright (c) 2007-2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.test.validation; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.wst.validation.ValidationFramework; +import org.jboss.tools.jsf.web.validation.i18n.I18nValidationComponent; +import org.jboss.tools.tests.AbstractResourceMarkerTest; + +/** + * Test class for Externalize String Validator + * + * @author mareshkau + * + */ +public class I18nValidatorTest extends AbstractResourceMarkerTest{ + + @Override + protected void setUp() throws Exception { + super.setUp(); + setProject(ResourcesPlugin.getWorkspace().getRoot().getProject("i18nTestProject")); //$NON-NLS-1$ + } + + public void testShowErrorMarkers() throws CoreException { + IFile testFile = getProject().getFile("WebContent/externalization-validator-test-case-1.xhtml"); //$NON-NLS-1$ + testFile.deleteMarkers(I18nValidationComponent.PROBLEM_ID, true, IResource.DEPTH_ZERO); + IMarker[] elMarkers = testFile.findMarkers(I18nValidationComponent.PROBLEM_ID, true, IResource.DEPTH_ZERO); + assertEquals("Markers should be cleaned", 0,elMarkers.length); //$NON-NLS-1$ + ValidationFramework.getDefault().validate(testFile, new NullProgressMonitor()); + elMarkers = testFile.findMarkers(I18nValidationComponent.PROBLEM_ID, true, IResource.DEPTH_ZERO); + assertEquals("Should be 2 Markers", 2,elMarkers.length); //$NON-NLS-1$ + } + +}