July 2009 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r16848 - in workspace/snjeza/cont: container and 36 other directories.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2009-07-28 17:05:36 -0400 (Tue, 28 Jul 2009) New Revision: 16848 Added: workspace/snjeza/cont/container/ workspace/snjeza/cont/container/pom.xml workspace/snjeza/cont/container/prj-ear/ workspace/snjeza/cont/container/prj-ear/pom.xml workspace/snjeza/cont/container/prj-ejb/ workspace/snjeza/cont/container/prj-ejb/ejbModule/ workspace/snjeza/cont/container/prj-ejb/ejbModule/META-INF/ workspace/snjeza/cont/container/prj-ejb/ejbModule/META-INF/MANIFEST.MF workspace/snjeza/cont/container/prj-ejb/main/ workspace/snjeza/cont/container/prj-ejb/main/java/ workspace/snjeza/cont/container/prj-ejb/main/java/META-INF/ workspace/snjeza/cont/container/prj-ejb/main/java/META-INF/MANIFEST.MF workspace/snjeza/cont/container/prj-ejb/main/java/META-INF/ejb-jar.xml workspace/snjeza/cont/container/prj-ejb/pom.xml workspace/snjeza/cont/container/prj-ejb/src/ workspace/snjeza/cont/container/prj-ejb/src/main/ workspace/snjeza/cont/container/prj-ejb/src/main/java/ workspace/snjeza/cont/container/prj-ejb/src/main/java/org/ workspace/snjeza/cont/container/prj-ejb/src/main/java/org/sample/ workspace/snjeza/cont/container/prj-ejb/src/main/java/org/sample/App.java workspace/snjeza/cont/container/prj-ejb/src/test/ workspace/snjeza/cont/container/prj-ejb/src/test/java/ workspace/snjeza/cont/container/prj-ejb/src/test/java/org/ workspace/snjeza/cont/container/prj-ejb/src/test/java/org/sample/ workspace/snjeza/cont/container/prj-ejb/src/test/java/org/sample/AppTest.java workspace/snjeza/cont/container/prj-jar/ workspace/snjeza/cont/container/prj-jar/.classpath workspace/snjeza/cont/container/prj-jar/pom.xml workspace/snjeza/cont/container/prj-jar/src/ workspace/snjeza/cont/container/prj-jar/src/main/ workspace/snjeza/cont/container/prj-jar/src/main/java/ workspace/snjeza/cont/container/prj-jar/src/main/java/META-INF/ workspace/snjeza/cont/container/prj-jar/src/main/java/META-INF/MANIFEST.MF workspace/snjeza/cont/container/prj-jar/src/main/java/org/ workspace/snjeza/cont/container/prj-jar/src/main/java/org/sample/ workspace/snjeza/cont/container/prj-jar/src/main/java/org/sample/App.java workspace/snjeza/cont/container/prj-jar/src/test/ workspace/snjeza/cont/container/prj-jar/src/test/java/ workspace/snjeza/cont/container/prj-jar/src/test/java/org/ workspace/snjeza/cont/container/prj-jar/src/test/java/org/sample/ workspace/snjeza/cont/container/prj-jar/src/test/java/org/sample/AppTest.java workspace/snjeza/cont/container/src/ workspace/snjeza/cont/container/src/main/ workspace/snjeza/cont/container/src/main/java/ workspace/snjeza/cont/container/src/main/java/org/ workspace/snjeza/cont/container/src/main/java/org/sample/ workspace/snjeza/cont/container/src/main/java/org/sample/App.java workspace/snjeza/cont/container/src/test/ workspace/snjeza/cont/container/src/test/java/ workspace/snjeza/cont/container/src/test/java/org/ workspace/snjeza/cont/container/src/test/java/org/sample/ workspace/snjeza/cont/container/src/test/java/org/sample/AppTest.java Log: Added: workspace/snjeza/cont/container/pom.xml =================================================================== --- workspace/snjeza/cont/container/pom.xml (rev 0) +++ workspace/snjeza/cont/container/pom.xml 2009-07-28 21:05:36 UTC (rev 16848) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.sample</groupId> + <artifactId>container</artifactId> + <packaging>pom</packaging> + <version>1.0-SNAPSHOT</version> + <name>container</name> + <url>http://maven.apache.org</url> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> + </dependency> + </dependencies> + <modules> + <module>prj-ejb</module> + <module>prj-jar</module> + <module>prj-ear</module> + </modules> +</project> \ No newline at end of file Added: workspace/snjeza/cont/container/prj-ear/pom.xml =================================================================== --- workspace/snjeza/cont/container/prj-ear/pom.xml (rev 0) +++ workspace/snjeza/cont/container/prj-ear/pom.xml 2009-07-28 21:05:36 UTC (rev 16848) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>container</artifactId> + <groupId>org.sample</groupId> + <version>1.0-SNAPSHOT</version> + </parent> + <groupId>org.sample</groupId> + <artifactId>prj-ear</artifactId> + <packaging>ear</packaging> + <version>1.0-SNAPSHOT</version> + <name>prj-ear</name> + <url>http://maven.apache.org</url> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <generateApplicationXml>true</generateApplicationXml> + <version>5</version> + <includeLibInApplicationXml>true</includeLibInApplicationXml> + <defaultLibBundleDir>lib</defaultLibBundleDir> + <jboss> + <version>5</version> + <module-order>strict</module-order> + </jboss> + <modules> + <ejbModule> + <groupId>org.sample</groupId> + <artifactId>prj-ejb</artifactId> + </ejbModule> + </modules> + </configuration> + <executions> + <execution> + <id>generate-application-xml</id> + <goals> + <goal>generate-application-xml</goal> + </goals> + </execution> + <execution> + <id>ear</id> + <goals> + <goal>ear</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + + <dependencies> + <dependency> + <artifactId>prj-jar</artifactId> + <groupId>org.sample</groupId> + <version>1.0-SNAPSHOT</version> + <type>jar</type> + </dependency> + <dependency> + <artifactId>prj-ejb</artifactId> + <groupId>org.sample</groupId> + <version>1.0-SNAPSHOT</version> + <type>ejb</type> + </dependency> + </dependencies> +</project> Added: workspace/snjeza/cont/container/prj-ejb/ejbModule/META-INF/MANIFEST.MF =================================================================== --- workspace/snjeza/cont/container/prj-ejb/ejbModule/META-INF/MANIFEST.MF (rev 0) +++ workspace/snjeza/cont/container/prj-ejb/ejbModule/META-INF/MANIFEST.MF 2009-07-28 21:05:36 UTC (rev 16848) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: workspace/snjeza/cont/container/prj-ejb/main/java/META-INF/MANIFEST.MF =================================================================== --- workspace/snjeza/cont/container/prj-ejb/main/java/META-INF/MANIFEST.MF (rev 0) +++ workspace/snjeza/cont/container/prj-ejb/main/java/META-INF/MANIFEST.MF 2009-07-28 21:05:36 UTC (rev 16848) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: workspace/snjeza/cont/container/prj-ejb/main/java/META-INF/ejb-jar.xml =================================================================== --- workspace/snjeza/cont/container/prj-ejb/main/java/META-INF/ejb-jar.xml (rev 0) +++ workspace/snjeza/cont/container/prj-ejb/main/java/META-INF/ejb-jar.xml 2009-07-28 21:05:36 UTC (rev 16848) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ejb-jar version="3.0" 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/ejb-jar_3_0.xsd"> + <display-name> +prj-ejb </display-name> + </ejb-jar> \ No newline at end of file Added: workspace/snjeza/cont/container/prj-ejb/pom.xml =================================================================== --- workspace/snjeza/cont/container/prj-ejb/pom.xml (rev 0) +++ workspace/snjeza/cont/container/prj-ejb/pom.xml 2009-07-28 21:05:36 UTC (rev 16848) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>container</artifactId> + <groupId>org.sample</groupId> + <version>1.0-SNAPSHOT</version> + </parent> + <groupId>org.sample</groupId> + <artifactId>prj-ejb</artifactId> + <packaging>ejb</packaging> + <version>1.0-SNAPSHOT</version> + <name>prj-ejb</name> + <url>http://maven.apache.org</url> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ejb-plugin</artifactId> + <version>2.1</version> + <configuration> + <ejbVersion>3.0</ejbVersion> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <artifactId>prj-jar</artifactId> + <groupId>org.sample</groupId> + <version>1.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.10</version> + <type>jar</type> + <scope>runtime</scope> + </dependency> + </dependencies> +</project> Added: workspace/snjeza/cont/container/prj-ejb/src/main/java/org/sample/App.java =================================================================== --- workspace/snjeza/cont/container/prj-ejb/src/main/java/org/sample/App.java (rev 0) +++ workspace/snjeza/cont/container/prj-ejb/src/main/java/org/sample/App.java 2009-07-28 21:05:36 UTC (rev 16848) @@ -0,0 +1,13 @@ +package org.sample; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} Added: workspace/snjeza/cont/container/prj-ejb/src/test/java/org/sample/AppTest.java =================================================================== --- workspace/snjeza/cont/container/prj-ejb/src/test/java/org/sample/AppTest.java (rev 0) +++ workspace/snjeza/cont/container/prj-ejb/src/test/java/org/sample/AppTest.java 2009-07-28 21:05:36 UTC (rev 16848) @@ -0,0 +1,38 @@ +package org.sample; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} Added: workspace/snjeza/cont/container/prj-jar/.classpath =================================================================== --- workspace/snjeza/cont/container/prj-jar/.classpath (rev 0) +++ workspace/snjeza/cont/container/prj-jar/.classpath 2009-07-28 21:05:36 UTC (rev 16848) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"> + <attributes> + <attribute name="owner.project.facets" value="jboss.m2"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Added: workspace/snjeza/cont/container/prj-jar/pom.xml =================================================================== --- workspace/snjeza/cont/container/prj-jar/pom.xml (rev 0) +++ workspace/snjeza/cont/container/prj-jar/pom.xml 2009-07-28 21:05:36 UTC (rev 16848) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>container</artifactId> + <groupId>org.sample</groupId> + <version>1.0-SNAPSHOT</version> + </parent> + <groupId>org.sample</groupId> + <artifactId>prj-jar</artifactId> + <packaging>jar</packaging> + <version>1.0-SNAPSHOT</version> + <name>prj-jar</name> + <url>http://maven.apache.org</url> + + <build> + <plugins> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-core</artifactId> + <version>5.0.1</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + </dependencies> +</project> Added: workspace/snjeza/cont/container/prj-jar/src/main/java/META-INF/MANIFEST.MF =================================================================== --- workspace/snjeza/cont/container/prj-jar/src/main/java/META-INF/MANIFEST.MF (rev 0) +++ workspace/snjeza/cont/container/prj-jar/src/main/java/META-INF/MANIFEST.MF 2009-07-28 21:05:36 UTC (rev 16848) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: workspace/snjeza/cont/container/prj-jar/src/main/java/org/sample/App.java =================================================================== --- workspace/snjeza/cont/container/prj-jar/src/main/java/org/sample/App.java (rev 0) +++ workspace/snjeza/cont/container/prj-jar/src/main/java/org/sample/App.java 2009-07-28 21:05:36 UTC (rev 16848) @@ -0,0 +1,13 @@ +package org.sample; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} Added: workspace/snjeza/cont/container/prj-jar/src/test/java/org/sample/AppTest.java =================================================================== --- workspace/snjeza/cont/container/prj-jar/src/test/java/org/sample/AppTest.java (rev 0) +++ workspace/snjeza/cont/container/prj-jar/src/test/java/org/sample/AppTest.java 2009-07-28 21:05:36 UTC (rev 16848) @@ -0,0 +1,38 @@ +package org.sample; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} Added: workspace/snjeza/cont/container/src/main/java/org/sample/App.java =================================================================== --- workspace/snjeza/cont/container/src/main/java/org/sample/App.java (rev 0) +++ workspace/snjeza/cont/container/src/main/java/org/sample/App.java 2009-07-28 21:05:36 UTC (rev 16848) @@ -0,0 +1,13 @@ +package org.sample; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} Added: workspace/snjeza/cont/container/src/test/java/org/sample/AppTest.java =================================================================== --- workspace/snjeza/cont/container/src/test/java/org/sample/AppTest.java (rev 0) +++ workspace/snjeza/cont/container/src/test/java/org/sample/AppTest.java 2009-07-28 21:05:36 UTC (rev 16848) @@ -0,0 +1,38 @@ +package org.sample; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +}

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r16847 - workspace/snjeza.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2009-07-28 17:03:49 -0400 (Tue, 28 Jul 2009) New Revision: 16847 Added: workspace/snjeza/cont/ Log: Initial import.

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r16846 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent: resources/ru/img/1.0 and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2009-07-28 12:12:45 -0400 (Tue, 28 Jul 2009) New Revision: 16846 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/1.0/img.gif/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/1.0/img.gif/1.gif trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/1.0/img.gif/2.gif Removed: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/1.0/img_1.gif trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/1.0/img_2.gif Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml.xml Log: https://jira.jboss.org/jira/browse/JBIDE-2550, test case has been adjusted Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml 2009-07-28 16:06:26 UTC (rev 16845) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml 2009-07-28 16:12:45 UTC (rev 16846) @@ -30,10 +30,10 @@ <h:outputLabel value="resource['ru/img/2.0/img.gif']" /> <h:graphicImage value="#{resource['ru/img/2.0/img.gif']}" /> - <h:outputLabel value="resource['ru/img/1.0/img.gif/1']" /> - <h:graphicImage value="#{resource['ru/img/1.0/img.gif/1']}" /> + <h:outputLabel value="resource['ru/img/1.0:img.gif/1.gif']" /> + <h:graphicImage value="#{resource['ru/img/1.0:img.gif/1.gif']}" /> <h:outputLabel value="resource['ru/img/1.0/img.gif/2.gif']" /> - <h:graphicImage value="#{resource['ru/img/1.0/img.gif/2.gif']}" /> + <h:graphicImage value="#{resource['ru/img/1.0:img.gif/2.gif']}" /> <h:outputLabel value="resource['ru/img/img.gif']" /> <h:graphicImage value="#{resource['ru/img/img.gif']}" /> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml.xml 2009-07-28 16:06:26 UTC (rev 16845) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml.xml 2009-07-28 16:12:45 UTC (rev 16846) @@ -1,6 +1,6 @@ <tests> <test id="jbide2550"> - <TABLE BORDER="2" STYLE="-moz-user-modify: read-write;" > + <TABLE BORDER="2" STYLE="-moz-user-modify: read-write;"> <TBODY> <TR> <TD> @@ -9,7 +9,7 @@ </LABEL> </TD> <TD> -<IMG SRC="/.*/jsf2test/WebContent/resources/img/img.gif/" STYLE="-moz-user-modify: read-write;"/> +<IMG SRC="/.*jsf2test/WebContent/resources/img/img.gif/" STYLE="-moz-user-modify: read-write;"/> </TD> </TR> @@ -20,7 +20,7 @@ </LABEL> </TD> <TD> -<IMG SRC="/.*/jsf2test/WebContent/resources/ch/img/1.0/img.gif/" STYLE="-moz-user-modify: read-write;"/> +<IMG SRC="/.*jsf2test/WebContent/resources/ch/img/1.0/img.gif/" STYLE="-moz-user-modify: read-write;"/> </TD> </TR> @@ -31,7 +31,7 @@ </LABEL> </TD> <TD> -<IMG SRC="/.*/jsf2test/WebContent/resources/ch/img/2.0/img.gif/" STYLE="-moz-user-modify: read-write;"/> +<IMG SRC="/.*jsf2test/WebContent/resources/ch/img/2.0/img.gif/" STYLE="-moz-user-modify: read-write;"/> </TD> </TR> @@ -42,7 +42,7 @@ </LABEL> </TD> <TD> -<IMG SRC="/.*/ve/unresolved_image.gif/" STYLE="-moz-user-modify: read-write;"/> +<IMG SRC="/.*jsf2test/WebContent/resources/ru/img/1.0/img.gif/" STYLE="-moz-user-modify: read-write;"/> </TD> </TR> @@ -53,18 +53,18 @@ </LABEL> </TD> <TD> -<IMG SRC="/.*/jsf2test/WebContent/resources/ru/img/2.0/img.gif/" STYLE="-moz-user-modify: read-write;"/> +<IMG SRC="/.*jsf2test/WebContent/resources/ru/img/2.0/img.gif/" STYLE="-moz-user-modify: read-write;"/> </TD> </TR> <TR> <TD> <LABEL> -resource['ru/img/1.0/img.gif/1'] +resource['ru/img/1.0:img.gif/1.gif'] </LABEL> </TD> <TD> -<IMG SRC="/.*/ve/unresolved_image.gif/" STYLE="-moz-user-modify: read-write;"/> +<IMG SRC="/.*jsf2test/WebContent/resources/ru/img/1.0/img.gif/1.gif/" STYLE="-moz-user-modify: read-write;"/> </TD> </TR> @@ -75,7 +75,7 @@ </LABEL> </TD> <TD> -<IMG SRC="/.*/ve/unresolved_image.gif/" STYLE="-moz-user-modify: read-write;"/> +<IMG SRC="/.*jsf2test/WebContent/resources/ru/img/1.0/img.gif/2.gif/" STYLE="-moz-user-modify: read-write;"/> </TD> </TR> @@ -86,7 +86,7 @@ </LABEL> </TD> <TD> -<IMG SRC="/.*/ve/unresolved_image.gif/" STYLE="-moz-user-modify: read-write;"/> +<IMG SRC="/.*ve/unresolved_image.gif/" STYLE="-moz-user-modify: read-write;"/> </TD> </TR> @@ -97,7 +97,7 @@ </LABEL> </TD> <TD> -<IMG SRC="/.*/jsf2test/WebContent/resources/us/img/img.gif/" STYLE="-moz-user-modify: read-write;"/> +<IMG SRC="/.*jsf2test/WebContent/resources/us/img/img.gif/" STYLE="-moz-user-modify: read-write;"/> </TD> </TR> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/1.0/img.gif/1.gif =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/1.0/img.gif/1.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/1.0/img.gif/2.gif =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/1.0/img.gif/2.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/1.0/img_1.gif =================================================================== (Binary files differ) Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/1.0/img_2.gif =================================================================== (Binary files differ)

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r16845 - workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor.

by jbosstools-commits＠lists.jboss.org

Author: yzhishko Date: 2009-07-28 12:06:26 -0400 (Tue, 28 Jul 2009) New Revision: 16845 Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java Log: Test was completed Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-07-28 14:36:29 UTC (rev 16844) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-07-28 16:06:26 UTC (rev 16845) @@ -1,12 +1,15 @@ package org.jboss.tools.vpe.ui.bot.test.editor; import java.util.List; + +import org.eclipse.jface.bindings.keys.KeyStroke; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.jboss.tools.ui.bot.test.WidgetVariables; import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; @@ -43,6 +46,7 @@ editor.navigateTo(22,22); bot.menu("Source").menu("Toggle Comment").click(); waitForJobs(); + checkSelectionBar("#comment"); checkVPE("ToggleCommentTestToggle.xml"); //Test untoggle comment from Source menu @@ -50,6 +54,7 @@ editor.navigateTo(22,22); bot.menu("Source").menu("Toggle Comment").click(); waitForJobs(); + checkSelectionBar("h:commandButton"); checkVPE("ToggleCommentTestUntoggle.xml"); //Test toggle comment with CTRL+SHIFT+C hot keys @@ -57,6 +62,7 @@ editor.navigateTo(22,22); pressToggleCommentHotKeys(); waitForJobs(); + checkSelectionBar("#comment"); checkVPE("ToggleCommentTestToggle.xml"); //Test untoggle comment with CTRL+SHIFT hot keys @@ -64,8 +70,52 @@ editor.navigateTo(22,22); pressToggleCommentHotKeys(); waitForJobs(); + checkSelectionBar("h:commandButton"); checkVPE("ToggleCommentTestUntoggle.xml"); + //Test toggle comment with three lines from Source menu + + editor.selectLine(18); + editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN)); + shortDelay(); + editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN)); + bot.menu("Source").menu("Toggle Comment").click(); + editor.navigateTo(19, 22); + waitForJobs(); + checkSelectionBar("#comment"); + checkVPE("ToggleCommentTestLinesToggle.xml"); + + //Test untoggle comment with three lines from Source menu + + editor.selectLine(18); + editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN)); + shortDelay(); + editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN)); + bot.menu("Source").menu("Toggle Comment").click(); + waitForJobs(); + checkVPE("ToggleCommentTestLinesUntoggle.xml"); + + //Test toggle comment with three lines using hot keys + + editor.selectLine(18); + editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN)); + shortDelay(); + editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN)); + pressToggleCommentHotKeys(); + waitForJobs(); + checkSelectionBar("#comment"); + checkVPE("ToggleCommentTestLinesToggle.xml"); + + //Test untoggle comment with three lines using hot keys + + editor.selectLine(18); + editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN)); + shortDelay(); + editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN)); + pressToggleCommentHotKeys(); + waitForJobs(); + checkVPE("ToggleCommentTestLinesUntoggle.xml"); + } private void checkVPE(String testPage) throws Throwable{ @@ -134,5 +184,16 @@ editor.close(); super.tearDown(); } + + @Override + protected void shortDelay() { + bot.sleep(500); + } + + private void checkSelectionBar (String... args){ + for (int i = 0; i < args.length; i++) { + bot.toolbarButton(args[i]).click(); + } + } }

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r16844 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs.

