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

Author: scabanovich Date: 2010-06-23 10:43:27 -0400 (Wed, 23 Jun 2010) New Revision: 22954 Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.classpath trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.project trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.settings/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.settings/org.eclipse.jdt.core.prefs trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.settings/org.jboss.tools.seam.core.prefs trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/bin/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/lib/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/lib/jboss-seam.jar trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/src/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/src/test/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/src/test/MyBean1.java trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/.classpath trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/.project trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/.settings/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/.settings/org.eclipse.jdt.core.prefs trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/bin/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/lib/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/lib/jboss-seam.jar trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/src/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/src/test/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/src/test/MyBean2.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/CyclicDependingProjectsTest.java Log: https://jira.jboss.org/browse/JBIDE-6519 Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.classpath =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.classpath (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.classpath 2010-06-23 14:43:27 UTC (rev 22954) @@ -0,0 +1,8 @@ +<?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/J2SE-1.5"/> + <classpathentry kind="lib" path="lib/jboss-seam.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/CycleTest2"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.project =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.project (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.project 2010-06-23 14:43:27 UTC (rev 22954) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>CycleTest1</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <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.seam.core.seambuilder</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.seam.core.seamnature</nature> + </natures> +</projectDescription> Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.settings/org.eclipse.jdt.core.prefs 2010-06-23 14:43:27 UTC (rev 22954) @@ -0,0 +1,12 @@ +#Wed Jun 23 18:23:09 MSD 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.5 +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.5 Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.settings/org.jboss.tools.seam.core.prefs =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.settings/org.jboss.tools.seam.core.prefs (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.settings/org.jboss.tools.seam.core.prefs 2010-06-23 14:43:27 UTC (rev 22954) @@ -0,0 +1,16 @@ +#Wed Jun 23 18:47:03 MSD 2010 +action.package=org.domain.test1.session +action.sources=/CycleTest1/src +eclipse.preferences.version=1 +model.package=org.domain.test1.entity +model.sources=/CycleTest1/src +seam.ejb.project=CycleTest1 +seam.project.deployment.type=war +seam.project.settings.version=1.1 +seam.project.web.root.folder=/Test1 +seam.runtime.name=jboss-seam-2.0.0.CR2 +seam.settings.changed.by.user=true +seam.test.creating=false +seam.test.project=CycleTest1 +test.package=org.domain.test1.test +test.sources=/CycleTest1/src Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/.settings/org.jboss.tools.seam.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/lib/jboss-seam.jar =================================================================== (Binary files differ) Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/lib/jboss-seam.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/src/test/MyBean1.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/src/test/MyBean1.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/src/test/MyBean1.java 2010-06-23 14:43:27 UTC (rev 22954) @@ -0,0 +1,8 @@ +package test; + +import org.jboss.seam.annotations.Name; + +(a)Name(&quot;test.bean1&quot;) +public class MyBean1 { + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest1/src/test/MyBean1.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/.classpath =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/.classpath (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/.classpath 2010-06-23 14:43:27 UTC (rev 22954) @@ -0,0 +1,8 @@ +<?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/J2SE-1.5"/> + <classpathentry kind="lib" path="lib/jboss-seam.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/CycleTest1"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/.project =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/.project (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/.project 2010-06-23 14:43:27 UTC (rev 22954) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>CycleTest2</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <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.seam.core.seambuilder</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.seam.core.seamnature</nature> + </natures> +</projectDescription> Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/.settings/org.eclipse.jdt.core.prefs 2010-06-23 14:43:27 UTC (rev 22954) @@ -0,0 +1,12 @@ +#Wed Jun 23 18:23:25 MSD 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.5 +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.5 Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/lib/jboss-seam.jar =================================================================== (Binary files differ) Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/lib/jboss-seam.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/src/test/MyBean2.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/src/test/MyBean2.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/src/test/MyBean2.java 2010-06-23 14:43:27 UTC (rev 22954) @@ -0,0 +1,8 @@ +package test; + +import org.jboss.seam.annotations.Name; + +(a)Name(&quot;test.bean2&quot;) +public class MyBean2 { + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/CycleTest2/src/test/MyBean2.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/CyclicDependingProjectsTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/CyclicDependingProjectsTest.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/CyclicDependingProjectsTest.java 2010-06-23 14:43:27 UTC (rev 22954) @@ -0,0 +1,101 @@ +/******************************************************************************* + * Copyright (c) 2007 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.seam.core.test; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.seam.core.ISeamComponent; +import org.jboss.tools.seam.core.ISeamProject; +import org.jboss.tools.seam.internal.core.SeamProject; +import org.jboss.tools.test.util.JUnitUtils; +import org.jboss.tools.test.util.JobUtils; + +/** + * Test that Seam builder works for projects that set cyclic dependency in build paths. + + * @author Viacheslav Kabanovich + * + */ +public class CyclicDependingProjectsTest extends TestCase { + static String BUNDLE = "org.jboss.tools.seam.core.test"; + IProject project1; + TestProjectProvider provider1; + IProject project2; + TestProjectProvider provider2; + + protected void setUp() throws Exception { + provider1 = new TestProjectProvider(BUNDLE,"/projects/CycleTest1" , "CycleTest1", true); + project1 = provider1.getProject(); + provider2 = new TestProjectProvider(BUNDLE,"/projects/CycleTest2" , "CycleTest2", true); + project2 = provider1.getProject(); + + JobUtils.waitForIdle(); + //To ensure that the project is built. + project1.build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor()); + project2.build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor()); + JobUtils.waitForIdle(); + } + + public void testCyclicDependingProjects() { + ISeamProject sp1 = getSeamProject1(); + + assertNotNull(sp1.getComponent("test.bean1")); + assertNotNull(sp1.getComponent("test.bean1")); + + ISeamProject sp2 = getSeamProject2(); + + assertNotNull(sp2.getComponent("test.bean1")); + assertNotNull(sp2.getComponent("test.bean1")); + } + + + private ISeamProject getSeamProject1() { + ISeamProject seamProject = null; + try { + seamProject = (ISeamProject)project1.getNature(SeamProject.NATURE_ID); + } catch (Exception e) { + JUnitUtils.fail("Cannot get seam nature.",e); + } + assertNotNull("Seam project is null", seamProject); + return seamProject; + } + + private ISeamProject getSeamProject2() { + ISeamProject seamProject = null; + try { + seamProject = (ISeamProject)project2.getNature(SeamProject.NATURE_ID); + } catch (Exception e) { + JUnitUtils.fail("Cannot get seam nature.",e); + } + assertNotNull("Seam project is null", seamProject); + return seamProject; + } + + @Override + protected void tearDown() throws Exception { + ISeamProject sp1 = getSeamProject1(); + SeamProject impl1 = (SeamProject)sp1; + if(impl1 != null) impl1.clearStorage(); + + ISeamProject sp2 = getSeamProject2(); + SeamProject impl2 = (SeamProject)sp2; + if(impl2 != null) impl2.clearStorage(); + + JobUtils.waitForIdle(); + provider1.dispose(); + provider2.dispose(); + } + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/CyclicDependingProjectsTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain