[jbosstools-commits] JBoss Tools SVN: r30777 - in trunk/jst/tests/org.jboss.tools.jst.web.kb.test: projects and 5 other directories.

Author: scabanovich Date: 2011-04-22 15:22:49 -0400 (Fri, 22 Apr 2011) New Revision: 30777 Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.classpath trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.project trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/.jsdtscope trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.jdt.core.prefs trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.wst.common.component trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/JavaSource/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/WEB-INF/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/WEB-INF/classes/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/WEB-INF/lib/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/WEB-INF/taglib2.tld trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/WEB-INF/web.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/facelet-taglib.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbMockModelTest.java Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/plugin.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java Log: JBIDE-8776 https://issues.jboss.org/browse/JBIDE-8776 Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/plugin.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/plugin.xml 2011-04-22 19:22:12 UTC (rev 30776) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/plugin.xml 2011-04-22 19:22:49 UTC (rev 30777) @@ -11,4 +11,13 @@ </validator> </extension> + <extension + id="org.jboss.tools.jsf.KbRequire" + point="org.jboss.tools.jst.web.kb.KbRequire"> + <require + description="%KB_REQUIRED_FOR_FACET" + forNature="org.eclipse.wst.common.project.facet.core.nature"> + </require> + </extension> + </plugin> \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.classpath =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.classpath (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.classpath 2011-04-22 19:22:49 UTC (rev 30777) @@ -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.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime"> + <attributes> + <attribute name="owner.project.facets" value="jst.web"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> + <attributes> + <attribute name="owner.project.facets" value="jst.java"/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> +</classpath> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.project =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.project (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.project 2011-04-22 19:22:49 UTC (rev 30777) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>TestKbModel3</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <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> + </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.eclipse.wst.common.project.facet.core.nature</nature> + </natures> +</projectDescription> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/.jsdtscope =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/.jsdtscope (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/.jsdtscope 2011-04-22 19:22:49 UTC (rev 30777) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <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/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.jdt.core.prefs 2011-04-22 19:22:49 UTC (rev 30777) @@ -0,0 +1,7 @@ +#Thu Jun 04 11:17:46 MSD 2009 +eclipse.preferences.version=1 +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 Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.wst.common.component 2011-04-22 19:22:49 UTC (rev 30777) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> +<wb-module deploy-name="TestKbModel3"> +<wb-resource deploy-path="/" source-path="/WebContent"/> +<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> +<property name="context-root" value="TestKbModel3"/> +<property name="java-output-path"/> +</wb-module> +</project-modules> Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-04-22 19:22:49 UTC (rev 30777) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="JBoss 4.2 Runtime"/> + <fixed facet="jst.web"/> + <fixed facet="jst.java"/> + <installed facet="jst.java" version="6.0"/> + <installed facet="jst.web" version="2.5"/> +</faceted-project> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-04-22 19:22:49 UTC (rev 30777) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-04-22 19:22:49 UTC (rev 30777) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/WEB-INF/taglib2.tld =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/WEB-INF/taglib2.tld (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/WEB-INF/taglib2.tld 2011-04-22 19:22:49 UTC (rev 30777) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" + "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"> +<taglib> + <tlib-version>1.0</tlib-version> + <jsp-version>1.2</jsp-version> + <short-name>taglib2</short-name> + <uri>taglib2</uri> + <tag> + <name>tagA</name> + <tag-class>com.TagA</tag-class> + <body-content>empty</body-content> + <description>Tag A</description> + </tag> +</taglib> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/WEB-INF/taglib2.tld ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/WEB-INF/web.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/WEB-INF/web.xml 2011-04-22 19:22:49 UTC (rev 30777) @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <display-name>TestKbModel3</display-name> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/WEB-INF/web.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/facelet-taglib.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/facelet-taglib.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/facelet-taglib.xml 2011-04-22 19:22:49 UTC (rev 30777) @@ -0,0 +1,17 @@ +<?xml version="1.0"?> +<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" + "facelet-taglib_1_0.dtd"> +<facelet-taglib> + <namespace>facelet_taglib</namespace> + <tag> + <tag-name>tag1</tag-name> + <handler-class/> + </tag> + <tag> + <tag-name>tag2</tag-name> + <component> + <component-type>ctype1</component-type> + <handler-class/> + </component> + </tag> +</facelet-taglib> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel3/WebContent/facelet-taglib.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2011-04-22 19:22:12 UTC (rev 30776) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2011-04-22 19:22:49 UTC (rev 30777) @@ -27,6 +27,7 @@ suite.addTestSuite(KbModelStorageTest.class); suite.addTestSuite(KbModelTest.class); suite.addTestSuite(MyFacesKbModelTest.class); + suite.addTestSuite(KbMockModelTest.class); suite.addTestSuite(MyFacesKbModelWithMetadataInSourcesTest.class); suite.addTestSuite(WebKbTest.class); ProjectImportTestSetup testSetup = new XProjectImportTestSetUp(suite, Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbMockModelTest.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbMockModelTest.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbMockModelTest.java 2011-04-22 19:22:49 UTC (rev 30777) @@ -0,0 +1,72 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jst.web.kb.test; + +import java.lang.reflect.Method; +import java.util.List; + +import junit.framework.TestCase; + +import org.eclipse.core.internal.events.InternalBuilder; +import org.eclipse.core.resources.IBuildConfiguration; +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.jst.web.kb.IKbProject; +import org.jboss.tools.jst.web.kb.KbProjectFactory; +import org.jboss.tools.jst.web.kb.WebKbPlugin; +import org.jboss.tools.jst.web.kb.internal.KbProject; +import org.jboss.tools.jst.web.kb.internal.scanner.LoadedDeclarations; +import org.jboss.tools.jst.web.kb.internal.scanner.ScannerException; +import org.jboss.tools.jst.web.kb.internal.scanner.XMLScanner; +import org.jboss.tools.jst.web.kb.taglib.ITagLibrary; +import org.jboss.tools.test.util.JUnitUtils; +import org.jboss.tools.test.util.JobUtils; + +public class KbMockModelTest extends TestCase { + + IProject project = null; + boolean makeCopy = true; + + public KbMockModelTest() { + super("Kb Model Test"); + } + + public void setUp() throws Exception { + project = ResourcesPlugin.getWorkspace().getRoot().getProject("TestKbModel3"); + assertNotNull("Can't load TestKbModel3", project); //$NON-NLS-1$ + } + + public void testInternalMethod() throws Exception { + //see KbProjectFactory.setProjectToBuilder + Method m = InternalBuilder.class.getDeclaredMethod("setBuildConfig", new Class[]{IBuildConfiguration.class}); + assertNotNull(m); + } + + public void testMockModel() { + IKbProject kbProject = KbProjectFactory.getKbProject(project, true, true); + assertNull(kbProject); + + boolean b = KbProject.checkKBBuilderInstalled(project); + assertFalse(b); + + JobUtils.waitForIdle(2000); + kbProject = KbProjectFactory.getKbProject(project, true, false); + assertNotNull(kbProject); + + ITagLibrary[] ls = kbProject.getTagLibraries(); + + assertTrue(ls.length > 0); + } + +} \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbMockModelTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain