June 2012 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r41892 - branches/jbosstools-3.3.x/requirements/jbeap-6.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-06-12 11:48:46 -0400 (Tue, 12 Jun 2012) New Revision: 41892 Modified: branches/jbosstools-3.3.x/requirements/jbeap-6/build.properties Log: use JBEAP-6.0.0 instead of JBEAP-6.0.0-CR1; MD5SUM is the same Modified: branches/jbosstools-3.3.x/requirements/jbeap-6/build.properties =================================================================== --- branches/jbosstools-3.3.x/requirements/jbeap-6/build.properties 2012-06-12 15:46:26 UTC (rev 41891) +++ branches/jbosstools-3.3.x/requirements/jbeap-6/build.properties 2012-06-12 15:48:46 UTC (rev 41892) @@ -1,9 +1,10 @@ -# see also ../seamfp/build.properties; use latest noauth zip here +# KEEP THIS FILE IN SYNCH WITH EQUIVALENT FILE IN devstudio SVN TREE # This property used to override URI outside the build # It is usefull to make build work on build server vithout VPN access jbeap60.build.uri=http://download.devel.redhat.com/devel/candidates/JBEAP... build.uri=${jbeap60.build.uri} -build.archive=jboss-eap-6.0.0.zip +jbeap60.build.archive=jboss-eap-6.0.0.zip +build.archive=${jbeap60.build.archive} md5=ca0e20c5523281233888c296689b7172

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41891 - branches/jbosstools-3.3.x/requirements/jbeap-6.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-06-12 11:46:26 -0400 (Tue, 12 Jun 2012) New Revision: 41891 Modified: branches/jbosstools-3.3.x/requirements/jbeap-6/build.properties Log: use JBEAP-6.0.0 instead of JBEAP-6.0.0-CR1; MD5SUM is the same Modified: branches/jbosstools-3.3.x/requirements/jbeap-6/build.properties =================================================================== --- branches/jbosstools-3.3.x/requirements/jbeap-6/build.properties 2012-06-12 12:00:25 UTC (rev 41890) +++ branches/jbosstools-3.3.x/requirements/jbeap-6/build.properties 2012-06-12 15:46:26 UTC (rev 41891) @@ -2,8 +2,8 @@ # This property used to override URI outside the build # It is usefull to make build work on build server vithout VPN access -jbeap60.build.uri=http://download.devel.redhat.com/devel/candidates/JBEAP/JBEAP-6.0.0-CR1/ +jbeap60.build.uri=http://download.devel.redhat.com/devel/candidates/JBEAP/JBEAP-6.0.0/ build.uri=${jbeap60.build.uri} -build.archive=jboss-eap-6.0.0.CR1.zip +build.archive=jboss-eap-6.0.0.zip md5=ca0e20c5523281233888c296689b7172

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41890 - in trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test: messages and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: apodhrad Date: 2012-06-12 08:00:25 -0400 (Tue, 12 Jun 2012) New Revision: 41890 Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/HelloWorld_request.xml trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/HelloWorld_response.xml trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Hello_World_Header_Ode_request.xml trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Hello_World_Header_Ode_response.xml trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Hello_World_Header_WSDL_request.xml trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Hello_World_Header_WSDL_response.xml trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_request_1.xml trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_request_2.xml trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_request_3.xml trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_response_1.xml trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_response_2.xml trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_response_3.xml trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Math_request.xml trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Math_response.xml trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/BPELTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/BPELExampleTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/HelloWorldExampleTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/HelloWorldOdeExampleTest.java Removed: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ActivityModelingTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssociateRuntimeTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ToolingCompatibilityTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/util/ResourceHelper.java Log: BPEL bot tests: added tests for BPEL examples. Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/HelloWorld_request.xml =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/HelloWorld_request.xml (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/HelloWorld_request.xml 2012-06-12 12:00:25 UTC (rev 41890) @@ -0,0 +1,9 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" + xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header /> + <soapenv:Body> + <wsdl:hello> + <TestPart>Test</TestPart> + </wsdl:hello> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/HelloWorld_response.xml =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/HelloWorld_response.xml (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/HelloWorld_response.xml 2012-06-12 12:00:25 UTC (rev 41890) @@ -0,0 +1,8 @@ +<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"> + <env:Header/> + <env:Body> + <odens:helloResponse xmlns:odens="http://www.jboss.org/bpel/examples/wsdl"> + <TestPart>Test World</TestPart> + </odens:helloResponse> + </env:Body> +</env:Envelope> \ No newline at end of file Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Hello_World_Header_Ode_request.xml =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Hello_World_Header_Ode_request.xml (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Hello_World_Header_Ode_request.xml 2012-06-12 12:00:25 UTC (rev 41890) @@ -0,0 +1,10 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header> + <ns:conversationId xmlns:ns="http://www.jboss.org/cid">12345</ns:conversationId> + </soapenv:Header> + <soapenv:Body> + <wsdl:hello> + <TestPart>Test</TestPart> + </wsdl:hello> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Hello_World_Header_Ode_response.xml =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Hello_World_Header_Ode_response.xml (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Hello_World_Header_Ode_response.xml 2012-06-12 12:00:25 UTC (rev 41890) @@ -0,0 +1,10 @@ +<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"> + <env:Header> + <ns:conversationId xmlns:ns="http://www.jboss.org/cid">12345</ns:conversationId> + </env:Header> + <env:Body> + <odens:helloResponse xmlns:odens="http://www.jboss.org/bpel/examples/wsdl"> + <TestPart>Test World conversationId=12345</TestPart> + </odens:helloResponse> + </env:Body> +</env:Envelope> \ No newline at end of file Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Hello_World_Header_WSDL_request.xml =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Hello_World_Header_WSDL_request.xml (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Hello_World_Header_WSDL_request.xml 2012-06-12 12:00:25 UTC (rev 41890) @@ -0,0 +1,10 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:cid="http://www.jboss.org/cid" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> + <soapenv:Header> + <cid:conversationId>666</cid:conversationId> + </soapenv:Header> + <soapenv:Body> + <wsdl:hello> + <TestPart>Test</TestPart> + </wsdl:hello> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Hello_World_Header_WSDL_response.xml =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Hello_World_Header_WSDL_response.xml (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Hello_World_Header_WSDL_response.xml 2012-06-12 12:00:25 UTC (rev 41890) @@ -0,0 +1,10 @@ +<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"> + <env:Header> + <cid:conversationId xmlns:cid="http://www.jboss.org/cid">6666789</cid:conversationId> + </env:Header> + <env:Body> + <odens:helloResponse xmlns:odens="http://www.jboss.org/bpel/examples/wsdl"> + <TestPart>Test World conversationId=666</TestPart> + </odens:helloResponse> + </env:Body> +</env:Envelope> \ No newline at end of file Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_request_1.xml =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_request_1.xml (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_request_1.xml 2012-06-12 12:00:25 UTC (rev 41890) @@ -0,0 +1,10 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://example.com/loan-approval/wsdl/"> + <soapenv:Header/> + <soapenv:Body> + <wsdl:request> + <firstName>Test</firstName> + <name>Name</name> + <amount>9000</amount> + </wsdl:request> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_request_2.xml =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_request_2.xml (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_request_2.xml 2012-06-12 12:00:25 UTC (rev 41890) @@ -0,0 +1,10 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://example.com/loan-approval/wsdl/"> + <soapenv:Header/> + <soapenv:Body> + <wsdl:request> + <firstName>Test</firstName> + <name>Name</name> + <amount>10000</amount> + </wsdl:request> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_request_3.xml =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_request_3.xml (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_request_3.xml 2012-06-12 12:00:25 UTC (rev 41890) @@ -0,0 +1,10 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://example.com/loan-approval/wsdl/"> + <soapenv:Header/> + <soapenv:Body> + <wsdl:request> + <firstName>Test</firstName> + <name>Name</name> + <amount>20000</amount> + </wsdl:request> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_response_1.xml =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_response_1.xml (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_response_1.xml 2012-06-12 12:00:25 UTC (rev 41890) @@ -0,0 +1,8 @@ +<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"> + <env:Header/> + <env:Body> + <odens:requestResponse xmlns:odens="http://example.com/loan-approval/wsdl/"> + <accept>yes</accept> + </odens:requestResponse> + </env:Body> +</env:Envelope> \ No newline at end of file Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_response_2.xml =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_response_2.xml (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_response_2.xml 2012-06-12 12:00:25 UTC (rev 41890) @@ -0,0 +1,8 @@ +<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"> + <env:Header/> + <env:Body> + <odens:requestResponse xmlns:odens="http://example.com/loan-approval/wsdl/"> + <accept>Evaluated and Approved</accept> + </odens:requestResponse> + </env:Body> +</env:Envelope> \ No newline at end of file Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_response_3.xml =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_response_3.xml (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Loan_Approval_response_3.xml 2012-06-12 12:00:25 UTC (rev 41890) @@ -0,0 +1,11 @@ +<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"> + <env:Header/> + <env:Body> + <env:Fault> + <faultcode xmlns:valueNS="http://example.com/loan-approval/wsdl/">valueNS:unableToHandleRequest</faultcode> + <detail> + <ns1:integer xmlns:ns1="http://example.com/loan-approval/xsd/error-messages/">20000</ns1:integer> + </detail> + </env:Fault> + </env:Body> +</env:Envelope> \ No newline at end of file Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Math_request.xml =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Math_request.xml (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Math_request.xml 2012-06-12 12:00:25 UTC (rev 41890) @@ -0,0 +1,10 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:exam="http://www.jboss.org/bpel/examples"> + <soapenv:Header/> + <soapenv:Body> + <exam:MathRequest> + <exam:a>13</exam:a> + <exam:b>2</exam:b> + <exam:operator>/</exam:operator> + </exam:MathRequest> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Math_response.xml =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Math_response.xml (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/messages/Math_response.xml 2012-06-12 12:00:25 UTC (rev 41890) @@ -0,0 +1,8 @@ +<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"> + <env:Header/> + <env:Body> + <MathResponse xmlns="http://www.jboss.org/bpel/examples"> + <tns:result xmlns:tns="http://www.jboss.org/bpel/examples">6.5</tns:result> + </MathResponse> + </env:Body> +</env:Envelope> \ No newline at end of file Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml 2012-06-12 11:19:26 UTC (rev 41889) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml 2012-06-12 12:00:25 UTC (rev 41890) @@ -30,13 +30,21 @@ <skip>${swtbot.test.skip}</skip> <forkedProcessTimeoutInSeconds>10800</forkedProcessTimeoutInSeconds> <dependencies combine.children="append"> +  <dependency> <type>p2-installable-unit</type> <artifactId>org.jboss.tools.bpel.feature.feature.group</artifactId> <version>0.0.0</version> </dependency> +  <dependency> <type>p2-installable-unit</type> + <artifactId>org.jboss.tools.community.project.examples.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> +  + <dependency> + <type>p2-installable-unit</type> <artifactId>org.jboss.ide.eclipse.as.feature.feature.group</artifactId> <version>0.0.0</version> </dependency> Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ActivityModelingTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ActivityModelingTest.java 2012-06-12 11:19:26 UTC (rev 41889) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ActivityModelingTest.java 2012-06-12 12:00:25 UTC (rev 41890) @@ -6,7 +6,6 @@ import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditor; import org.jboss.tools.bpel.ui.bot.ext.widgets.BotBpelEditor; -import org.jboss.tools.bpel.ui.bot.test.suite.BPELTest; import org.jboss.tools.bpel.ui.bot.test.util.ResourceHelper; import org.jboss.tools.ui.bot.ext.SWTUtilExt; Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java 2012-06-12 11:19:26 UTC (rev 41889) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java 2012-06-12 12:00:25 UTC (rev 41890) @@ -12,7 +12,6 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.bpel.ui.bot.ext.widgets.BotBpelEditor; -import org.jboss.tools.bpel.ui.bot.test.suite.BPELTest; import org.jboss.tools.bpel.ui.bot.test.util.ResourceHelper; import org.jboss.tools.bpel.util.SendSoapMessage; Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssociateRuntimeTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssociateRuntimeTest.java 2012-06-12 11:19:26 UTC (rev 41889) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssociateRuntimeTest.java 2012-06-12 12:00:25 UTC (rev 41890) @@ -5,7 +5,6 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTableItem; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; -import org.jboss.tools.bpel.ui.bot.test.suite.BPELTest; import org.jboss.tools.ui.bot.ext.SWTBotExt; import org.jboss.tools.ui.bot.ext.SWTEclipseExt; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/BPELTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/BPELTest.java (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/BPELTest.java 2012-06-12 12:00:25 UTC (rev 41890) @@ -0,0 +1,302 @@ +package org.jboss.tools.bpel.ui.bot.test; + +import java.io.IOException; +import java.io.InputStream; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Platform; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.jboss.tools.ui.bot.ext.view.PackageExplorer; +import org.jboss.tools.ui.bot.ext.view.ProjectExplorer; +import org.osgi.framework.Version; + +public class BPELTest extends SWTTestExt { + + public static final String BUNDLE = "org.jboss.tools.bpel.ui.bot.test"; + public static final Version JBT_3_2_BPEL_VERSION = new Version(0, 6, 2); + + public static void prepare() { + log.info("BPEL All Test started..."); + + // jbt.closeReportUsageWindowIfOpened(true); + // eclipse.maximizeActiveShell(); + // eclipse.closeView(IDELabel.View.WELCOME); + // bot.closeAllEditors(); + } + + public static void clean() { + util.waitForNonIgnoredJobs(); + bot.sleep(TIME_5S, "BPEL All Tests Finished!"); + } + + protected PackageExplorer pExplorer = new PackageExplorer(); + protected ProjectExplorer projExplorer = new ProjectExplorer() { + + @Override + public void runOnServer(String projectName) { + String serverName = BPELTest.configuredState.getServer().name; + // serverName = "SOA-5.1"; + + bot.viewByTitle("Servers").show(); + bot.viewByTitle("Servers").setFocus(); + + SWTBotTree tree = bot.viewByTitle("Servers").bot().tree(); + bot.sleep(TIME_5S); + SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Synchronized]") + .select(); + + ContextMenuHelper.prepareTreeItemForContextMenu(tree, server); + new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.ADD_AND_REMOVE, + false)).click(); + + SWTBotShell shell = OdeDeployTest.bot.shell("Add and Remove..."); + shell.activate(); + + SWTBot viewBot = shell.bot(); + viewBot.tree().setFocus(); + viewBot.tree().select(projectName); + viewBot.button("Add >").click(); + viewBot.button("Finish").click(); + } + + }; + + /** + * Creates a new process in a project identified by it's name. + * + * TODO: extend WSDL validation + * + * @param project + * project name in which to create the new process + * @param name + * process name + * @param type + * process type (sync, async, empty) + * @param isAbstract + * is the process supposed to be abstract? + * + * @return process file + */ + protected IFile createNewProcess(String project, String name, String type, boolean isAbstract) { + SWTBotView view = bot.viewByTitle("Project Explorer"); + view.show(); + view.setFocus(); + + SWTBot viewBot = view.bot(); + SWTBotTreeItem item = viewBot.tree().expandNode(project).expandNode("bpelContent"); + item.select(); + + bot.menu("File").menu("New").menu("Other...").click(); + bot.shell("New").activate(); + + SWTBotTree tree = bot.tree(); + tree.expandNode("BPEL 2.0").expandNode("BPEL Process File").select(); + // tree.expandNode("BPEL 2.0").expandNode("New BPEL Process File").select(); + assertTrue(bot.button("Next >").isEnabled()); + + bot.button("Next >").click(); + assertFalse(bot.button("Next >").isEnabled()); + + createNewBpelProcess(project, name, type, isAbstract, getBpelUiVersion()); + + bot.button("Next >").click(); + bot.button("Finish").click(); + bot.sleep(TIME_5S); + + IProject iproject = ResourcesPlugin.getWorkspace().getRoot().getProject(project); + IFile bpelFile = iproject.getFile(new Path("bpelContent/" + name + ".bpel")); + assertTrue(bpelFile.exists()); + // assertTrue(iproject.getFile(new Path("bpelContent/" + name + + // ".bpelex")).exists()); + assertTrue(iproject.getFile(new Path("bpelContent/" + name + "Artifacts.wsdl")).exists()); + + return bpelFile; + } + + protected void createNewBpelProcess(String project, String name, String type, + boolean isAbstract, Version version) { + if (version.compareTo(JBT_3_2_BPEL_VERSION) > 0) { + bot.textWithLabel("Process Name:").setText(name); + bot.comboBoxWithLabel("Namespace:").setText("http://eclipse.org/bpel/sample"); + if (isAbstract) { + bot.checkBox().select(); + } else { + bot.checkBox().deselect(); + } + assertTrue(bot.button("Next >").isEnabled()); + bot.button("Next >").click(); + bot.comboBoxWithLabel("Template:").setSelection(type + " BPEL Process"); + } else { + bot.textWithLabel("BPEL Process Name:").setText(name); + bot.comboBoxWithLabel("Namespace:").setText("http://eclipse.org/bpel/sample"); + bot.comboBoxWithLabel("Template:").setSelection(type + " BPEL Process"); + if (isAbstract) { + bot.checkBox().select(); + } else { + bot.checkBox().deselect(); + assertTrue(bot.button("Next >").isEnabled()); + + bot.button("Next >").click(); + assertEquals(name, bot.textWithLabel("Service Name").getText()); + } + } + } + + /** + * Creates a new ODE deployment descriptor in a project identified by it's + * name. + * + * @author psrna + * + * @param project + * project name in which to create the new ODE deployment + * descriptor + * @return deployment descriptor file + */ + protected IFile createNewDeployDescriptor(String project) { + + SWTBotView view = bot.viewByTitle("Project Explorer"); + view.show(); + view.setFocus(); + + SWTBot viewBot = view.bot(); + SWTBotTreeItem item = viewBot.tree().expandNode(project).expandNode("bpelContent"); + item.select(); + + bot.menu("File").menu("New").menu("Other...").click(); + bot.shell("New").activate(); + + SWTBotTree tree = bot.tree(); + tree.expandNode("BPEL 2.0").expandNode("BPEL Deployment Descriptor").select(); + // tree.expandNode("BPEL 2.0").expandNode("Apache ODE Deployment Descriptor").select(); + assertTrue(bot.button("Next >").isEnabled()); + + bot.button("Next >").click(); + + assertTrue(bot.textWithLabel("BPEL Project:").getText() + .equals("/" + project + "/bpelContent")); + assertTrue(bot.textWithLabel("File name:").getText().equals("deploy.xml")); + + bot.button("Finish").click(); + bot.sleep(5000); + + IProject iproject = ResourcesPlugin.getWorkspace().getRoot().getProject(project); + IFile deployFile = iproject.getFile(new Path("bpelContent/deploy.xml")); + assertTrue(deployFile.exists()); + + return deployFile; + } + + /** + * Create a new BPEL project + * + * @param name + * project name + * @return project reference + */ + protected IProject createNewProject(String name) { + SWTBotView view = bot.viewByTitle("Project Explorer"); + view.show(); + view.setFocus(); + + bot.menu("File").menu("New").menu("Project...").click(); + bot.shell("New Project").activate(); + + SWTBotTree tree = bot.tree(); + tree.expandNode("BPEL 2.0").expandNode("BPEL Project").select(); + assertTrue(bot.button("Next >").isEnabled()); + + bot.button("Next >").click(); + bot.shell("New BPEL Project").activate(); + assertFalse(bot.button("Finish").isEnabled()); + + bot.textWithLabel("Project name:").setText(name); + assertTrue(bot.button("Finish").isEnabled()); + + bot.button("Finish").click(); + bot.sleep(3000); + + IProject iproject = ResourcesPlugin.getWorkspace().getRoot().getProject(name); + assertNotNull(iproject); + + return iproject; + } + + public String loadFile(IFile file) throws Exception { + if (file.getType() != IFile.FILE) { + throw new IllegalArgumentException("File: " + file.getFullPath().toString() + + " is a directory!"); + } + + InputStream in = null; + StringBuffer out; + try { + in = file.getContents(); + out = new StringBuffer(); + byte[] buffer = new byte[4 * 1024]; + int c = 0; + while ((c = in.read(buffer)) > -1) { + out.append(new String(buffer, 0, c)); + } + } finally { + if (in != null) { + try { + in.close(); + } catch (IOException e) { + // ignore + } + } + } + return out.length() == 0 ? null : out.toString(); + } + + protected void openFile(String projectName, String... path) throws Exception { + log.info("Opening file: " + path[path.length - 1] + " ..."); + pExplorer.openFile(projectName, path); + } + + public static Version getServerToolsVersion() { + return Platform.getBundle("org.eclipse.wst.server.ui").getVersion(); + } + + public static Version getBpelUiVersion() { + return Platform.getBundle("org.eclipse.bpel.ui").getVersion(); + } + + public static boolean isProjectDeployed(String projectName) { + assertFalse(console.getConsoleText().contains("DEPLOYMENTS IN ERROR:")); + + // This is due to JBIDE-11928 + return true; +// String statusAfterDeploy = "Synchronized"; +// +// String serverName = OdeDeployTest.configuredState.getServer().name; +// +// bot.viewByTitle("Servers").show(); +// bot.viewByTitle("Servers").setFocus(); +// +// SWTBotTree tree = bot.viewByTitle("Servers").bot().tree(); +// SWTBotTreeItem server = tree.getTreeItem( +// serverName + " [Started, " + statusAfterDeploy + "]").select(); +// server.expand(); +// bot.sleep(TIME_5S); +// +// String status = "[Synchronized]"; +// if (getServerToolsVersion().compareTo(new Version(1, 3, 0)) >= 0) { +// status = "[Started, " + statusAfterDeploy + "]"; +// } +// +// return server.getNode(projectName + " " + status).isVisible(); + } +} Property changes on: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/BPELTest.java ___________________________________________________________________ Added: svn:executable + * Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.java 2012-06-12 11:19:26 UTC (rev 41889) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.java 2012-06-12 12:00:25 UTC (rev 41890) @@ -6,7 +6,6 @@ import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditor; import org.jboss.tools.bpel.ui.bot.ext.widgets.BotBpelEditor; -import org.jboss.tools.bpel.ui.bot.test.suite.BPELTest; import org.jboss.tools.bpel.ui.bot.test.util.ResourceHelper; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java 2012-06-12 11:19:26 UTC (rev 41889) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java 2012-06-12 12:00:25 UTC (rev 41890) @@ -5,9 +5,6 @@ import org.eclipse.core.resources.IFile; import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; -import org.jboss.tools.bpel.ui.bot.test.suite.BPELTest; import org.jboss.tools.bpel.ui.bot.test.util.ResourceHelper; import org.jboss.tools.bpel.util.SendSoapMessage; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; @@ -95,20 +92,9 @@ @Test public void deployProjectTest() throws Exception { - - String serverName = OdeDeployTest.configuredState.getServer().name; // Publish the process projExplorer.runOnServer("say_hello"); - Assert.assertFalse(console.getConsoleText().contains("DEPLOYMENTS IN ERROR:")); - - bot.viewByTitle("Servers").show(); - bot.viewByTitle("Servers").setFocus(); - - SWTBotTree tree = bot.viewByTitle("Servers").bot().tree(); - SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Synchronized]").select(); - server.expand(); - bot.sleep(TIME_5S); assertTrue(isProjectDeployed("say_hello")); } Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java 2012-06-12 11:19:26 UTC (rev 41889) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java 2012-06-12 12:00:25 UTC (rev 41890) @@ -6,7 +6,6 @@ import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditor; import org.jboss.tools.bpel.ui.bot.ext.widgets.BotBpelEditor; -import org.jboss.tools.bpel.ui.bot.test.suite.BPELTest; import org.jboss.tools.bpel.ui.bot.test.util.ResourceHelper; Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ToolingCompatibilityTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ToolingCompatibilityTest.java 2012-06-12 11:19:26 UTC (rev 41889) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ToolingCompatibilityTest.java 2012-06-12 12:00:25 UTC (rev 41890) @@ -16,7 +16,6 @@ import org.eclipse.ui.internal.views.properties.tabbed.view.TabbedPropertyList.ListElement; import org.hamcrest.Matcher; import org.jboss.tools.bpel.ui.bot.ext.widgets.BotBpelEditor; -import org.jboss.tools.bpel.ui.bot.test.suite.BPELTest; import org.jboss.tools.bpel.ui.bot.test.util.CompositeControl; import org.jboss.tools.bpel.ui.bot.test.util.ResourceHelper; import org.jboss.tools.bpel.util.SendSoapMessage; Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java 2012-06-12 11:19:26 UTC (rev 41889) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java 2012-06-12 12:00:25 UTC (rev 41890) @@ -6,7 +6,6 @@ import org.eclipse.swtbot.swt.finder.utils.TableCollection; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.jboss.tools.bpel.ui.bot.test.suite.BPELTest; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; @@ -124,6 +123,8 @@ bot.shell("New Server Runtime Environment").activate(); tree = bot.tree(); + assertTrue("There is no server adapter available.", tree.getAllItems().length > 0); + TableCollection selection = bot.tree().selection(); assertTrue("No server has been selected as default.", selection.rowCount() > 0); Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/BPELExampleTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/BPELExampleTest.java (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/BPELExampleTest.java 2012-06-12 12:00:25 UTC (rev 41890) @@ -0,0 +1,105 @@ +package org.jboss.tools.bpel.ui.bot.test.examples; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; + +import org.custommonkey.xmlunit.Diff; +import org.custommonkey.xmlunit.XMLUnit; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.exceptions.AssertionFailedException; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.bpel.ui.bot.test.BPELTest; +import org.jboss.tools.bpel.ui.bot.test.OdeDeployTest; +import org.jboss.tools.bpel.ui.bot.test.util.ResourceHelper; +import org.jboss.tools.bpel.util.SendSoapMessage; +import org.jboss.tools.ui.bot.ext.ExampleTest; +import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.xml.sax.SAXException; + +/** + * + * @author apodhrad + * + */ +public class BPELExampleTest extends ExampleTest { + + @Override + public String getExampleCategory() { + return "BPEL"; + } + + protected static void deployExamples(String... projectName) { + String serverName = BPELTest.configuredState.getServer().name; + + bot.viewByTitle("Servers").show(); + bot.viewByTitle("Servers").setFocus(); + + SWTBotTree tree = bot.viewByTitle("Servers").bot().tree(); + bot.sleep(TIME_5S); + SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Synchronized]").select(); + + ContextMenuHelper.prepareTreeItemForContextMenu(tree, server); + new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.ADD_AND_REMOVE, false)) + .click(); + + SWTBotShell shell = OdeDeployTest.bot.shell("Add and Remove..."); + shell.activate(); + + SWTBot viewBot = shell.bot(); + viewBot.tree().setFocus(); + viewBot.tree().select(projectName); + viewBot.button("Add >").click(); + viewBot.button("Finish").click(); + } + + protected static void testDeployment(String projectName) { + assertTrue(BPELTest.isProjectDeployed(projectName)); + } + + protected void testResponse(String url, String requestFile, String responseFile) { + XMLUnit.setIgnoreWhitespace(true); + try { + String requestMessage = getMessageFromFile(requestFile); + String responseMessage = getMessageFromFile(responseFile); + String response = SendSoapMessage.sendMessage(url, requestMessage, "simple"); + Diff diff = new Diff(response, responseMessage); + assertTrue("Expected response is\n" + responseMessage + "\nbut it was\n" + response, + diff.similar()); + } catch (IOException e) { + e.printStackTrace(); + throw new AssertionFailedException(getExampleName() + + ": IOException during testing response."); + } catch (SAXException e) { + e.printStackTrace(); + throw new AssertionFailedException(getExampleName() + + ": SAXException during testing response."); + } + } + + private static String getMessageFromFile(String fileName) throws IOException { + String path = "messages/" + fileName; + String message = readFile(ResourceHelper.getPath(BPELTest.BUNDLE, path)); + assertNotNull("Couldn't get message from " + path, message); + return message; + } + + private static String readFile(String file) throws IOException { + if(file == null) { + throw new NullPointerException("Couldn't read from null"); + } + BufferedReader reader = new BufferedReader(new FileReader(file)); + String line = null; + StringBuilder stringBuilder = new StringBuilder(); + while ((line = reader.readLine()) != null) { + stringBuilder.append(line); + } + reader.close(); + return stringBuilder.toString(); + } + +} Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/HelloWorldExampleTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/HelloWorldExampleTest.java (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/HelloWorldExampleTest.java 2012-06-12 12:00:25 UTC (rev 41890) @@ -0,0 +1,44 @@ +package org.jboss.tools.bpel.ui.bot.test.examples; + +import org.jboss.tools.bpel.ui.bot.test.BPELTest; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; +import org.junit.Test; + +/** + * + * @author apodhrad + * + */ +@Require(server = @Server(type = ServerType.JbossAS, state = ServerState.Running, version = "5.1"), perspective = "BPEL") +public class HelloWorldExampleTest extends BPELExampleTest { + + private static final String PROJECT_NAME = "HelloWorld"; + + @Override + public String[] getProjectNames() { + return new String[] { PROJECT_NAME }; + } + + @Override + public String getExampleName() { + return "A simple BPEL example"; + } + + @Override + protected void executeExample() { + deployExamples(PROJECT_NAME); + assertTrue(BPELTest.isProjectDeployed(PROJECT_NAME)); + + String url = "http://localhost:8080/bpel/processes/helloWorld"; + String requestFile = "HelloWorld_request.xml"; + String responseFile = "HelloWorld_response.xml"; + testResponse(url, requestFile, responseFile); + + servers.removeAllProjectsFromServer(); + } + + +} Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/HelloWorldOdeExampleTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/HelloWorldOdeExampleTest.java (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/HelloWorldOdeExampleTest.java 2012-06-12 12:00:25 UTC (rev 41890) @@ -0,0 +1,40 @@ +package org.jboss.tools.bpel.ui.bot.test.examples; + +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; + +/** + * + * @author apodhrad + * + */ +@Require(server = @Server(type = ServerType.JbossAS, state = ServerState.Running, version = "5.1"), perspective = "BPEL") +public class HelloWorldOdeExampleTest extends BPELExampleTest { + + private static final String PROJECT_NAME = "Hello_World_Header_Ode"; + + @Override + public String[] getProjectNames() { + return new String[] { PROJECT_NAME }; + } + + @Override + public String getExampleName() { + return "A Hello World Header ODE BPEL example"; + } + + @Override + protected void executeExample() { + deployExamples(PROJECT_NAME); + testDeployment(PROJECT_NAME); + + String url = "http://localhost:8080/Quickstart_bpel_hello_world_header_odeWS"; + String requestFile = "Hello_World_Header_Ode_request.xml"; + String responseFile = "Hello_World_Header_Ode_response.xml"; + testResponse(url, requestFile, responseFile); + + servers.removeAllProjectsFromServer(); + } +} Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java 2012-06-12 11:19:26 UTC (rev 41889) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java 2012-06-12 12:00:25 UTC (rev 41890) @@ -5,28 +5,33 @@ import org.jboss.tools.bpel.ui.bot.test.ActivityModelingTest; import org.jboss.tools.bpel.ui.bot.test.AssignActivityTest; import org.jboss.tools.bpel.ui.bot.test.AssociateRuntimeTest; -import org.jboss.tools.bpel.ui.bot.test.ToolingCompatibilityTest; +import org.jboss.tools.bpel.ui.bot.test.BPELTest; import org.jboss.tools.bpel.ui.bot.test.FaultModelingTest; import org.jboss.tools.bpel.ui.bot.test.OdeDeployTest; import org.jboss.tools.bpel.ui.bot.test.SimpleModelingTest; +import org.jboss.tools.bpel.ui.bot.test.ToolingCompatibilityTest; import org.jboss.tools.bpel.ui.bot.test.WizardTest; - +import org.jboss.tools.bpel.ui.bot.test.examples.HelloWorldExampleTest; +import org.jboss.tools.bpel.ui.bot.test.examples.HelloWorldOdeExampleTest; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; -(a)SuiteClasses({OdeDeployTest.class, - WizardTest.class, - ActivityModelingTest.class, - AssignActivityTest.class, - SimpleModelingTest.class, - FaultModelingTest.class, - ToolingCompatibilityTest.class, - AssociateRuntimeTest.class}) +//(a)SuiteClasses({OdeDeployTest.class, +// WizardTest.class, +// ActivityModelingTest.class, +// AssignActivityTest.class, +// SimpleModelingTest.class, +// FaultModelingTest.class, +// ToolingCompatibilityTest.class, +// AssociateRuntimeTest.class, +// HelloWorldExampleTest.class, +// HelloWorldOdeExampleTest.class}) +(a)SuiteClasses({HelloWorldExampleTest.class}) + @RunWith(RequirementAwareSuite.class) public class BPELAllTest extends TestSuite { Deleted: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java 2012-06-12 11:19:26 UTC (rev 41889) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java 2012-06-12 12:00:25 UTC (rev 41890) @@ -1,291 +0,0 @@ -package org.jboss.tools.bpel.ui.bot.test.suite; - -import java.io.IOException; -import java.io.InputStream; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; -import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; -import org.jboss.tools.bpel.ui.bot.test.OdeDeployTest; -import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; -import org.jboss.tools.ui.bot.ext.types.IDELabel; -import org.jboss.tools.ui.bot.ext.view.PackageExplorer; -import org.jboss.tools.ui.bot.ext.view.ProjectExplorer; -import org.osgi.framework.Version; - -public class BPELTest extends SWTTestExt { - - public static final Version JBT_3_2_BPEL_VERSION = new Version(0, 6, 2); - - public static void prepare() { - log.info("BPEL All Test started..."); - - // jbt.closeReportUsageWindowIfOpened(true); - // eclipse.maximizeActiveShell(); - // eclipse.closeView(IDELabel.View.WELCOME); - // bot.closeAllEditors(); - } - - public static void clean() { - util.waitForNonIgnoredJobs(); - bot.sleep(TIME_5S, "BPEL All Tests Finished!"); - } - - protected PackageExplorer pExplorer = new PackageExplorer(); - protected ProjectExplorer projExplorer = new ProjectExplorer() { - - @Override - public void runOnServer(String projectName) { - String serverName = BPELTest.configuredState.getServer().name; - // serverName = "SOA-5.1"; - - bot.viewByTitle("Servers").show(); - bot.viewByTitle("Servers").setFocus(); - - SWTBotTree tree = bot.viewByTitle("Servers").bot().tree(); - bot.sleep(TIME_5S); - SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Synchronized]").select(); - - ContextMenuHelper.prepareTreeItemForContextMenu(tree, server); - new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.ADD_AND_REMOVE, false)).click(); - - SWTBotShell shell = OdeDeployTest.bot.shell("Add and Remove..."); - shell.activate(); - - SWTBot viewBot = shell.bot(); - viewBot.tree().setFocus(); - viewBot.tree().select(projectName); - viewBot.button("Add >").click(); - viewBot.button("Finish").click(); - } - - }; - - /** - * Creates a new process in a project identified by it's name. - * - * TODO: extend WSDL validation - * - * @param project - * project name in which to create the new process - * @param name - * process name - * @param type - * process type (sync, async, empty) - * @param isAbstract - * is the process supposed to be abstract? - * - * @return process file - */ - protected IFile createNewProcess(String project, String name, String type, boolean isAbstract) { - SWTBotView view = bot.viewByTitle("Project Explorer"); - view.show(); - view.setFocus(); - - SWTBot viewBot = view.bot(); - SWTBotTreeItem item = viewBot.tree().expandNode(project).expandNode("bpelContent"); - item.select(); - - bot.menu("File").menu("New").menu("Other...").click(); - bot.shell("New").activate(); - - SWTBotTree tree = bot.tree(); - tree.expandNode("BPEL 2.0").expandNode("BPEL Process File").select(); - // tree.expandNode("BPEL 2.0").expandNode("New BPEL Process File").select(); - assertTrue(bot.button("Next >").isEnabled()); - - bot.button("Next >").click(); - assertFalse(bot.button("Next >").isEnabled()); - - createNewBpelProcess(project, name, type, isAbstract, getBpelUiVersion()); - - bot.button("Next >").click(); - bot.button("Finish").click(); - bot.sleep(TIME_5S); - - IProject iproject = ResourcesPlugin.getWorkspace().getRoot().getProject(project); - IFile bpelFile = iproject.getFile(new Path("bpelContent/" + name + ".bpel")); - assertTrue(bpelFile.exists()); - // assertTrue(iproject.getFile(new Path("bpelContent/" + name + - // ".bpelex")).exists()); - assertTrue(iproject.getFile(new Path("bpelContent/" + name + "Artifacts.wsdl")).exists()); - - return bpelFile; - } - - protected void createNewBpelProcess(String project, String name, String type, boolean isAbstract, Version version) { - if (version.compareTo(JBT_3_2_BPEL_VERSION) == 1) { - bot.textWithLabel("Process Name:").setText(name); - bot.comboBoxWithLabel("Namespace:").setText("http://eclipse.org/bpel/sample"); - if (isAbstract) { - bot.checkBox().select(); - } else { - bot.checkBox().deselect(); - } - assertTrue(bot.button("Next >").isEnabled()); - bot.button("Next >").click(); - bot.comboBoxWithLabel("Template:").setSelection(type + " BPEL Process"); - } else { - bot.textWithLabel("BPEL Process Name:").setText(name); - bot.comboBoxWithLabel("Namespace:").setText("http://eclipse.org/bpel/sample"); - bot.comboBoxWithLabel("Template:").setSelection(type + " BPEL Process"); - if (isAbstract) { - bot.checkBox().select(); - } else { - bot.checkBox().deselect(); - assertTrue(bot.button("Next >").isEnabled()); - - bot.button("Next >").click(); - assertEquals(name, bot.textWithLabel("Service Name").getText()); - } - } - } - - /** - * Creates a new ODE deployment descriptor in a project identified by it's - * name. - * - * @author psrna - * - * @param project - * project name in which to create the new ODE deployment - * descriptor - * @return deployment descriptor file - */ - protected IFile createNewDeployDescriptor(String project) { - - SWTBotView view = bot.viewByTitle("Project Explorer"); - view.show(); - view.setFocus(); - - SWTBot viewBot = view.bot(); - SWTBotTreeItem item = viewBot.tree().expandNode(project).expandNode("bpelContent"); - item.select(); - - bot.menu("File").menu("New").menu("Other...").click(); - bot.shell("New").activate(); - - SWTBotTree tree = bot.tree(); - tree.expandNode("BPEL 2.0").expandNode("BPEL Deployment Descriptor").select(); - // tree.expandNode("BPEL 2.0").expandNode("Apache ODE Deployment Descriptor").select(); - assertTrue(bot.button("Next >").isEnabled()); - - bot.button("Next >").click(); - - assertTrue(bot.textWithLabel("BPEL Project:").getText().equals("/" + project + "/bpelContent")); - assertTrue(bot.textWithLabel("File name:").getText().equals("deploy.xml")); - - bot.button("Finish").click(); - bot.sleep(5000); - - IProject iproject = ResourcesPlugin.getWorkspace().getRoot().getProject(project); - IFile deployFile = iproject.getFile(new Path("bpelContent/deploy.xml")); - assertTrue(deployFile.exists()); - - return deployFile; - } - - /** - * Create a new BPEL project - * - * @param name - * project name - * @return project reference - */ - protected IProject createNewProject(String name) { - SWTBotView view = bot.viewByTitle("Project Explorer"); - view.show(); - view.setFocus(); - - bot.menu("File").menu("New").menu("Project...").click(); - bot.shell("New Project").activate(); - - SWTBotTree tree = bot.tree(); - tree.expandNode("BPEL 2.0").expandNode("BPEL Project").select(); - assertTrue(bot.button("Next >").isEnabled()); - - bot.button("Next >").click(); - bot.shell("New BPEL Project").activate(); - assertFalse(bot.button("Finish").isEnabled()); - - bot.textWithLabel("Project name:").setText(name); - assertTrue(bot.button("Finish").isEnabled()); - - bot.button("Finish").click(); - bot.sleep(3000); - - IProject iproject = ResourcesPlugin.getWorkspace().getRoot().getProject(name); - assertNotNull(iproject); - - return iproject; - } - - public String loadFile(IFile file) throws Exception { - if (file.getType() != IFile.FILE) { - throw new IllegalArgumentException("File: " + file.getFullPath().toString() + " is a directory!"); - } - - InputStream in = null; - StringBuffer out; - try { - in = file.getContents(); - out = new StringBuffer(); - byte[] buffer = new byte[4 * 1024]; - int c = 0; - while ((c = in.read(buffer)) > -1) { - out.append(new String(buffer, 0, c)); - } - } finally { - if (in != null) { - try { - in.close(); - } catch (IOException e) { - // ignore - } - } - } - return out.length() == 0 ? null : out.toString(); - } - - protected void openFile(String projectName, String... path) throws Exception { - log.info("Opening file: " + path[path.length - 1] + " ..."); - pExplorer.openFile(projectName, path); - } - - public Version getServerToolsVersion() { - return Platform.getBundle("org.eclipse.wst.server.ui").getVersion(); - } - - public Version getBpelUiVersion() { - return Platform.getBundle("org.eclipse.bpel.ui").getVersion(); - } - - public boolean isProjectDeployed(String projectName) { - String serverName = OdeDeployTest.configuredState.getServer().name; - - bot.viewByTitle("Servers").show(); - bot.viewByTitle("Servers").setFocus(); - - SWTBotTree tree = bot.viewByTitle("Servers").bot().tree(); - SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Synchronized]").select(); - server.expand(); - bot.sleep(TIME_5S); - - String status = "[Synchronized]"; - // TODO: the version comparison should be better - if (getServerToolsVersion().toString().startsWith("1.3")) { - status = "[Started, Synchronized]"; - } - - return server.getNode(projectName + " " + status).isVisible(); - } -} Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/util/ResourceHelper.java =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/util/ResourceHelper.java 2012-06-12 11:19:26 UTC (rev 41889) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/util/ResourceHelper.java 2012-06-12 12:00:25 UTC (rev 41890) @@ -1,23 +1,26 @@ package org.jboss.tools.bpel.ui.bot.test.util; +import java.io.IOException; import java.net.URL; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Platform; import org.eclipse.swtbot.swt.finder.SWTBot; import org.jboss.tools.ui.bot.ext.SWTBotExt; -import org.junit.Assert; import org.osgi.framework.Bundle; +/** + * + * @author mbaluch, apodhrad + * + */ public class ResourceHelper { public static void importProject(String bundleName, String templatePath, String projectName) throws Exception { try { SWTBotExt bot = new SWTBotExt(); - Bundle bundle = Platform.getBundle(bundleName); - URL url = bundle.getEntry(templatePath); - String path = FileLocator.resolve(url).getFile(); + String path = getPath(bundleName, templatePath); bot.menu("File").menu("Import...").click(); SWTBot viewBot = bot.shell("Import").bot(); @@ -37,4 +40,10 @@ } } + public static String getPath(String bundleName, String templatePath) throws IOException { + Bundle bundle = Platform.getBundle(bundleName); + URL url = bundle.getEntry(templatePath); + return FileLocator.resolve(url).getFile(); + } + }

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41889 - trunk/documentation/whatsnew.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2012-06-12 07:19:26 -0400 (Tue, 12 Jun 2012) New Revision: 41889 Modified: trunk/documentation/whatsnew/index.html Log: JBIDE-11931 incl. openshift Modified: trunk/documentation/whatsnew/index.html =================================================================== --- trunk/documentation/whatsnew/index.html 2012-06-12 11:03:46 UTC (rev 41888) +++ trunk/documentation/whatsnew/index.html 2012-06-12 11:19:26 UTC (rev 41889) @@ -55,12 +55,12 @@ <a href="as/as-news-3.3.0.CR1.html">JBoss AS Server Tools</a> <a href="jmx/jmx-news-1.2.0.CR1.html">JMX</a> + <a href="openshift/openshift-news-2.3.0.CR1.html">OpenShift + Tools</a> <a href="maven/maven-news-3.3.0.CR1.html">Maven</a> <a href="vpe/vpe-news-3.3.0.CR1.html">Visual Page Editor/BrowserSim</a> - <a href="openshift/openshift-news-2.3.0.CR1.html">OpenShift - Tools</a> - + </td> </tr> <tr>

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41888 - in trunk/documentation/whatsnew: jmx and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2012-06-12 07:03:46 -0400 (Tue, 12 Jun 2012) New Revision: 41888 Modified: trunk/documentation/whatsnew/index.html trunk/documentation/whatsnew/jmx/jmx-news-1.2.0.CR1.html Log: JBIDE-11931 incl. openshift Modified: trunk/documentation/whatsnew/index.html =================================================================== --- trunk/documentation/whatsnew/index.html 2012-06-12 11:00:35 UTC (rev 41887) +++ trunk/documentation/whatsnew/index.html 2012-06-12 11:03:46 UTC (rev 41888) @@ -56,7 +56,11 @@ <a href="as/as-news-3.3.0.CR1.html">JBoss AS Server Tools</a> <a href="jmx/jmx-news-1.2.0.CR1.html">JMX</a> <a href="maven/maven-news-3.3.0.CR1.html">Maven</a> - <a href="vpe/vpe-news-3.3.0.CR1.html">Visual Page Editor/BrowserSim</a> + <a href="vpe/vpe-news-3.3.0.CR1.html">Visual Page + Editor/BrowserSim</a> + <a href="openshift/openshift-news-2.3.0.CR1.html">OpenShift + Tools</a> + </td> </tr> <tr> Modified: trunk/documentation/whatsnew/jmx/jmx-news-1.2.0.CR1.html =================================================================== --- trunk/documentation/whatsnew/jmx/jmx-news-1.2.0.CR1.html 2012-06-12 11:00:35 UTC (rev 41887) +++ trunk/documentation/whatsnew/jmx/jmx-news-1.2.0.CR1.html 2012-06-12 11:03:46 UTC (rev 41888) @@ -26,7 +26,7 @@ <h1>JMX Tools 1.2.0.CR1 - New and Noteworthy</h1> - <a href="../index.html">< Main Index</a> <a href="../maven/maven-news-3.3.0.CR1.html">Maven Tools News ></a> + <a href="../index.html">< Main Index</a> <a href="../openshift/openshift-news-2.3.0.CR1.html">OpenShift Tools News ></a> <table border="0" cellpadding="10" cellspacing="0" width="80%"> <tr>

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41887 - in trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test: base and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-06-12 07:00:35 -0400 (Tue, 12 Jun 2012) New Revision: 41887 Removed: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/SolderTestBase.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/CDISeam3AllBotTests.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/SolderAnnotationTestBase.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/DefaultBeansTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/GenericOpenOnTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/NamedPackagesTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/RequiresAnnotationTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ResourceOpenOnTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/VetoAnnotationTest.java Log: refactoring of seam3 bot tests Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/CDISeam3AllBotTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/CDISeam3AllBotTests.java 2012-06-12 10:52:10 UTC (rev 41886) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/CDISeam3AllBotTests.java 2012-06-12 11:00:35 UTC (rev 41887) @@ -38,7 +38,7 @@ VetoAnnotationTest.class, RequiresAnnotationTest.class, NamedPackagesTest.class, - FullyQualifiedTest.class + FullyQualifiedTest.class, }) public class CDISeam3AllBotTests extends AbstractTestSuite { Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java 2012-06-12 10:52:10 UTC (rev 41886) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java 2012-06-12 11:00:35 UTC (rev 41887) @@ -39,38 +39,34 @@ */ public class Seam3TestBase extends CDITestBase { - private String projectName = "CDISeam3Project"; + protected static String projectName = "CDISeam3Project"; private String packageName = "cdi.seam"; - protected final LibraryHelper libraryHelper = new LibraryHelper(); + protected final static LibraryHelper libraryHelper = new LibraryHelper(); - protected String getProjectName() { - return projectName; - } - - protected String getPackageName() { + @Override + public String getPackageName() { return packageName; } - protected SeamLibrary getSeamLibrary() { - return SeamLibrary.UNKNOWN; - } - @Override public void prepareWorkspace() { - if (!projectHelper.projectExists(getProjectName())) { - importSeam3ProjectWithLibrary(getProjectName()); - } } + @Override + public void waitForJobs() { + + } + + /** * * @param projectName * @param projectLocation * @param dir */ - protected void importSeam3TestProject(String projectName, + protected static void importSeam3TestProject(String projectName, String projectLocation, String dir) { ImportHelper.importProject(projectLocation, dir, Activator.PLUGIN_ID); @@ -81,17 +77,9 @@ /** * * @param projectName - */ - protected void importSeam3ProjectWithLibrary(String projectName) { - importSeam3ProjectWithLibrary(projectName, getSeamLibrary()); - } - - /** - * - * @param projectName * @param library */ - protected void importSeam3ProjectWithLibrary(String projectName, + protected static void importSeam3ProjectWithLibrary(String projectName, SeamLibrary library) { importSeam3TestProject(projectName, "/resources/projects/" + projectName, projectName); @@ -104,7 +92,7 @@ * @param projectName * @param library */ - protected void addAndCheckLibraryInProject(String projectName, + protected static void addAndCheckLibraryInProject(String projectName, SeamLibrary library) { addLibraryIntoProject(projectName, library.getName()); checkLibraryInProject(projectName, library.getName()); @@ -115,7 +103,7 @@ * @param projectName * @param libraryName */ - private void addLibraryIntoProject(String projectName, String libraryName) { + private static void addLibraryIntoProject(String projectName, String libraryName) { try { libraryHelper.addLibraryIntoProject(projectName, libraryName); LOGGER.info("Library: \"" + libraryName + "\" copied"); @@ -133,7 +121,7 @@ * @param projectName * @param libraryName */ - private void checkLibraryInProject(String projectName, String libraryName) { + private static void checkLibraryInProject(String projectName, String libraryName) { assertTrue(libraryHelper.isLibraryInProjectClassPath(projectName, libraryName)); } Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/SolderAnnotationTestBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/SolderAnnotationTestBase.java 2012-06-12 10:52:10 UTC (rev 41886) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/SolderAnnotationTestBase.java 2012-06-12 11:00:35 UTC (rev 41887) @@ -20,7 +20,7 @@ * @author jjankovi * */ -public class SolderAnnotationTestBase extends SolderTestBase { +public class SolderAnnotationTestBase extends Seam3TestBase { protected String APPLICATION_CLASS = "Application.java"; Deleted: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/SolderTestBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/SolderTestBase.java 2012-06-12 10:52:10 UTC (rev 41886) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/SolderTestBase.java 2012-06-12 11:00:35 UTC (rev 41887) @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010-2012 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.cdi.seam3.bot.test.base; - -import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary; -/** - * - * @author jjankovi - * - */ -public class SolderTestBase extends Seam3TestBase { - - @Override - protected SeamLibrary getSeamLibrary() { - return SeamLibrary.SOLDER; - } - -} Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/DefaultBeansTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/DefaultBeansTest.java 2012-06-12 10:52:10 UTC (rev 41886) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/DefaultBeansTest.java 2012-06-12 11:00:35 UTC (rev 41887) @@ -16,6 +16,8 @@ import org.jboss.tools.cdi.bot.test.CDIConstants; import org.jboss.tools.cdi.seam3.bot.test.base.SolderAnnotationTestBase; import org.jboss.tools.cdi.seam3.bot.test.uiutils.AssignableBeansDialogExt; +import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary; +import org.junit.After; import org.junit.Test; /** @@ -25,20 +27,19 @@ */ public class DefaultBeansTest extends SolderAnnotationTestBase { - @Override - public String getProjectName() { - return "defaultBeans"; - } + private static String projectName = "defaultBeans"; - @Override + @After public void waitForJobs() { - projectExplorer.deleteProject(getProjectName(), true); + projectExplorer.deleteAllProjects(); } @Test public void testProperAssign() { - packageExplorer.openFile(getProjectName(), CDIConstants.SRC, + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + + packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS); assertFalse(openOnUtil.openOnByOption("managerImpl", APPLICATION_CLASS, CDIConstants.SHOW_ALL_ASSIGNABLE)); @@ -51,11 +52,13 @@ @Test public void testProperAssignAlternativesDeactive() { + + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); wizardExt.bean(getPackageName(), "ManagerImpl", true, false, false, false, true, false, null, "Manager", null, null).finish(); - packageExplorer.openFile(getProjectName(), CDIConstants.SRC, + packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS); assertTrue(openOnUtil.openOnByOption("managerImpl", APPLICATION_CLASS, CDIConstants.SHOW_ALL_ASSIGNABLE)); @@ -81,11 +84,13 @@ @Test public void testProperUnassign() { + + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); wizardExt.bean(getPackageName(), "ManagerImpl", true, false, false, false, false, false, null, "Manager", null, null).finish(); - packageExplorer.openFile(getProjectName(), CDIConstants.SRC, + packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS); assertTrue(openOnUtil.openOnByOption("managerImpl", APPLICATION_CLASS, CDIConstants.SHOW_ALL_ASSIGNABLE)); @@ -111,11 +116,13 @@ @Test public void testProperUnassignAlternativesActive() { + + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); wizardExt.bean(getPackageName(), "ManagerImpl", true, false, false, false, true, true, null, "Manager", null, null).finish(); - packageExplorer.openFile(getProjectName(), CDIConstants.SRC, + packageExplorer.openFile(projectName, CDIConstants.SRC, getPackageName(), APPLICATION_CLASS); assertTrue(openOnUtil.openOnByOption("managerImpl", APPLICATION_CLASS, CDIConstants.SHOW_ALL_ASSIGNABLE)); Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java 2012-06-12 10:52:10 UTC (rev 41886) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java 2012-06-12 11:00:35 UTC (rev 41887) @@ -14,6 +14,7 @@ import org.jboss.tools.cdi.bot.test.CDIConstants; import org.jboss.tools.cdi.seam3.bot.test.base.SolderAnnotationTestBase; import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary; +import org.junit.After; import org.junit.Test; /** @@ -26,12 +27,7 @@ private final String EXACT_INTERFACE = "exact-interface"; private final String EXACT_BEANS = "exact-beans"; - @Override - public void prepareWorkspace() { - - } - - @Override + @After public void waitForJobs() { projectExplorer.deleteAllProjects(); } Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java 2012-06-12 10:52:10 UTC (rev 41886) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java 2012-06-12 11:00:35 UTC (rev 41887) @@ -20,6 +20,7 @@ import org.jboss.tools.cdi.bot.test.uiutils.CollectionsUtil; import org.jboss.tools.cdi.seam3.bot.test.base.SolderAnnotationTestBase; import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary; +import org.junit.After; import org.junit.Test; /** @@ -29,16 +30,11 @@ */ public class FullyQualifiedTest extends SolderAnnotationTestBase { - @Override + @After public void waitForJobs() { projectExplorer.deleteAllProjects(); } - @Override - public void prepareWorkspace() { - - } - @Test public void testNonNamedBean() { Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/GenericOpenOnTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/GenericOpenOnTest.java 2012-06-12 10:52:10 UTC (rev 41886) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/GenericOpenOnTest.java 2012-06-12 11:00:35 UTC (rev 41887) @@ -13,8 +13,10 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; import org.jboss.tools.cdi.bot.test.CDIConstants; -import org.jboss.tools.cdi.seam3.bot.test.base.SolderTestBase; +import org.jboss.tools.cdi.seam3.bot.test.base.Seam3TestBase; +import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary; import org.jboss.tools.ui.bot.ext.Timing; +import org.junit.BeforeClass; import org.junit.Test; /** @@ -24,15 +26,17 @@ * */ -public class GenericOpenOnTest extends SolderTestBase { +public class GenericOpenOnTest extends Seam3TestBase { private final String GENERIC_POINT_1 = "MyExtendedConfiguration "; private final String GENERIC_POINT_2 = "MyConfigurationProducer.getOneConfig()"; private final String GENERIC_POINT_3 = "MyConfigurationProducer.getSecondConfig()"; - @Override - public String getProjectName() { - return "generic"; + private static String projectName = "generic"; + + @BeforeClass + public static void setup() { + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); } /** @@ -41,7 +45,7 @@ @Test public void testGenericOpenOn() { - packageExplorer.openFile(getProjectName(), CDIConstants.SRC, + packageExplorer.openFile(projectName, CDIConstants.SRC, "cdi.seam", "MyBeanInjections.java"); checkFirstOpenOnAndGeneric(); Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/NamedPackagesTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/NamedPackagesTest.java 2012-06-12 10:52:10 UTC (rev 41886) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/NamedPackagesTest.java 2012-06-12 11:00:35 UTC (rev 41887) @@ -16,7 +16,9 @@ import org.jboss.tools.cdi.bot.test.CDIConstants; import org.jboss.tools.cdi.bot.test.uiutils.CollectionsUtil; -import org.jboss.tools.cdi.seam3.bot.test.base.SolderTestBase; +import org.jboss.tools.cdi.seam3.bot.test.base.Seam3TestBase; +import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary; +import org.junit.After; import org.junit.Test; /** @@ -24,23 +26,19 @@ * @author jjankovi * */ -public class NamedPackagesTest extends SolderTestBase { +public class NamedPackagesTest extends Seam3TestBase { private final String CDI_SEAM_PACKAGE = "cdi.seam"; private final String CDI_TEST_PACKAGE = "cdi.test"; private final String ORG_JBOSS_PACKAGE = "org.jboss"; + private static String projectName = "named"; private final String PACKAGE_INFO_JAVA_CDI = "package-info.java.cdi"; private final String PACKAGE_INFO_JAVA = "package-info.java"; private final String MANAGER_JAVA = "Manager.java"; - @Override - public String getProjectName() { - return "named"; - } - - @Override + @After public void waitForJobs() { projectExplorer.deleteAllProjects(); } @@ -48,7 +46,9 @@ @Test public void testNoNamedPackaged() { - setEd(packageExplorer.openFile(getProjectName(), CDIConstants.SRC, + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + + setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, ORG_JBOSS_PACKAGE, MANAGER_JAVA).toTextEditor()); List<String> beansProposal = editResourceUtil.getProposalList( MANAGER_JAVA, "\"#{}\"", 3, 0); @@ -61,11 +61,13 @@ @Test public void testOneNamedPackage() { + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + editResourceUtil.renameFileInExplorerBase(packageExplorer, PACKAGE_INFO_JAVA_CDI, - getProjectName() + "/" + CDIConstants.SRC + "/" + CDI_SEAM_PACKAGE, PACKAGE_INFO_JAVA); + projectName + "/" + CDIConstants.SRC + "/" + CDI_SEAM_PACKAGE, PACKAGE_INFO_JAVA); eclipse.cleanAllProjects(); - setEd(packageExplorer.openFile(getProjectName(), CDIConstants.SRC, + setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, ORG_JBOSS_PACKAGE, MANAGER_JAVA).toTextEditor()); List<String> beansProposal = editResourceUtil.getProposalList( MANAGER_JAVA, "\"#{}\"", 3, 0); @@ -80,13 +82,15 @@ @Test public void testBothNamedPackages() { + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); + editResourceUtil.renameFileInExplorerBase(packageExplorer, PACKAGE_INFO_JAVA_CDI, - getProjectName() + "/" + CDIConstants.SRC + "/" + CDI_SEAM_PACKAGE, PACKAGE_INFO_JAVA); + projectName + "/" + CDIConstants.SRC + "/" + CDI_SEAM_PACKAGE, PACKAGE_INFO_JAVA); editResourceUtil.renameFileInExplorerBase(packageExplorer, PACKAGE_INFO_JAVA_CDI, - getProjectName() + "/" + CDIConstants.SRC + "/" + CDI_TEST_PACKAGE, PACKAGE_INFO_JAVA); + projectName + "/" + CDIConstants.SRC + "/" + CDI_TEST_PACKAGE, PACKAGE_INFO_JAVA); eclipse.cleanAllProjects(); - setEd(packageExplorer.openFile(getProjectName(), CDIConstants.SRC, + setEd(packageExplorer.openFile(projectName, CDIConstants.SRC, ORG_JBOSS_PACKAGE, MANAGER_JAVA).toTextEditor()); List<String> beansProposal = editResourceUtil.getProposalList( MANAGER_JAVA, "\"#{}\"", 3, 0); Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/RequiresAnnotationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/RequiresAnnotationTest.java 2012-06-12 10:52:10 UTC (rev 41886) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/RequiresAnnotationTest.java 2012-06-12 11:00:35 UTC (rev 41887) @@ -14,6 +14,7 @@ import org.jboss.tools.cdi.bot.test.CDIConstants; import org.jboss.tools.cdi.seam3.bot.test.base.SolderAnnotationTestBase; import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary; +import org.junit.After; import org.junit.Test; /** @@ -23,16 +24,11 @@ */ public class RequiresAnnotationTest extends SolderAnnotationTestBase { - @Override + @After public void waitForJobs() { projectExplorer.deleteAllProjects(); } - @Override - public void prepareWorkspace() { - - } - @Test public void testManagedBeans() { Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ResourceOpenOnTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ResourceOpenOnTest.java 2012-06-12 10:52:10 UTC (rev 41886) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ResourceOpenOnTest.java 2012-06-12 11:00:35 UTC (rev 41887) @@ -13,7 +13,9 @@ import org.jboss.tools.cdi.bot.test.CDIConstants; -import org.jboss.tools.cdi.seam3.bot.test.base.SolderTestBase; +import org.jboss.tools.cdi.seam3.bot.test.base.Seam3TestBase; +import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary; +import org.junit.BeforeClass; import org.junit.Test; /** @@ -22,11 +24,13 @@ * @author Jaroslav Jankovic */ -public class ResourceOpenOnTest extends SolderTestBase { +public class ResourceOpenOnTest extends Seam3TestBase { - @Override - public String getProjectName() { - return "resource"; + private static String projectName = "resource"; + + @BeforeClass + public static void setup() { + importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER); } /** @@ -37,7 +41,7 @@ String className = "MyBean.java"; - packageExplorer.openFile(getProjectName(), CDIConstants.SRC, + packageExplorer.openFile(projectName, CDIConstants.SRC, "cdi.seam", className); assertTrue(openOnUtil.openOnByOption(CDIConstants.RESOURCE_ANNOTATION, @@ -48,8 +52,8 @@ destinationFile.equals(CDIConstants.BEANS_XML)); editResourceUtil.moveFileInExplorerBase(packageExplorer, CDIConstants.BEANS_XML, - getProjectName() + "/" + CDIConstants.WEBCONTENT + "/" + CDIConstants.WEB_INF, - getProjectName() + "/" + CDIConstants.WEBCONTENT + "/" + CDIConstants.META_INF); + projectName + "/" + CDIConstants.WEBCONTENT + "/" + CDIConstants.WEB_INF, + projectName + "/" + CDIConstants.WEBCONTENT + "/" + CDIConstants.META_INF); LOGGER.info("bean.xml was moved to META-INF"); setEd(bot.swtBotEditorExtByTitle(className)); Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/VetoAnnotationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/VetoAnnotationTest.java 2012-06-12 10:52:10 UTC (rev 41886) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/VetoAnnotationTest.java 2012-06-12 11:00:35 UTC (rev 41887) @@ -14,6 +14,7 @@ import org.jboss.tools.cdi.bot.test.CDIConstants; import org.jboss.tools.cdi.seam3.bot.test.base.SolderAnnotationTestBase; import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary; +import org.junit.After; import org.junit.Test; /** @@ -23,16 +24,11 @@ */ public class VetoAnnotationTest extends SolderAnnotationTestBase { - @Override + @After public void waitForJobs() { projectExplorer.deleteAllProjects(); } - @Override - public void prepareWorkspace() { - - } - @Test public void testManagedBeans() {

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41886 - trunk/documentation/whatsnew/as.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2012-06-12 06:52:10 -0400 (Tue, 12 Jun 2012) New Revision: 41886 Modified: trunk/documentation/whatsnew/as/as-news-3.3.0.CR1.html Log: duplicate infinite is unknown Modified: trunk/documentation/whatsnew/as/as-news-3.3.0.CR1.html =================================================================== --- trunk/documentation/whatsnew/as/as-news-3.3.0.CR1.html 2012-06-12 10:45:52 UTC (rev 41885) +++ trunk/documentation/whatsnew/as/as-news-3.3.0.CR1.html 2012-06-12 10:52:10 UTC (rev 41886) @@ -181,7 +181,7 @@ enabled (server, metadata, and custom), as they are for previous versions. And second, the running server will receive the list of folders that need to be added (or removed) from the server's deployment scanners. No more will users have to suffer through widely differing levels of functionality depending on - their app server version. The infinite is unknown at JBoss Tools. + their app server version. No matter what you're trying to accomplish, you can do it, and JBoss Tools can help. <img src="images/9239.png" alt="new fileset defaults"/> <a href="https://issues.jboss.org/browse/JBIDE-9239">JBIDE-9239</a>,

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41885 - trunk/documentation/whatsnew/jmx.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2012-06-12 06:45:52 -0400 (Tue, 12 Jun 2012) New Revision: 41885 Modified: trunk/documentation/whatsnew/jmx/jmx-news-1.2.0.CR1.html Log: typo Modified: trunk/documentation/whatsnew/jmx/jmx-news-1.2.0.CR1.html =================================================================== --- trunk/documentation/whatsnew/jmx/jmx-news-1.2.0.CR1.html 2012-06-12 10:43:40 UTC (rev 41884) +++ trunk/documentation/whatsnew/jmx/jmx-news-1.2.0.CR1.html 2012-06-12 10:45:52 UTC (rev 41885) @@ -40,7 +40,7 @@ <td valign="top" align="left"> JMX Support for AS 7.x!</td> <td valign="top"> - Support for JBoss AS 7.x has been completed for this release. Functioanlly, it will look exactly + Support for JBoss AS 7.x has been completed for this release. Functionally, it will look exactly as it does for AS 6 and below. When you start a server from the JBoss Servers view, and once the startup completes, the MBean Explorer view will attempt to connect to the newly started server. Several errors in the core JMX plugins were fixed to allow this.

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41884 - trunk/documentation/whatsnew/as.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2012-06-12 06:43:40 -0400 (Tue, 12 Jun 2012) New Revision: 41884 Modified: trunk/documentation/whatsnew/as/as-news-3.3.0.CR1.html Log: added spaces tojbosstools Modified: trunk/documentation/whatsnew/as/as-news-3.3.0.CR1.html =================================================================== --- trunk/documentation/whatsnew/as/as-news-3.3.0.CR1.html 2012-06-12 09:47:23 UTC (rev 41883) +++ trunk/documentation/whatsnew/as/as-news-3.3.0.CR1.html 2012-06-12 10:43:40 UTC (rev 41884) @@ -110,7 +110,7 @@ <td valign="top" width="90%"> Take any EAR project, right-click it, run it on your server, and watch a browser open. Why is this so cool? Because webtools doesn't have it! That's right. Webtools can find some way to run all their projects on your server, except for EAR projects that is! - Well not any more. The new behaviour in JBossTools is to select the first Web project in your EAR and run that one instead. + Well not any more. The new behaviour in JBoss Tools is to select the first Web project in your EAR and run that one instead. The full module will get published, of course, but at least now a browser will show up with something! In a related issue, right-clicking a .java file to run on your server seems to have always come up with a bit of a strange choice for a web url. It'd actually open a URL like yourwar.war/web-inf/classes/ReallyCoolThing.java. @@ -144,8 +144,8 @@ a new fileset, you may have noticed that AS 7's defaults were a little... outdated. Default folders that only make sense for AS 6 and below are soOoOOoo beta2. It's a bit like seeing someone wear bellbottoms... it doesn't ruin your day, but it does make you feel just a little more sad about where the world is heading. Either way, - JBossTools 3.3.0 CR1 replaces those old rags with new sensible defaults. I can't promise they'll make you smile, - but, lets all be honest with ourselves... they will ;) JBossTools Rules!!! + JBoss Tools 3.3.0 CR1 replaces those old rags with new sensible defaults. I can't promise they'll make you smile, + but, lets all be honest with ourselves... they will ;) JBoss Tools Rules!!! <img src="images/11059.png" alt="new fileset defaults"/> <a href="https://issues.jboss.org/browse/JBIDE-11059">Related Jira</a> </td> @@ -156,11 +156,11 @@ No IPs, no problem! IPv6 support verified! </td> <td valign="top" width="90%"> - According to our devs and our QE teams, IPv6 support for JBossTools is online and fully operational. + According to our devs and our QE teams, IPv6 support for JBoss Tools is online and fully operational. Loading local AS 7 servers with a hostname of "::1" will no longer result in a stuck process and an unresponsive and recalcitrant server refusing repeated requests to shut down already! Browser support in eclipse is also present, so Run-on-server actions should yield the expected result. - It's times like this you know JBossTools was the right choice, at the right time, and for the right reasons. + It's times like this you know JBoss Tools was the right choice, at the right time, and for the right reasons. <a href="https://issues.jboss.org/browse/JBIDE-11626">Related Jira</a> </td> </tr> @@ -181,7 +181,7 @@ enabled (server, metadata, and custom), as they are for previous versions. And second, the running server will receive the list of folders that need to be added (or removed) from the server's deployment scanners. No more will users have to suffer through widely differing levels of functionality depending on - their app server version. The infinite is unknown at JBossTools. + their app server version. The infinite is unknown at JBoss Tools. <img src="images/9239.png" alt="new fileset defaults"/> <a href="https://issues.jboss.org/browse/JBIDE-9239">JBIDE-9239</a>, @@ -201,14 +201,14 @@ Which args do I modify again? </td> <td valign="top" width="90%"> - Some users who were running servers based on RSE were getting confused how, exactly, + Some users who were running remote servers based on RSE were getting confused how, exactly, to change their launch and stop arguments. By opening the server view, and double-clicking your server, the server editor opens. If you then click "Open Launch Configuration", you have a huge array of options available, but, perhaps, too many options. To help clear up the confusion, if you're running an RSE server, opening the launch configuration will now ONLY show you the remote launch args tab. If you're running a local server, however, all options (minus the RSE tab) will show. - A small step every day, with JBossTools leading the way! + A small step every day, with JBoss Tools leading the way! <img src="images/11587.png" alt="zero-second scanner"/> <a href="https://issues.jboss.org/browse/JBIDE-11587">Related Jira</a> </td> @@ -233,7 +233,7 @@ was Adding a new fileset. And so we cleaned that up, added better defaults, and removed fields that just didn't belong! - Remember, for all your development environment needs, JBossTools is + Remember, for all your development environment needs, JBoss Tools is <a href="http://www.youtube.com/watch?v=oHg5SJYRHA0">NEVER</a> gonna give you up!!! <img src="images/11820.png" alt="default classpath entries"/> <a href="https://issues.jboss.org/browse/JBIDE-11820">Related Jira</a>

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41883 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: decorator and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-06-12 05:47:23 -0400 (Tue, 12 Jun 2012) New Revision: 41883 Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorFromWebBeanTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AssignableDialogFilterTest.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QuickFixProposalsDescriptionTest.java Log: cdi bot test refactoring Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java 2012-06-12 09:16:15 UTC (rev 41882) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java 2012-06-12 09:47:23 UTC (rev 41883) @@ -80,13 +80,19 @@ return packageName; } - protected void importCDITestProject(String projectName, + protected static void importCDITestProject(String projectName) { + String location = "/resources/projects/" + projectName; + importCDITestProject(projectName, location, projectName); + } + + protected static void importCDITestProject(String projectName, String projectLocation, String dir) { ImportHelper.importProject(projectLocation, dir, PluginActivator.PLUGIN_ID); eclipse.addConfiguredRuntimeIntoProject(projectName, configuredState.getServer().name); + eclipse.cleanAllProjects(); } } \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorFromWebBeanTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorFromWebBeanTest.java 2012-06-12 09:16:15 UTC (rev 41882) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorFromWebBeanTest.java 2012-06-12 09:47:23 UTC (rev 41883) @@ -47,22 +47,19 @@ @Before public void prepareWorkspace() { - if (!projectHelper.projectExists(getProjectName())) { - importCDITestProject(getProjectName(), - "/resources/projects/" + - getProjectName(), getProjectName()); - eclipse.cleanAllProjects(); - } + } @After - public void waitForJobs() { - projectExplorer.deleteProject(getProjectName(), true); + public void cleanUp() { + projectExplorer.deleteAllProjects(); } @Test public void testCreatingDecoratorWithMenu() { + importCDITestProject(getProjectName()); + String[] path = (getProjectName() + "/" + CDIConstants.SRC + "/" + getPackageName()).split("/"); @@ -111,6 +108,8 @@ @Test public void testCreatingDecoratorWithWizard() { + importCDITestProject(getProjectName()); + CDIWizardBase decoratorWizard = new NewCDIFileWizard( CDIWizardType.DECORATOR).run(); decoratorWizard.setName(ACCOUNT_DECORATOR). Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java 2012-06-12 09:16:15 UTC (rev 41882) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java 2012-06-12 09:47:23 UTC (rev 41883) @@ -14,7 +14,7 @@ import org.jboss.tools.cdi.bot.test.CDIConstants; import org.jboss.tools.cdi.bot.test.CDITestBase; import org.jboss.tools.cdi.bot.test.uiutils.wizards.AssignableBeansDialog; -import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; public class AllAssignableDialogTest extends CDITestBase { @@ -26,14 +26,9 @@ return "CDIAssignableDialogTest"; } - @Before - public void prepareWorkspace() { - if (!projectHelper.projectExists(getProjectName())) { - importCDITestProject(getProjectName(), - "/resources/projects/" + - getProjectName(), getProjectName()); - eclipse.cleanAllProjects(); - } + @BeforeClass + public static void prepareWS() { + importCDITestProject("CDIAssignableDialogTest"); } @Test Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AssignableDialogFilterTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AssignableDialogFilterTest.java 2012-06-12 09:16:15 UTC (rev 41882) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AssignableDialogFilterTest.java 2012-06-12 09:47:23 UTC (rev 41883) @@ -14,7 +14,7 @@ import org.jboss.tools.cdi.bot.test.CDIConstants; import org.jboss.tools.cdi.bot.test.CDITestBase; import org.jboss.tools.cdi.bot.test.uiutils.wizards.AssignableBeansDialog; -import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; public class AssignableDialogFilterTest extends CDITestBase { @@ -26,14 +26,9 @@ return "AssignableDialogFilterTest"; } - @Before - public void prepareWorkspace() { - if (!projectHelper.projectExists(getProjectName())) { - importCDITestProject(getProjectName(), - "/resources/projects/" + - getProjectName(), getProjectName()); - eclipse.cleanAllProjects(); - } + @BeforeClass + public static void prepareWS() { + importCDITestProject("AssignableDialogFilterTest"); } @Test Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QuickFixProposalsDescriptionTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QuickFixProposalsDescriptionTest.java 2012-06-12 09:16:15 UTC (rev 41882) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QuickFixProposalsDescriptionTest.java 2012-06-12 09:47:23 UTC (rev 41883) @@ -18,7 +18,7 @@ import org.jboss.tools.cdi.bot.test.CDIConstants; import org.jboss.tools.cdi.bot.test.CDITestBase; import org.jboss.tools.cdi.bot.test.uiutils.wizards.OpenOnOptionsDialog; -import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; public class QuickFixProposalsDescriptionTest extends CDITestBase { @@ -28,14 +28,9 @@ return "CDIQuickFixProposals"; } - @Before - public void prepareWorkspace() { - if (!projectHelper.projectExists(getProjectName())) { - importCDITestProject(getProjectName(), - "/resources/projects/" + - getProjectName(), getProjectName()); - eclipse.cleanAllProjects(); - } + @BeforeClass + public static void prepareWS() { + importCDITestProject("CDIQuickFixProposals"); } @Test

13 years, 10 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits June 2012