[jbosstools-commits] JBoss Tools SVN: r31317 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test: projects/CDIConfigValidationTest and 10 other directories.

Author: scabanovich Date: 2011-05-13 20:49:49 -0400 (Fri, 13 May 2011) New Revision: 31317 Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.classpath trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.project trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.settings/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.settings/org.eclipse.jdt.core.prefs trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/cdi-api.jar trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/javax.inject.jar trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/jboss-interceptor-api.jar trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/seam-config-xml.jar trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/META-INF/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/META-INF/beans.xml trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/org/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/org/jboss/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/org/jboss/beans/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/org/jboss/beans/validation/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/org/jboss/beans/validation/test/ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/org/jboss/beans/validation/test/MyBean1.java trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTestSetup.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java Log: JBIDE-8941 https://issues.jboss.org/browse/JBIDE-8941 Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.classpath =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.classpath (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.classpath 2011-05-14 00:49:49 UTC (rev 31317) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="lib" path="lib/cdi-api.jar"/> + <classpathentry kind="lib" path="lib/javax.inject.jar"/> + <classpathentry kind="lib" path="lib/seam-config-xml.jar"/> + <classpathentry kind="lib" path="lib/jboss-interceptor-api.jar"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.project =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.project (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.project 2011-05-14 00:49:49 UTC (rev 31317) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>CDIConfigValidationTest</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.jst.web.kb.kbbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.cdi.core.cdibuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + <nature>org.jboss.tools.cdi.core.cdinature</nature> + </natures> +</projectDescription> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.settings/org.eclipse.jdt.core.prefs 2011-05-14 00:49:49 UTC (rev 31317) @@ -0,0 +1,12 @@ +#Fri May 13 12:44:03 PDT 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.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/cdi-api.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/cdi-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/javax.inject.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/javax.inject.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/jboss-interceptor-api.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/jboss-interceptor-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/seam-config-xml.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/seam-config-xml.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/META-INF/beans.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/META-INF/beans.xml (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/META-INF/beans.xml 2011-05-14 00:49:49 UTC (rev 31317) @@ -0,0 +1,54 @@ +<?xml version="1.0"?> +<beans xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:s="urn:java:ee" + xmlns:v="urn:java:org.jboss.beans.validation.test" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd"> + +<v:MyBean2> +</v:MyBean2> + +<v:MyBean1> + <s:Default/> + <v:field1> + </v:field1> + <v:field3></v:field3> +</v:MyBean1> + +<v:MyBean1> + <s:Default/> + <v:field1> + <s:Named param="abc"/> + </v:field1> +</v:MyBean1> + +<v:MyBean1> + <s:Default/> + <v:field1> + <s:Named value="abc"/> + </v:field1> +</v:MyBean1> + +<v:MyBean1> + <s:Default/> + <v:method1> + <s:parameters> + </s:parameters> + </v:method1> + <v:method2> + <s:parameters> + </s:parameters> + </v:method2> + <v:method1> + <s:parameters> + <s:String/> + </s:parameters> + </v:method1> + <v:method1> + <s:parameters> + <s:Boolean/> + </s:parameters> + </v:method1> +</v:MyBean1> + +</beans> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/META-INF/beans.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/org/jboss/beans/validation/test/MyBean1.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/org/jboss/beans/validation/test/MyBean1.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/org/jboss/beans/validation/test/MyBean1.java 2011-05-14 00:49:49 UTC (rev 31317) @@ -0,0 +1,10 @@ +package org.jboss.beans.validation.test; + +public class MyBean1 { + boolean field1; + + void method1() {} + + void method1(String s) {} + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/src/org/jboss/beans/validation/test/MyBean1.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java 2011-05-14 00:47:49 UTC (rev 31316) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java 2011-05-14 00:49:49 UTC (rev 31317) @@ -22,15 +22,19 @@ public static Test suite() { // it could be done here because it is not needed to be enabled back JavaModelManager.getIndexManager().disable(); - + TestSuite suiteAll = new TestSuite("CDI Config Core Tests"); - suiteAll.addTestSuite(ExtensionTest.class); - suiteAll.addTestSuite(SeamDefinitionsTest.class); - suiteAll.addTestSuite(SeamBeansTest.class); + TestSuite suiteCore = new TestSuite("CDI Config Model Tests"); + suiteCore.addTestSuite(ExtensionTest.class); + suiteCore.addTestSuite(SeamDefinitionsTest.class); + suiteCore.addTestSuite(SeamBeansTest.class); + suiteAll.addTest(new SeamConfigTestSetup(suiteCore)); - SeamConfigTestSetup suite = new SeamConfigTestSetup(suiteAll); + TestSuite suiteValidation = new TestSuite("CDI Config Validation Tests"); + suiteValidation.addTestSuite(SeamConfigValidationTest.class); + suiteAll.addTest(new SeamConfigValidationTestSetup(suiteValidation)); - return suite; + return suiteAll; } } Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java 2011-05-14 00:49:49 UTC (rev 31317) @@ -0,0 +1,121 @@ +/******************************************************************************* + * Copyright (c) 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.cdi.seam.config.core.test; + +import java.text.MessageFormat; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.ICDIProject; +import org.jboss.tools.cdi.seam.config.core.validation.SeamConfigValidationMessages; +import org.jboss.tools.test.util.ResourcesUtils; +import org.jboss.tools.tests.AbstractResourceMarkerTest; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class SeamConfigValidationTest extends TestCase { + protected static String PLUGIN_ID = "org.jboss.tools.cdi.seam.config.core.test"; + protected static String PROJECT_NAME = "CDIConfigValidationTest"; + protected static String PROJECT_PATH = "/projects/CDIConfigValidationTest"; + + protected IProject project; + protected ICDIProject cdiProject; + IFile f; + + public SeamConfigValidationTest() { + project = getTestProject(); + cdiProject = CDICorePlugin.getCDIProject(project, false); + f = project.getFile("src/META-INF/beans.xml"); + assertTrue(f.exists()); + } + + public IProject getTestProject() { + if(project==null) { + try { + project = findTestProject(); + if(project==null || !project.exists()) { + project = ResourcesUtils.importProject(PLUGIN_ID, PROJECT_PATH); + } + } catch (Exception e) { + e.printStackTrace(); + fail("Can't import CDI test project: " + e.getMessage()); + } + } + return project; + } + + public static IProject findTestProject() { + return ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME); + } + + public void testBeanResolution() throws CoreException { + assertMarkerIsCreated(f, MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_TYPE, "v:MyBean2"), 8); + assertMarkerIsNotCreated(f, MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_TYPE, "v:MyBean1")); + } + + public void testFieldResolution() throws CoreException { + assertMarkerIsCreated(f, MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_MEMBER, "param"), 21); + assertMarkerIsNotCreated(f, MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_MEMBER, "value"), 28); + } + + public void testMethodResolution() throws CoreException { + //It is unresolved member because no member with that name is found. + assertMarkerIsCreated(f, MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_MEMBER, "v:method2"), 38); + + assertMarkerIsNotCreated(f, MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_MEMBER, "v:method1"), 34); + assertMarkerIsNotCreated(f, MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_METHOD, "v:method1"), 34); + + assertMarkerIsNotCreated(f, MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_MEMBER, "v:method1"), 42); + assertMarkerIsNotCreated(f, MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_METHOD, "v:method1"), 42); + + assertMarkerIsCreated(f, MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_METHOD, "v:method1"), 47); + } + + public void testAnnotationMemberResolution() throws CoreException { + assertMarkerIsCreated(f, MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_MEMBER, "v:field3"), 15); + assertMarkerIsNotCreated(f, MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_MEMBER, "v:field1")); + } + + protected static void assertMarkerIsCreated(IResource resource, String pattern, int... expectedLines) throws CoreException { + assertMarkerIsCreated(resource, pattern, true, expectedLines); + } + + protected static void assertMarkerIsCreated(IResource resource, String message, boolean pattern, int... expectedLines) throws CoreException { + AbstractResourceMarkerTest.assertMarkerIsCreated(resource, AbstractResourceMarkerTest.MARKER_TYPE, pattern?convertMessageToPatern(message):message, pattern, expectedLines); + } + + protected static void assertMarkerIsNotCreated(IResource resource, String message) throws CoreException { + AbstractResourceMarkerTest.assertMarkerIsNotCreated(resource, AbstractResourceMarkerTest.MARKER_TYPE, convertMessageToPatern(message)); + } + + protected static void assertMarkerIsNotCreated(IResource resource, String message, int expectedLine) throws CoreException { + AbstractResourceMarkerTest.assertMarkerIsNotCreated(resource, AbstractResourceMarkerTest.MARKER_TYPE, convertMessageToPatern(message), expectedLine); + } + + protected static void assertMarkerIsCreatedForGivenPosition(IResource resource, String message, int lineNumber, int startPosition, int endPosition) throws CoreException { + AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(resource, AbstractResourceMarkerTest.MARKER_TYPE, convertMessageToPatern(message), lineNumber, startPosition, endPosition); + } + + protected static String convertMessageToPatern(String message) { + return message.replace("[", "\\[").replace("]", "\\]").replace("<", "\\<").replace(">", "\\>").replace("(", "\\(").replace(")", "\\)") + .replace("{", "\\{").replace("}", "\\}").replace("'", "\\'"); + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTestSetup.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTestSetup.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTestSetup.java 2011-05-14 00:49:49 UTC (rev 31317) @@ -0,0 +1,48 @@ +/******************************************************************************* + * Copyright (c) 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.cdi.seam.config.core.test; + +import junit.extensions.TestSetup; +import junit.framework.Test; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; + +/** + * @author Viacheslav Kabanovich + */ +public class SeamConfigValidationTestSetup extends TestSetup { + + protected IProject project; + + public SeamConfigValidationTestSetup(Test test) { + super(test); + } + + @Override + protected void setUp() throws Exception { + project = ResourcesPlugin.getWorkspace().getRoot().getProject(SeamConfigValidationTest.PROJECT_NAME); + if(project == null || !project.exists()) { + project = ResourcesUtils.importProject(SeamConfigValidationTest.PLUGIN_ID, SeamConfigValidationTest.PROJECT_PATH); + } + } + + @Override + protected void tearDown() throws Exception { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + JobUtils.waitForIdle(); + project.delete(true, true, null); + JobUtils.waitForIdle(); + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTestSetup.java ___________________________________________________________________ Added: svn:mime-type + text/plain