by jbosstools-commits＠lists.jboss.org

Author: sdzmitrovich Date: 2009-07-28 10:36:29 -0400 (Tue, 28 Jul 2009) New Revision: 16844 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPropertySheetControl.java Log: quick fix to solve 2 toolbars Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPropertySheetControl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPropertySheetControl.java 2009-07-28 14:30:44 UTC (rev 16843) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPropertySheetControl.java 2009-07-28 14:36:29 UTC (rev 16844) @@ -83,6 +83,7 @@ TreeItem item = createBindedTreeItem(sectionTreeItem, attribute); item.setExpanded(true); } + sectionTreeItem.setExpanded(true); } final TreeEditor editor = new TreeEditor(tree);

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r16843 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550 and 15 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2009-07-28 10:30:44 -0400 (Tue, 28 Jul 2009) New Revision: 16843 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ch/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ch/img/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ch/img/1.0/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ch/img/1.0/img.gif trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ch/img/2.0/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ch/img/2.0/img.gif trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/img/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/img/img.gif trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/1.0/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/1.0/img_1.gif trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/1.0/img_2.gif trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/2.0/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/2.0/img.gif trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/us/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/us/img/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/us/img/img.gif trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2550Test.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java Log: https://jira.jboss.org/jira/browse/JBIDE-2550, processing resources from JBIDE-2550#2.a has been added Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml 2009-07-28 14:30:44 UTC (rev 16843) @@ -0,0 +1,46 @@ +<!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> + + +<h:body> + <h:form> + <h:outputText value="JSF 2.0, Resources test Page" /> + <h:panelGrid columns="2" border="2" id="jbide2550"> + + <h:outputLabel value="resource['img:img.gif']" /> + <h:graphicImage value="#{resource['img:img.gif']}" /> + + <h:outputLabel value="resource['ch/img/1.0/img.gif']" /> + <h:graphicImage value="#{resource['ch/img/1.0/img.gif']}" /> + + <h:outputLabel value=' resource [ "ch/img/2.0:img.gif" ] ' /> + <h:graphicImage value='#{ resource [ "ch/img/2.0:img.gif" ] }' /> + + <h:outputLabel value="resource['ru/img/1.0/img.gif']" /> + <h:graphicImage value="#{resource['ru/img/1.0/img.gif']}" /> + + <h:outputLabel value="resource['ru/img/2.0/img.gif']" /> + <h:graphicImage value="#{resource['ru/img/2.0/img.gif']}" /> + + <h:outputLabel value="resource['ru/img/1.0/img.gif/1']" /> + <h:graphicImage value="#{resource['ru/img/1.0/img.gif/1']}" /> + <h:outputLabel value="resource['ru/img/1.0/img.gif/2.gif']" /> + <h:graphicImage value="#{resource['ru/img/1.0/img.gif/2.gif']}" /> + + <h:outputLabel value="resource['ru/img/img.gif']" /> + <h:graphicImage value="#{resource['ru/img/img.gif']}" /> + + <h:outputLabel value="resource['us/img/img.gif']" /> + <h:graphicImage value="#{resource['us/img/img.gif' ]}" /> + </h:panelGrid> + </h:form> +</h:body> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/2550/jbide2550.xhtml.xml 2009-07-28 14:30:44 UTC (rev 16843) @@ -0,0 +1,107 @@ +<tests> + <test id="jbide2550"> + <TABLE BORDER="2" STYLE="-moz-user-modify: read-write;" > +<TBODY> +<TR> +<TD> +<LABEL> +resource['img:img.gif'] +</LABEL> +</TD> +<TD> +<IMG SRC="/.*/jsf2test/WebContent/resources/img/img.gif/" STYLE="-moz-user-modify: read-write;"/> + +</TD> +</TR> +<TR> +<TD> +<LABEL> +resource['ch/img/1.0/img.gif'] +</LABEL> +</TD> +<TD> +<IMG SRC="/.*/jsf2test/WebContent/resources/ch/img/1.0/img.gif/" STYLE="-moz-user-modify: read-write;"/> + +</TD> +</TR> +<TR> +<TD> +<LABEL> +resource [ "ch/img/2.0:img.gif" ] +</LABEL> +</TD> +<TD> +<IMG SRC="/.*/jsf2test/WebContent/resources/ch/img/2.0/img.gif/" STYLE="-moz-user-modify: read-write;"/> + +</TD> +</TR> +<TR> +<TD> +<LABEL> +resource['ru/img/1.0/img.gif'] +</LABEL> +</TD> +<TD> +<IMG SRC="/.*/ve/unresolved_image.gif/" STYLE="-moz-user-modify: read-write;"/> + +</TD> +</TR> +<TR> +<TD> +<LABEL> +resource['ru/img/2.0/img.gif'] +</LABEL> +</TD> +<TD> +<IMG SRC="/.*/jsf2test/WebContent/resources/ru/img/2.0/img.gif/" STYLE="-moz-user-modify: read-write;"/> + +</TD> +</TR> +<TR> +<TD> +<LABEL> +resource['ru/img/1.0/img.gif/1'] +</LABEL> +</TD> +<TD> +<IMG SRC="/.*/ve/unresolved_image.gif/" STYLE="-moz-user-modify: read-write;"/> + +</TD> +</TR> +<TR> +<TD> +<LABEL> +resource['ru/img/1.0/img.gif/2.gif'] +</LABEL> +</TD> +<TD> +<IMG SRC="/.*/ve/unresolved_image.gif/" STYLE="-moz-user-modify: read-write;"/> + +</TD> +</TR> +<TR> +<TD> +<LABEL> +resource['ru/img/img.gif'] +</LABEL> +</TD> +<TD> +<IMG SRC="/.*/ve/unresolved_image.gif/" STYLE="-moz-user-modify: read-write;"/> + +</TD> +</TR> +<TR> +<TD> +<LABEL> +resource['us/img/img.gif'] +</LABEL> +</TD> +<TD> +<IMG SRC="/.*/jsf2test/WebContent/resources/us/img/img.gif/" STYLE="-moz-user-modify: read-write;"/> + +</TD> +</TR> +</TBODY> +</TABLE> + </test> +</tests> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ch/img/1.0/img.gif =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ch/img/1.0/img.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ch/img/2.0/img.gif =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ch/img/2.0/img.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/img/img.gif =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/img/img.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/1.0/img_1.gif =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/1.0/img_1.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/1.0/img_2.gif =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/1.0/img_2.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/2.0/img.gif =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ru/img/2.0/img.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/us/img/img.gif =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/us/img/img.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-07-28 14:21:06 UTC (rev 16842) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-07-28 14:30:44 UTC (rev 16843) @@ -33,6 +33,7 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2434Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2505Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2526Test; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2550Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2582Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2584Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2594Test; @@ -155,6 +156,7 @@ suite.addTestSuite(JBIDE4510Test.class); suite.addTestSuite(JBIDE4534Test.class); suite.addTestSuite(JBIDE3247Test.class); + suite.addTestSuite(JBIDE2550Test.class); // $JUnit-END$ // added by Max Areshkau // add here projects which should be imported for junit tests Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2550Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2550Test.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2550Test.java 2009-07-28 14:30:44 UTC (rev 16843) @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.vpe.jsf.test.jbide; + +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.ui.test.ComponentContentTest; + +/** + * @author mareshkau + * + */ +public class JBIDE2550Test extends ComponentContentTest { + + public JBIDE2550Test(String name) { + super(name); + } + + public void testJBIDE2550TestResourceFromWebRoot() throws Throwable{ + performContentTest("JBIDE/2550/jbide2550.xhtml"); //$NON-NLS-1$ + } + + @Override + protected String getTestProjectName() { + return JsfAllTests.IMPORT_JSF_20_PROJECT_NAME; + } + +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2009-07-28 14:21:06 UTC (rev 16842) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2009-07-28 14:30:44 UTC (rev 16843) @@ -13,6 +13,8 @@ import java.io.File; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IPath; @@ -44,7 +46,10 @@ public class VpeFunctionSrc extends VpeFunction { static final String IMG_UNRESOLVED = "unresolved_image.gif"; //$NON-NLS-1$ static final String IMG_PREFIX = "file:///"; //$NON-NLS-1$ - + private static final Pattern resourcePatternWithSinglCoat= Pattern.compile("[#\\$]\\{\\s*resource\\s*\\[\\s*'(.*)'\\s*\\]\\s*\\}"); //$NON-NLS-1$ + private static final Pattern resourcePatternWithDoableCoat= Pattern.compile("[#\\$]\\{\\s*resource\\s*\\[\\s*\"(.*)\"\\s*\\]\\s*\\}"); //$NON-NLS-1$ + + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { String tagValue = getParameter(0).exec(pageContext, sourceNode) .stringValue(); @@ -249,6 +254,16 @@ */ protected String resolveEL(VpePageContext pageContext, String value) { String resolvedValue = value.replaceFirst("^\\s*(\\#|\\$)\\{facesContext.externalContext.requestContextPath\\}", ""); //$NON-NLS-1$ //$NON-NLS-2$ + + //fix for JBIDE-2550, author Maksim Areshkau + Matcher singleCoatMatcher = resourcePatternWithSinglCoat.matcher(resolvedValue); + Matcher doubleCoatMatcher = resourcePatternWithDoableCoat.matcher(resolvedValue); + if(doubleCoatMatcher.find()) { + resolvedValue = processJSF2Resource(doubleCoatMatcher); + }else if(singleCoatMatcher.find()){ + resolvedValue = processJSF2Resource(singleCoatMatcher); + } + //Fix for JBIDE-3030 if(pageContext.getVisualBuilder().getCurrentIncludeInfo()==null || !(pageContext.getVisualBuilder().getCurrentIncludeInfo() instanceof IFile)){ @@ -259,6 +274,17 @@ resolvedValue = ElService.getInstance().replaceEl(file, resolvedValue); return resolvedValue; } + /** + * See JBIDE-2550 + * @param matcher + * @return + */ + private static final String processJSF2Resource(Matcher matcher){ + String resulString = matcher.group(1); + resulString=resulString.replaceAll(":", "/"); //$NON-NLS-1$//$NON-NLS-2$ + resulString = "/resources/"+resulString; //$NON-NLS-1$ + return resulString; + } public static String getAbsoluteResourcePath(String resourcePathInPlugin) { String pluginPath = VpePlugin.getPluginResourcePath();

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r16842 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2009-07-28 10:21:06 -0400 (Tue, 28 Jul 2009) New Revision: 16842 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-4495 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2009-07-28 12:58:28 UTC (rev 16841) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2009-07-28 14:21:06 UTC (rev 16842) @@ -132,8 +132,8 @@ assertMarkerIsCreated(jbide1631XHTMLFile, jbide1631XHTMLFile2, "\"foo1\" cannot be resolved", 16 ); assertMarkerIsCreated(project.getFile(jbide1631XHTMLFile), MARKER_TYPE, "\"foo2\" cannot be resolved", 16 ); } - - public void testComponentsValidator() { + + public void testDuplicateComponentName_Validator() { IFile bbcComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.java"); IFile statefulComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java"); IFile componentsFile = project.getFile("WebContent/WEB-INF/components.xml"); @@ -149,7 +149,6 @@ assertEquals("Problem marker was found in components.xml file", 1, number); // Duplicate component name - //System.out.println("Test - Duplicate component name"); IFile bbcComponentFile2 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.2"); try{ @@ -172,9 +171,12 @@ Integer[] lineNumbers = getMarkersNumbersOfLine(bbcComponentFile, SEAM_MARKER_FILTER); assertEquals("Problem marker has wrong line number", 7, lineNumbers[0].intValue()); - + } + + public void testStatefulComponentWithoutRemoveMethod_Validator(){ + IFile statefulComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java"); + // Stateful component does not contain @Remove method - //System.out.println("Test - Stateful component does not contain @Remove method"); IFile statefulComponentFile2 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.2"); try{ @@ -186,18 +188,22 @@ refreshProject(project); - number = getMarkersNumber(statefulComponentFile); + int number = getMarkersNumber(statefulComponentFile); assertFalse("Problem marker 'Stateful component does not contain @Remove method' not found' not found", number == 0); - messages = getMarkersMessage(statefulComponentFile, SEAM_MARKER_FILTER); + String[] messages = getMarkersMessage(statefulComponentFile, SEAM_MARKER_FILTER); assertEquals("Problem marker 'Stateful component does not contain @Remove method' not found", "Stateful component \"statefulComponent\" must have a method marked @Remove", messages[0]); - lineNumbers = getMarkersNumbersOfLine(statefulComponentFile, SEAM_MARKER_FILTER); + Integer[] lineNumbers = getMarkersNumbersOfLine(statefulComponentFile, SEAM_MARKER_FILTER); assertEquals("Problem marker has wrong line number", 16, lineNumbers[0].intValue()); - + + } + + public void testStatefulComponentWithoutDestroyMethod_Validator(){ + IFile statefulComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java"); + // Stateful component does not contain @Destroy method - //System.out.println("Test - Stateful component does not contain @Destroy method"); IFile statefulComponentFile3 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.3"); try{ @@ -209,18 +215,22 @@ refreshProject(project); - number = getMarkersNumber(statefulComponentFile); + int number = getMarkersNumber(statefulComponentFile); assertFalse("Problem marker 'Stateful component does not contain @Destroy method' not found' not found' not found", number == 0); - messages = getMarkersMessage(statefulComponentFile, SEAM_MARKER_FILTER); + String[] messages = getMarkersMessage(statefulComponentFile, SEAM_MARKER_FILTER); assertEquals("Problem marker 'Stateful component does not contain @Destroy method' not found", "Stateful component \"statefulComponent\" must have a method marked @Destroy", messages[0]); - lineNumbers = getMarkersNumbersOfLine(statefulComponentFile, SEAM_MARKER_FILTER); + Integer[] lineNumbers = getMarkersNumbersOfLine(statefulComponentFile, SEAM_MARKER_FILTER); assertEquals("Problem marker has wrong line number", 16, lineNumbers[0].intValue()); + } + + public void testStatefulComponentHasWrongScope_Validator(){ + IFile statefulComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java"); + // Stateful component has wrong scope - //System.out.println("Test - Stateful component has wrong scope"); IFile statefulComponentFile4 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.4"); try{ @@ -232,18 +242,21 @@ refreshProject(project); - number = getMarkersNumber(statefulComponentFile); + int number = getMarkersNumber(statefulComponentFile); assertFalse("Problem marker 'Stateful component has wrong scope' not found' not found' not found", number == 0); - messages = getMarkersMessage(statefulComponentFile, SEAM_MARKER_FILTER); + String[] messages = getMarkersMessage(statefulComponentFile, SEAM_MARKER_FILTER); assertEquals("Problem marker 'Stateful component has wrong scope' not found", "Stateful component \"statefulComponent\" should not have org.jboss.seam.ScopeType.PAGE, nor org.jboss.seam.ScopeType.STATELESS", messages[0]); - lineNumbers = getMarkersNumbersOfLine(statefulComponentFile, SEAM_MARKER_FILTER); + Integer[] lineNumbers = getMarkersNumbersOfLine(statefulComponentFile, SEAM_MARKER_FILTER); assertEquals("Problem marker has wrong line number", 16, lineNumbers[0].intValue()); + } + + public void testComponentType_Validator(){ + IFile componentsFile = project.getFile("WebContent/WEB-INF/components.xml"); // Component class name cannot be resolved to a type - //System.out.println("Test - Component class name cannot be resolved to a type"); IFile componentsFile2 = project.getFile("WebContent/WEB-INF/components.2"); @@ -256,18 +269,23 @@ refreshProject(project); - number = getMarkersNumber(componentsFile); + int number = getMarkersNumber(componentsFile); assertFalse("Problem marker 'Component class name cannot be resolved to a type' was not found", number == 0); - messages = getMarkersMessage(componentsFile, SEAM_MARKER_FILTER); + String[] messages = getMarkersMessage(componentsFile, SEAM_MARKER_FILTER); assertEquals("Problem marker 'Component class name cannot be resolved to a type' was not found", "\"org.domain.SeamWebWarTestProject.session.StateComponent\" cannot be resolved to a type", messages[0]); - lineNumbers = getMarkersNumbersOfLine(componentsFile, SEAM_MARKER_FILTER); + Integer[] lineNumbers = getMarkersNumbersOfLine(componentsFile, SEAM_MARKER_FILTER); assertEquals("Problem marker has wrong line number", 15, lineNumbers[0].intValue()); - + } + + public void testComponentWithoutSetter_Validator(){ + IFile statefulComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java"); + IFile componentsFile = project.getFile("WebContent/WEB-INF/components.xml"); + IFile bbcComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.java"); + // Component class does not contain setter for property - //System.out.println("Test - Component class does not contain setter for property"); IFile componentsFile3 = project.getFile("WebContent/WEB-INF/components.3"); @@ -289,13 +307,13 @@ refreshProject(project); - number = getMarkersNumber(componentsFile); + int number = getMarkersNumber(componentsFile); assertFalse("Problem marker 'Component class does not contain setter for property' not found' not found' not found", number == 0); - messages = getMarkersMessage(componentsFile, SEAM_MARKER_FILTER); + String[] messages = getMarkersMessage(componentsFile, SEAM_MARKER_FILTER); assertEquals("Problem marker 'Component class does not have a setter or a field for the property' not found", "Class \"StatefulComponent\" of component \"statefulComponent\" does not have a setter or a field for the property \"abc\"", messages[0]); - lineNumbers = getMarkersNumbersOfLine(componentsFile, SEAM_MARKER_FILTER); + Integer[] lineNumbers = getMarkersNumbersOfLine(componentsFile, SEAM_MARKER_FILTER); assertEquals("Problem marker has wrong line number", 16, lineNumbers[0].intValue()); @@ -309,14 +327,13 @@ } } - public void testEntitiesValidator() { + public void testEntityHasWrongScope_Validator() { IFile abcEntityFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/entity/abcEntity.java"); int number = getMarkersNumber(abcEntityFile); assertTrue("Problem marker was found in abcEntity.java", number == 0); // Entity component has wrong scope - //System.out.println("Test - Entity component has wrong scope"); IFile abcEntityFile2 = project.getFile("src/action/org/domain/SeamWebWarTestProject/entity/abcEntity.2"); try{ @@ -339,16 +356,13 @@ assertEquals("Problem marker has wrong line number", 15, lineNumbers[0].intValue()); } - public void testComponentLifeCycleMethodsValidator() throws CoreException { - final String TARGET_FILE_NAME - = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java"; - - IFile componentsFile = project.getFile("WebContent/WEB-INF/components.xml"); - + final String TARGET_FILE_NAME + = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java"; + + public void testDuplicateDestroyMethod_Validator() throws CoreException { final String NEW_CONTENT_FILE_NAME6 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.6"; // Duplicate @Destroy method - //System.out.println("Test - Duplicate @Destroy method"); refreshProject(project); @@ -359,9 +373,10 @@ assertMarkerIsCreated( TARGET_FILE_NAME, ".*\"destroyMethod2\"", 39); - + } + + public void testDuplicateCreateMethod_Validator() throws CoreException { // Duplicate @Create method - //System.out.println("Test - Duplicate @Create method"); final String NEW_CONTENT_FILE_NAME7 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.7"; @@ -369,9 +384,12 @@ TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME7, ".*(a)Create.*\"createMethod\".*", 36); assertMarkerIsCreated( TARGET_FILE_NAME, ".*(a)Create.*\"createMethod2\".*", 41); - + } + + public void testDuplicateUnwrapMethod_Validator() throws CoreException { + IFile componentsFile = project.getFile("WebContent/WEB-INF/components.xml"); + // Duplicate @Unwrap method - //System.out.println("Test - Duplicate @Unwrap method"); final String NEW_CONTENT_FILE_NAME8 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.8"; assertMarkerIsCreated( @@ -387,38 +405,47 @@ "'components.5'", ex); } refreshProject(project); - + } + + public void testOnlyJavaBeansAndStatefulSessionBeansSupportDestroyMethod_Validator() throws CoreException { // Only JavaBeans and stateful session beans support @Destroy methods - //System.out.println("Test - Only JavaBeans and stateful session beans support @Destroy methods"); final String NEW_CONTENT_FILE_NAME9 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.9"; assertMarkerIsCreated( TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME9, ".*(a)Destroy.*\"destroyMethod\".*", 25); - + } + + public void testOnlyComponentClassCanHaveCreateMethod_Validator() throws CoreException { // Only component class can have @Create method - //System.out.println("Test - Only component class can have @Create method"); final String NEW_CONTENT_FILE_NAME10 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.10"; assertMarkerIsCreated( TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME10, ".*(a)Create.*\"createMethod\".*", 25); - + } + + public void testOnlyComponentClassCanHaveUnwrapMethod_Validator() throws CoreException { // Only component class can have @Unwrap method - //System.out.println("Test - Only component class can have @Unwrap method"); final String NEW_CONTENT_FILE_NAME11 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.11"; assertMarkerIsCreated( TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME11, "Only component class can have @Unwrap method \"unwrapMethod\"", 26); - + } + + public void testOnlyComponentClassCanHaveObserverMethod_Validator() throws CoreException { // Only component class can have @Observer method - //System.out.println("Test - Only component class can have @Observer method"); final String NEW_CONTENT_FILE_NAME12 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.12"; assertMarkerIsCreated( TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME12, "Only component class can have @Observer method \"observerMethod\"", 26); - + } + + public void testDuplicateRemoveMethod_Validator() throws CoreException { + IFile componentsFile = project.getFile("WebContent/WEB-INF/components.xml"); + IFile componentsFileWithoutSTComponent = project.getFile("WebContent/WEB-INF/components.5"); + // Duplicate @Remove method final String NEW_CONTENT_FILE_NAME1 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.1"; @@ -472,7 +499,7 @@ * The validator should check duplicate @Remove methods only in stateful session bean component * This method tests usual component (not stateful sessian bean) with two @Remove methods. It must not have error markers. */ - public void testDuplicateRemoveMethodInComponent() { + public void testDuplicateRemoveMethodInComponent_Validator() { getSeamProject(project); IFile componentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/UsualComponent.java"); int number = getMarkersNumber(componentFile); @@ -488,7 +515,6 @@ assertEquals("Problem marker was found in Component12.java", 0, number); // Unknown factory name - //System.out.println("Test - Unknown factory name"); IFile component12File2 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/Component12.2"); try{ @@ -525,7 +551,7 @@ assertEquals("Duplicate factory name markers were not found", 2, number); } - public void testBijectionsValidator() { + public void testMultipleDataBinder_Validator() { IFile selectionTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.java"); IFile selectionIndexTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SelectionIndexTest.java"); @@ -538,7 +564,6 @@ assertEquals("Problem marker was found in SelectionIndexTest.java", 0, number); // Multiple data binder - //System.out.println("Test - Multiple data binder"); IFile selectionTestFile2 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.2"); try{ @@ -584,8 +609,13 @@ assertTrue("Problem marker has wrong line number", lineNumbers[0] == 21 || lineNumbers[0] == 24); assertTrue("Problem marker has wrong line number", lineNumbers[0] == 21 || lineNumbers[0] == 24); + + } + + public void testUnknownDataModelName_Validator(){ + IFile selectionTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.java"); + IFile selectionIndexTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SelectionIndexTest.java"); // Unknown @DataModel/@Out name - //System.out.println("Test - Unknown @DataModel/@Out name"); IFile selectionTestFile3 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.3"); try{ @@ -605,13 +635,13 @@ refreshProject(project); - number = getMarkersNumber(selectionTestFile); + int number = getMarkersNumber(selectionTestFile); assertFalse("Problem marker 'Unknown @DataModel/@Out name' not found' not found' not found' not found", number == 0); - messages = getMarkersMessage(selectionTestFile, SEAM_MARKER_FILTER); + String[] messages = getMarkersMessage(selectionTestFile, SEAM_MARKER_FILTER); assertTrue("Problem marker 'Unknown @DataModel/@Out name", messages[0].startsWith("Unknown @DataModel/@Out name: \"messageList2\"")); - lineNumbers = getMarkersNumbersOfLine(selectionTestFile, SEAM_MARKER_FILTER); + Integer[] lineNumbers = getMarkersNumbersOfLine(selectionTestFile, SEAM_MARKER_FILTER); assertEquals("Problem marker has wrong line number", 27, lineNumbers[0].intValue()); @@ -626,10 +656,9 @@ assertEquals("Problem marker has wrong line number", 27, lineNumbers[0].intValue()); } - public void testContextVariablesValidator() { + public void testDuplicateVariableName_Validator() { modifyPreferences(); // IPreferenceStore store = SeamCorePlugin.getDefault().getPreferenceStore(); - //System.out.println("UNKNOWN_EL_VARIABLE_NAME value- "+store.getString(SeamPreferences.UNKNOWN_EL_VARIABLE_NAME)); IFile contextVariableTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/ContextVariableTest.java"); @@ -639,7 +668,6 @@ assertEquals("Problem marker was found in contextVariableTestFile.java", 0, number); // Duplicate variable name - //System.out.println("Test - Duplicate variable name"); IFile contextVariableTestFile2 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/ContextVariableTest.2"); try{ @@ -663,8 +691,13 @@ for(int i=0;i<2;i++) assertTrue("Problem marker has wrong line number", (lineNumbers[i] == 36)||(lineNumbers[i] == 41)); + + } + + public void testUnknownVariableName_Validator(){ + IFile contextVariableTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/ContextVariableTest.java"); + // Unknown variable name - //System.out.println("Test - Unknown variable name"); IFile contextVariableTestFile3 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/ContextVariableTest.3"); try{ @@ -676,20 +709,19 @@ refreshProject(project); - number = getMarkersNumber(contextVariableTestFile); + int number = getMarkersNumber(contextVariableTestFile); assertFalse("Problem marker 'Unknown variable name' not found' not found' not found' not found", number == 0); - messages = getMarkersMessage(contextVariableTestFile, SEAM_MARKER_FILTER); + String[] messages = getMarkersMessage(contextVariableTestFile, SEAM_MARKER_FILTER); assertEquals("Problem marker 'Unknown variable name' not found", "Unknown context variable name: \"messageList5\"", messages[0]); - lineNumbers = getMarkersNumbersOfLine(contextVariableTestFile, SEAM_MARKER_FILTER); + Integer[] lineNumbers = getMarkersNumbersOfLine(contextVariableTestFile, SEAM_MARKER_FILTER); assertEquals("Problem marker has wrong line number", 22, lineNumbers[0].intValue()); - } - public void testExpressionLanguageValidator() throws CoreException { + public void testContextVariableCannotBeResolved_Validator() throws CoreException { modifyPreferences(); IFile abcComponentXHTMLFile = project.getFile("WebContent/abcComponent.xhtml"); @@ -704,7 +736,6 @@ assertEquals("Problem marker was found in AbcComponent.java", 0, number); // Context variable cannot be resolved - //System.out.println("Test - Context variable cannot be resolved"); IFile abcComponentXHTMLFile2 = project.getFile("WebContent/abcComponent.2"); try{ @@ -726,9 +757,12 @@ Integer[] lineNumbers = getMarkersNumbersOfLine(abcComponentXHTMLFile, SEAM_MARKER_FILTER); assertEquals("Problem marker has wrong line number", 22, lineNumbers[0].intValue()); + } + + public void testPropertyCannotBeResolved_Validator(){ + IFile abcComponentXHTMLFile = project.getFile("WebContent/abcComponent.xhtml"); // Property cannot be resolved - //System.out.println("Test - Property cannot be resolved"); IFile abcComponentXHTMLFile3 = project.getFile("WebContent/abcComponent.3"); try{ @@ -740,19 +774,24 @@ refreshProject(project); - number = getMarkersNumber(abcComponentXHTMLFile); + int number = getMarkersNumber(abcComponentXHTMLFile); assertFalse("Problem marker 'Property cannot be resolved' was not found", number == 0); - messages = getMarkersMessage(abcComponentXHTMLFile, SEAM_MARKER_FILTER); + String[] messages = getMarkersMessage(abcComponentXHTMLFile, SEAM_MARKER_FILTER); assertEquals("Problem marker 'Property cannot be resolved' was not found", "\"actionType2\" cannot be resolved", messages[0]); - lineNumbers = getMarkersNumbersOfLine(abcComponentXHTMLFile, SEAM_MARKER_FILTER); + Integer[] lineNumbers = getMarkersNumbersOfLine(abcComponentXHTMLFile, SEAM_MARKER_FILTER); assertEquals("Problem marker has wrong line number", 22, lineNumbers[0].intValue()); + } + + public void testUnpairedGetterOrSetter_Validator(){ + IFile abcComponentXHTMLFile = project.getFile("WebContent/abcComponent.xhtml"); + IFile abcComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.java"); // Unpaired Getter/Setter - //System.out.println("Test - Unpaired Getter/Setter"); + enableUnpairGetterOrSetterValidation(true); IFile abcComponentXHTMLFile4 = project.getFile("WebContent/abcComponent.4"); @@ -765,7 +804,7 @@ refreshProject(project); - number = getMarkersNumber(abcComponentXHTMLFile); + int number = getMarkersNumber(abcComponentXHTMLFile); assertEquals("Problem marker was found in abcComponent.xhtml", 0, number); IFile abcComponentFile2 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.2"); @@ -781,11 +820,11 @@ number = getMarkersNumber(abcComponentXHTMLFile); assertFalse("Problem marker 'Unpaired Getter/Setter' was not found", number == 0); - messages = getMarkersMessage(abcComponentXHTMLFile, SEAM_MARKER_FILTER); + String[] messages = getMarkersMessage(abcComponentXHTMLFile, SEAM_MARKER_FILTER); assertEquals("Problem marker 'Unpaired Getter/Setter' was not found", "Property \"actionType\" has only Setter. Getter is missing.", messages[0]); - lineNumbers = getMarkersNumbersOfLine(abcComponentXHTMLFile, SEAM_MARKER_FILTER); + Integer[] lineNumbers = getMarkersNumbersOfLine(abcComponentXHTMLFile, SEAM_MARKER_FILTER); assertEquals("Problem marker has wrong line number", 22, lineNumbers[0].intValue()); @@ -811,7 +850,7 @@ assertEquals("Problem marker has wrong line number", 22, lineNumbers[0].intValue()); enableUnpairGetterOrSetterValidation(false); - } + } private void enableUnpairGetterOrSetterValidation(boolean enamble) { IPreferenceStore store = SeamCorePlugin.getDefault().getPreferenceStore();

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r16841 - in workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test: editor and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yzhishko Date: 2009-07-28 08:58:28 -0400 (Tue, 28 Jul 2009) New Revision: 16841 Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java Log: delay() method has been changed to waitForJobs(). Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-07-28 12:15:34 UTC (rev 16840) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-07-28 12:58:28 UTC (rev 16841) @@ -60,7 +60,9 @@ protected void createJSFProject(String jsfProjectName){ bot.menu("File").menu("New").menu("Other...").click(); - bot.tree().expandNode("JBoss Tools Web").expandNode("JSF").select("JSF Project"); + SWTBotTree tree = bot.tree(); + waitForJobs(); + tree.expandNode("JBoss Tools Web").expandNode("JSF").select("JSF Project"); bot.button("Next >").click(); bot.textWithLabel("Project Name*").setText(jsfProjectName); bot.comboBoxWithLabel("Template*").setSelection("JSFKickStartWithoutLibs"); @@ -78,8 +80,9 @@ } } catch (Exception e) { bot.button(0).click(); - SWTBotTree tree = bot.tree(); - tree.expandNode("JBoss Enterprise Middleware").select("JBoss Enterprise Application Platform 4.3 Runtime"); + SWTBotTree innerTree = bot.tree(); + waitForJobs(); + innerTree.expandNode("JBoss Enterprise Middleware").select("JBoss Enterprise Application Platform 4.3 Runtime"); bot.button("Next >").click(); bot.textWithLabel("Home Directory").setText(JBOSS_EAP_HOME); bot.button("Finish").click(); Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-07-28 12:15:34 UTC (rev 16840) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-07-28 12:58:28 UTC (rev 16841) @@ -42,28 +42,28 @@ textEditor = editor.getText(); editor.navigateTo(22,22); bot.menu("Source").menu("Toggle Comment").click(); - delay(); + waitForJobs(); checkVPE("ToggleCommentTestToggle.xml"); //Test untoggle comment from Source menu editor.navigateTo(22,22); bot.menu("Source").menu("Toggle Comment").click(); - delay(); + waitForJobs(); checkVPE("ToggleCommentTestUntoggle.xml"); //Test toggle comment with CTRL+SHIFT+C hot keys editor.navigateTo(22,22); pressToggleCommentHotKeys(); - delay(); + waitForJobs(); checkVPE("ToggleCommentTestToggle.xml"); //Test untoggle comment with CTRL+SHIFT hot keys editor.navigateTo(22,22); pressToggleCommentHotKeys(); - delay(); + waitForJobs(); checkVPE("ToggleCommentTestUntoggle.xml"); } Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java 2009-07-28 12:15:34 UTC (rev 16840) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java 2009-07-28 12:58:28 UTC (rev 16841) @@ -1,6 +1,7 @@ package org.jboss.tools.vpe.ui.bot.test.palette; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; public class CancelTagLibDefenitionTest extends VPEAutoTestCase{ @@ -24,8 +25,9 @@ bot.shell("Edit TLD").activate(); //Test cancel TLD - delay(); - bot.tree().expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("x-1_0-rt.tld [x_rt]").select(); + SWTBotTree tree = bot.tree(); + waitForJobs(); + tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("x-1_0-rt.tld [x_rt]").select(); bot.button("Cancel").click(); //Test check fields Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java 2009-07-28 12:15:34 UTC (rev 16840) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java 2009-07-28 12:58:28 UTC (rev 16841) @@ -65,7 +65,9 @@ bot.button("Browse...").click(); bot.shell("Edit TLD").activate(); - bot.tree().expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("c.tld [c]").select(); + SWTBotTree tree = bot.tree(); + waitForJobs(); + tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("c.tld [c]").select(); bot.button("OK").click(); //Test set group @@ -84,6 +86,7 @@ public void run() { SWTBotTree tree = bot.tree(); + delay(); try { tree.expandNode("XStudio").expandNode("Palette").getNode(GROUP_NAME).select(); Display display = bot.getDisplay();

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r16840 - workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources.

by jbosstools-commits＠lists.jboss.org

Author: yzhishko Date: 2009-07-28 08:15:34 -0400 (Tue, 28 Jul 2009) New Revision: 16840 Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestLinesToggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestLinesUntoggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestToggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestUntoggle.xml Log: Test pages for VPE content testing in bot tests Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestLinesToggle.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestLinesToggle.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestLinesToggle.xml 2009-07-28 12:15:34 UTC (rev 16840) @@ -0,0 +1,34 @@ +<tests> + <test id="bodyId"> + <DIV id="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> + + + +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestLinesUntoggle.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestLinesUntoggle.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestLinesUntoggle.xml 2009-07-28 12:15:34 UTC (rev 16840) @@ -0,0 +1,37 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestToggle.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestToggle.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestToggle.xml 2009-07-28 12:15:34 UTC (rev 16840) @@ -0,0 +1,36 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestUntoggle.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestUntoggle.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestUntoggle.xml 2009-07-28 12:15:34 UTC (rev 16840) @@ -0,0 +1,37 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r16839 - workspace/yzhishko/org.jboss.tools.seam.ui.bot.test.

by jbosstools-commits＠lists.jboss.org

Author: yzhishko Date: 2009-07-28 08:03:20 -0400 (Tue, 28 Jul 2009) New Revision: 16839 Removed: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/screenshots/ Log: Delete screenshot directory

14 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits July 2009