June 2012 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r41882 - in trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test: resources and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: ljelinko Date: 2012-06-12 05:16:15 -0400 (Tue, 12 Jun 2012) New Revision: 41882 Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/eap-6.properties trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Test.java trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeleteAS7Server.java trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/entity/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/entity/XMLConfiguration.java Removed: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/CreateServerTest.java Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java Log: Created first test Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch 2012-06-12 08:59:35 UTC (rev 41881) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch 2012-06-12 09:16:15 UTC (rev 41882) @@ -30,7 +30,7 @@ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.ide.eclipse.as.ui.bot.test"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024m -XX:MaxPermSize=256m"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=/home/ljelinko/work/workspaces/jboss-tools/org.jboss.ide.eclipse.as.ui.bot.test/resources/eap-6.properties -Xmx1024m -XX:MaxPermSize=256m"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.platform.ide"/> <booleanAttribute key="show_selected_only" value="false"/> Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/eap-6.properties =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/eap-6.properties (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/eap-6.properties 2012-06-12 09:16:15 UTC (rev 41882) @@ -0,0 +1 @@ +SERVER=EAP,6.0,default,/home/ljelinko/programs/jboss/EAP/jboss-eap-6.0 Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-06-12 08:59:35 UTC (rev 41881) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-06-12 09:16:15 UTC (rev 41882) @@ -1,12 +1,17 @@ package org.jboss.ide.eclipse.as.ui.bot.test; +import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Test; +import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeleteAS7Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as7.OperateAS7Server; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(RequirementAwareSuite.class) @Suite.SuiteClasses({ - CreateServerTest.class + CreateAS7Test.class, + OperateAS7Server.class, + DeleteAS7Server.class }) public class AllTestsSuite { Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/CreateServerTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/CreateServerTest.java 2012-06-12 08:59:35 UTC (rev 41881) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/CreateServerTest.java 2012-06-12 09:16:15 UTC (rev 41882) @@ -1,12 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.bot.test; - -import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.junit.Test; - -public class CreateServerTest extends SWTTestExt { - - @Test - public void test(){ - System.out.println("TEST"); - } -} Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Test.java (from rev 41816, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/CreateServerTest.java) =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Test.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Test.java 2012-06-12 09:16:15 UTC (rev 41882) @@ -0,0 +1,39 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as7; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.Matchers.is; + +import java.util.List; + +import org.jboss.ide.eclipse.as.ui.bot.test.editor.ServerEditor; +import org.jboss.ide.eclipse.as.ui.bot.test.entity.XMLConfiguration; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +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; + +/** + * Creates server and checks its ports (in both the server view and server editor) + * + * @author Lucia Jelinkova + * + */ +@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.Present)) +public class CreateAS7Test extends SWTTestExt { + + @Test + public void createServer(){ + ServerEditor editor = new ServerEditor(configuredState.getServer().name); + editor.open(); + + assertThat("8080", is(editor.getWebPort())); + assertThat("9999", is(editor.getManagementPort())); + + List<XMLConfiguration> configurations = editor.getXMLConfiguration("Ports"); + assertThat(configurations, hasItem(new XMLConfiguration("JBoss Management", "${jboss.management.native.port:9999}"))); + assertThat(configurations, hasItem(new XMLConfiguration("JBoss Web", "8080"))); + } +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeleteAS7Server.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeleteAS7Server.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeleteAS7Server.java 2012-06-12 09:16:15 UTC (rev 41882) @@ -0,0 +1,23 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as7; + +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.view.ServersView; +import org.junit.Test; + +/** + * Deletes the server. + * + * @author Lucia Jelinkova + * + */ +public class DeleteAS7Server extends SWTTestExt { + + private ServersView serversView = new ServersView(); + + @Test + public void deleteServer(){ + serversView.deleteServer(configuredState.getServer().name); + + assertFalse(serversView.serverExists(configuredState.getServer().name)); + } +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java 2012-06-12 09:16:15 UTC (rev 41882) @@ -0,0 +1,56 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as7; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; + +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher; +import org.jboss.tools.ui.bot.ext.view.ServersView; +import org.junit.Test; + +public class OperateAS7Server extends SWTTestExt { + + private ServersView serversView = new ServersView(); + + protected String getServerName(){ + return configuredState.getServer().name; + } + + @Test + public void operateServer(){ + startServer(); + restartServer(); + stopServer(); + } + + public void startServer(){ + serversView.startServer(getServerName()); + + assertNoException("Starting server"); + assertServerState("Starting server", "Started"); + + } + + public void restartServer(){ + serversView.restartServer(getServerName()); + + assertNoException("Restarting server"); + assertServerState("Restarting server", "Started"); + } + + public void stopServer(){ + serversView.stopServer(getServerName()); + + assertNoException("Stopping server"); + assertServerState("Stopping server", "Stopped"); + } + + protected void assertNoException(String message) { + assertThat(message, "Exception:", not(new ConsoleOutputMatcher())); + } + + protected void assertServerState(String message, String state) { + assertThat(message, serversView.getServerStatus(getServerName()), is(state)); + } +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java 2012-06-12 09:16:15 UTC (rev 41882) @@ -0,0 +1,83 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.editor; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.waits.ICondition; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.ide.eclipse.as.ui.bot.test.entity.XMLConfiguration; +import org.jboss.tools.ui.bot.ext.SWTBotFactory; +import org.jboss.tools.ui.bot.ext.view.ServersView; + +public class ServerEditor { + + private ServersView serversView = new ServersView(); + + private String name; + + public ServerEditor(String name) { + super(); + this.name = name; + } + + public void open(){ + serversView.openServerEditor(name); + } + + public ServerLaunchConfiguration openLaunchConfiguration(){ + SWTBotFactory.getBot().hyperlink("Open launch configuration").click(); + SWTBotFactory.getBot().shell("Edit Configuration").activate(); + return new ServerLaunchConfiguration(); + } + + public String getWebPort(){ + return SWTBotFactory.getBot().textWithLabel("Web").getText(); + } + + public String getManagementPort(){ + return SWTBotFactory.getBot().textWithLabel("Management").getText(); + } + + public List<XMLConfiguration> getXMLConfiguration(String categoryName){ + SWTBotTreeItem server = serversView.findServerByName(name); + server.expand(); + final SWTBotTreeItem category = server.expandNode("XML Configuration", categoryName); + + SWTBotFactory.getBot().waitUntil(new TreeItemLabelChangedCondition(category.getNode(0))); + + List<XMLConfiguration> configurations = new ArrayList<XMLConfiguration>(); + for (SWTBotTreeItem item : category.getItems()){ + String[] columns = item.getText().split(" "); + configurations.add(new XMLConfiguration(columns[0].trim(), columns[1].trim())); + } + return configurations; + } + + private static class TreeItemLabelChangedCondition implements ICondition { + + private String firstTimeText; + + private SWTBotTreeItem item; + + public TreeItemLabelChangedCondition(SWTBotTreeItem item) { + super(); + this.item = item; + } + + @Override + public void init(SWTBot bot) { + firstTimeText = item.getText(); + } + + @Override + public boolean test() throws Exception { + return !firstTimeText.equals(item.getText()); + } + + @Override + public String getFailureMessage() { + return "Expected the tree item's text to change"; + } + } +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java 2012-06-12 09:16:15 UTC (rev 41882) @@ -0,0 +1,14 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.editor; + +import org.jboss.tools.ui.bot.ext.SWTBotFactory; + +public class ServerLaunchConfiguration { + + public String getProgramArguments(){ + return SWTBotFactory.getBot().textInGroup("Program arguments:").getText(); + } + + public String getVMArguments(){ + return SWTBotFactory.getBot().textInGroup("VM arguments:").getText(); + } +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/entity/XMLConfiguration.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/entity/XMLConfiguration.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/entity/XMLConfiguration.java 2012-06-12 09:16:15 UTC (rev 41882) @@ -0,0 +1,70 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.entity; + +public class XMLConfiguration { + + private String key; + + private String value; + + public XMLConfiguration() { + // default + } + + public XMLConfiguration(String key, String value) { + super(); + this.key = key; + this.value = value; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + @Override + public String toString() { + return getKey() + "=" + getValue(); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((key == null) ? 0 : key.hashCode()); + result = prime * result + ((value == null) ? 0 : value.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + XMLConfiguration other = (XMLConfiguration) obj; + if (key == null) { + if (other.key != null) + return false; + } else if (!key.equals(other.key)) + return false; + if (value == null) { + if (other.value != null) + return false; + } else if (!value.equals(other.value)) + return false; + return true; + } +}

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41881 - 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 04:59:35 -0400 (Tue, 12 Jun 2012) New Revision: 41881 Modified: trunk/documentation/whatsnew/as/as-news-3.3.0.CR1.html trunk/documentation/whatsnew/jmx/jmx-news-1.2.0.CR1.html Log: JBIDE-11931 minor adjustments 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 08:18:22 UTC (rev 41880) +++ trunk/documentation/whatsnew/as/as-news-3.3.0.CR1.html 2012-06-12 08:59:35 UTC (rev 41881) @@ -27,7 +27,7 @@ <h1>JBoss AS Tools 3.3.0.CR1 What's New</h1> <p align="right"><a href="../index.html">< Main Index</a> <a -href="../openshift/openshift-news-2.3.0.CR1.html">OpenShift Tools></a></p> +href="../jmx/jmx-news-1.2.0.CR1.html">JMX Tools></a></p> <table border="0" cellpadding="10" cellspacing="0" width="80%"> <tr> @@ -47,7 +47,8 @@ <p>Servers that live in directories with spaces have long been a problem issue in the past, but now, rest assured that your servers will be well taken care of! Starting and stopping these servers should now work flawlessly, and with the correct arguments no doubt!! Various other server argument bugs were fixed as well, - helping to make JBossTools as strong as our word! You're in good hands, with JBossTools!</p> + helping to make JBossTools as strong as our word! You're in + good hands, with JBoss Tools!</p> <p><small> <a href="https://issues.jboss.org/browse/JBIDE-12001">Primary Jira</a></br> Related Jiras: <a href="https://issues.jboss.org/browse/JBIDE-11824">JBIDE-11824</a>, @@ -149,6 +150,7 @@ <p><small><a href="https://issues.jboss.org/browse/JBIDE-11059">Related Jira</a></small></p> </td> </tr> + <tr><td colspan="2"><hr /></td></tr> <tr> <td valign="top" align="right"> <p><b>No IPs, no problem! IPv6 support verified!</b></p> @@ -162,7 +164,7 @@ <p><small><a href="https://issues.jboss.org/browse/JBIDE-11626">Related Jira</a></small></p> </td> </tr> - + <tr><td colspan="2"><hr /></td></tr> <tr> <td valign="top" align="right"> <p><b>Stop polluting my deployments folder!</b></p> @@ -193,7 +195,7 @@ <p><small><a href="https://issues.jboss.org/browse/JBIDE-11275">JBIDE-11275</a> </small></p> </td> </tr> - + <tr><td colspan="2"><hr /></td></tr> <tr> <td valign="top" align="right"> <p><b>Which args do I modify again?</b></p> @@ -211,7 +213,7 @@ <p><small><a href="https://issues.jboss.org/browse/JBIDE-11587">Related Jira</a></small></p> </td> </tr> - +<tr><td colspan="2"><hr /></td></tr> <tr> <td valign="top" align="right"> <p><b>Default classpaths per server made more user friendly</b></p> 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 08:18:22 UTC (rev 41880) +++ trunk/documentation/whatsnew/jmx/jmx-news-1.2.0.CR1.html 2012-06-12 08:59:35 UTC (rev 41881) @@ -26,7 +26,7 @@ <h1>JMX Tools 1.2.0.CR1 - New and Noteworthy</h1> - <p align="right"><a href="../index.html">< Main Index</a> <a href="../jst/jst-news-3.3.0.CR1-full.html">JST/JSF Tools News ></a></p> + <p align="right"><a href="../index.html">< Main Index</a> <a href="../maven/maven-news-3.3.0.CR1.html">Maven Tools News ></a></p> <table border="0" cellpadding="10" cellspacing="0" width="80%"> <tr>

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41880 - trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-06-12 04:18:22 -0400 (Tue, 12 Jun 2012) New Revision: 41880 Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/FilesetTest.java Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java Log: FilesetTest implemented and added into test suite Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java =================================================================== --- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java 2012-06-12 08:17:44 UTC (rev 41879) +++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java 2012-06-12 08:18:22 UTC (rev 41880) @@ -24,6 +24,7 @@ VariousProjectsArchiving.class, ArchiveViewReSwitchingTest.class, FolderTest.class, + FilesetTest.class, UserLibrariesFilesetTest.class, BuildingArchiveNode.class, BuildingProjectTest.class, Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/FilesetTest.java =================================================================== --- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/FilesetTest.java (rev 0) +++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/FilesetTest.java 2012-06-12 08:18:22 UTC (rev 41880) @@ -0,0 +1,78 @@ +/******************************************************************************* + * 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.archives.ui.bot.test; + +import org.jboss.tools.archives.ui.bot.test.dialog.FilesetDialog; +import org.jboss.tools.archives.ui.bot.test.explorer.ProjectArchivesExplorer; +import org.jboss.tools.archives.ui.bot.test.view.ProjectArchivesView; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * + * @author jjankovi + * + */ +public class FilesetTest extends ArchivesTestBase { + + private static String projectName = "pr2"; + + private final String PATH_SUFFIX = " [/" + projectName + "]"; + private final String ARCHIVE_NAME = projectName + ".jar"; + private final String ARCHIVE_PATH = + ARCHIVE_NAME + PATH_SUFFIX; + + @BeforeClass + public static void setup() { + importProjectWithoutRuntime(projectName); + } + + + @Test + public void testCreatingFileSetInView() { + String includes = "**"; + String excludes = "*.jar"; + + /* prepare view for testing */ + ProjectArchivesView view = viewForProject(projectName); + + /* create folder */ + String fileset = createFileset(view.createFileset(projectName, ARCHIVE_PATH), + includes, excludes, true); + + /* test if folder was created */ + assertItemExistsInView(view, projectName, ARCHIVE_PATH, fileset + projectName); + } + + @Test + public void testCreatingFileSetInExplorer() { + String includes = "**"; + String excludes = "*.jar, .svn/**"; + + /* prepare view for testing */ + ProjectArchivesExplorer explorer = explorerForProject(projectName); + + /* create folder */ + String fileset = createFileset(explorer.createFileset(ARCHIVE_PATH), + includes, excludes, true); + + /* test if folder was created */ + assertItemExistsInExplorer(explorer, ARCHIVE_PATH, fileset + projectName); + } + + private String createFileset(FilesetDialog dialog, String includes, + String excludes, boolean setFlatten) { + dialog.setIncludes(includes).setExcludes(excludes). + setFlatten(setFlatten).finish(); + return "+[" + includes + "] -[" + excludes + "] : /"; + } + +}

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41879 - in trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test: dialog and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-06-12 04:17:44 -0400 (Tue, 12 Jun 2012) New Revision: 41879 Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/FilesetDialog.java Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/context/ArchiveContextMenu.java trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java Log: FilesetDialog + tools for working with this dialog implemented Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/context/ArchiveContextMenu.java =================================================================== --- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/context/ArchiveContextMenu.java 2012-06-12 07:41:54 UTC (rev 41878) +++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/context/ArchiveContextMenu.java 2012-06-12 08:17:44 UTC (rev 41879) @@ -15,6 +15,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.archives.ui.bot.test.dialog.ArchivePublishSettingsDialog; import org.jboss.tools.archives.ui.bot.test.dialog.EditArchiveDialog; +import org.jboss.tools.archives.ui.bot.test.dialog.FilesetDialog; import org.jboss.tools.archives.ui.bot.test.dialog.FolderCreatingDialog; import org.jboss.tools.archives.ui.bot.test.dialog.NewJarDialog; import org.jboss.tools.archives.ui.bot.test.dialog.UserLibrariesFilesetDialog; @@ -62,6 +63,15 @@ return new FolderCreatingDialog(); } + public FilesetDialog createFileset(SWTBotTree tree, + SWTBotTreeItem item) { + ContextMenuHelper.prepareTreeItemForContextMenu(tree, item); + SWTBotMenu menu = new SWTBotMenu(ContextMenuHelper. + getContextMenu(tree, "New Fileset", false)); + menu.click(); + return new FilesetDialog(); + } + public UserLibrariesFilesetDialog createUserLibraryFileset(SWTBotTree tree, SWTBotTreeItem item) { ContextMenuHelper.prepareTreeItemForContextMenu(tree, item); Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/FilesetDialog.java =================================================================== --- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/FilesetDialog.java (rev 0) +++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/FilesetDialog.java 2012-06-12 08:17:44 UTC (rev 41879) @@ -0,0 +1,85 @@ +/******************************************************************************* + * 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.archives.ui.bot.test.dialog; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; +import org.jboss.tools.ui.bot.ext.SWTBotFactory; +import org.jboss.tools.ui.bot.ext.types.IDELabel; + +/** + * + * @author jjankovi + * + */ +public class FilesetDialog { + + private SWTBotShell shell = null; + private SWTBot bot = null; + private final String DIALOG_TITLE = "Fileset Wizard"; + + public FilesetDialog() { + shell = SWTBotFactory.getBot().shell(getDialogTitle()); + bot = shell.bot(); + } + + private String getDialogTitle() { + return DIALOG_TITLE; + } + + public FilesetDialog setFlatten(boolean set) { + if (set) { + bot.radio(2).click(); + } else { + bot.radio(3).click(); + } + return this; + } + + public FilesetDialog setIncludes(String pattern) { + bot.textWithLabel("Includes:").setText(pattern); + return this; + } + + public String getIncludes() { + return bot.textWithLabel("Includes:").getText(); + } + + public FilesetDialog setExcludes(String pattern) { + bot.textWithLabel("Excludes:").setText(pattern); + return this; + } + + public String getExcludes() { + return bot.textWithLabel("Excludes:").getText(); + } + + public List<String> getPreview() { + List<String> preview = new ArrayList<String>(); + for (int i = 0; i < bot.table().rowCount(); i++) { + preview.add(bot.table().getTableItem(i).getText()); + } + return preview; + } + + public void cancel() { + bot.button(IDELabel.Button.CANCEL).click(); + } + + public void finish() { + bot.button(IDELabel.Button.FINISH).click(); + SWTBotFactory.getUtil().waitForNonIgnoredJobs(); + } + +} Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java =================================================================== --- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java 2012-06-12 07:41:54 UTC (rev 41878) +++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java 2012-06-12 08:17:44 UTC (rev 41879) @@ -17,6 +17,7 @@ import org.jboss.tools.archives.ui.bot.test.context.ArchiveContextMenu; import org.jboss.tools.archives.ui.bot.test.dialog.ArchivePublishSettingsDialog; import org.jboss.tools.archives.ui.bot.test.dialog.EditArchiveDialog; +import org.jboss.tools.archives.ui.bot.test.dialog.FilesetDialog; import org.jboss.tools.archives.ui.bot.test.dialog.FolderCreatingDialog; import org.jboss.tools.archives.ui.bot.test.dialog.NewJarDialog; import org.jboss.tools.archives.ui.bot.test.dialog.UserLibrariesFilesetDialog; @@ -63,6 +64,12 @@ return contextTool.createFolder(tree, treeItem); } + public FilesetDialog createFileset(String archive) { + SWTBotTree tree = this.bot().tree(); + SWTBotTreeItem treeItem = explorer.getNode(archive); + return contextTool.createFileset(tree, treeItem); + } + public UserLibrariesFilesetDialog createUserLibraryFileset(String archive) { SWTBotTree tree = this.bot().tree(); SWTBotTreeItem treeItem = explorer.getNode(archive); Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java =================================================================== --- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java 2012-06-12 07:41:54 UTC (rev 41878) +++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java 2012-06-12 08:17:44 UTC (rev 41879) @@ -16,6 +16,7 @@ import org.jboss.tools.archives.ui.bot.test.context.ArchiveContextMenu; import org.jboss.tools.archives.ui.bot.test.dialog.ArchivePublishSettingsDialog; import org.jboss.tools.archives.ui.bot.test.dialog.EditArchiveDialog; +import org.jboss.tools.archives.ui.bot.test.dialog.FilesetDialog; import org.jboss.tools.archives.ui.bot.test.dialog.FolderCreatingDialog; import org.jboss.tools.archives.ui.bot.test.dialog.NewJarDialog; import org.jboss.tools.archives.ui.bot.test.dialog.UserLibrariesFilesetDialog; @@ -68,6 +69,12 @@ return contextTool.createFolder(tree, treeItem); } + public FilesetDialog createFileset(String... pathToArchive) { + SWTBotTree tree = this.bot().tree(); + SWTBotTreeItem treeItem = TreeHelper.expandNode(this.bot(), pathToArchive); + return contextTool.createFileset(tree, treeItem); + } + public UserLibrariesFilesetDialog createUserLibraryFileset(String... pathToArchive) { SWTBotTree tree = this.bot().tree(); SWTBotTreeItem treeItem = TreeHelper.expandNode(this.bot(), pathToArchive);

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41878 - trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-06-12 03:41:54 -0400 (Tue, 12 Jun 2012) New Revision: 41878 Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/UserLibrariesFilesetTest.java Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java Log: UserLibrariesFilesetTest implemented and added into test suite Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java =================================================================== --- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java 2012-06-12 07:40:38 UTC (rev 41877) +++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java 2012-06-12 07:41:54 UTC (rev 41878) @@ -24,6 +24,7 @@ VariousProjectsArchiving.class, ArchiveViewReSwitchingTest.class, FolderTest.class, + UserLibrariesFilesetTest.class, BuildingArchiveNode.class, BuildingProjectTest.class, BuildingArchiveTest.class, Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/UserLibrariesFilesetTest.java =================================================================== --- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/UserLibrariesFilesetTest.java (rev 0) +++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/UserLibrariesFilesetTest.java 2012-06-12 07:41:54 UTC (rev 41878) @@ -0,0 +1,110 @@ +/******************************************************************************* + * 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.archives.ui.bot.test; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; +import org.jboss.tools.archives.ui.bot.test.dialog.UserLibrariesFilesetDialog; +import org.jboss.tools.archives.ui.bot.test.explorer.ProjectArchivesExplorer; +import org.jboss.tools.archives.ui.bot.test.view.ProjectArchivesView; +import org.jboss.tools.ui.bot.ext.gen.IPreference; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; + +/** + * + * @author jjankovi + * + */ +public class UserLibrariesFilesetTest extends ArchivesTestBase { + + private static String projectName = "pr2"; + + private final String PATH_SUFFIX = " [/" + projectName + "]"; + private final String ARCHIVE_NAME = projectName + ".jar"; + private final String ARCHIVE_PATH = + ARCHIVE_NAME + PATH_SUFFIX; + + private final static String USER_LIBRARY_1 = "myLibrary1"; + private final static String USER_LIBRARY_2 = "myLibrary2"; + + @BeforeClass + public static void setup() { + importProjectWithoutRuntime(projectName); + createUserLibrary(USER_LIBRARY_1); + createUserLibrary(USER_LIBRARY_2); + } + + @Test + public void testCreatingUserLibraryFileSetInView() { + + /* prepare view for testing */ + ProjectArchivesView view = viewForProject(projectName); + + /* create folder */ + createUserLibraryFileset(view.createUserLibraryFileset(projectName, ARCHIVE_PATH), USER_LIBRARY_1); + + /* test if folder was created */ + assertItemExistsInView(view, projectName, ARCHIVE_PATH, USER_LIBRARY_1); + } + @Ignore // not implemented in tools yet + @Test + public void testCreatingUserLibraryFileSetInExplorer() { + /* prepare view for testing */ + ProjectArchivesExplorer explorer = explorerForProject(projectName); + + /* create folder */ + createUserLibraryFileset(explorer.createUserLibraryFileset(ARCHIVE_PATH), USER_LIBRARY_2); + + /* test if folder was created */ + assertItemExistsInExplorer(explorer, ARCHIVE_PATH, USER_LIBRARY_2); + } + + private void createUserLibraryFileset( + UserLibrariesFilesetDialog dialog, String userLibrary) { + dialog.selectUserLibrary(userLibrary).finish(); + } + + private static void createUserLibrary(String userLibrary) { + SWTBot bot = getUserLibraryPreferencePage(); + bot.button(IDELabel.Button.NEW).click(); + SWTBotShell shell = bot.shell("New User Library"); + shell.bot().text().setText(userLibrary); + shell.bot().button(IDELabel.Button.OK).click(); + bot.button(IDELabel.Button.OK).click(); + util.waitForNonIgnoredJobs(); + } + + private static SWTBot getUserLibraryPreferencePage() { + IPreference page = new IPreference() { + + @Override + public String getName() { + return "User Libraries"; + } + + @Override + public List<String> getGroupPath() { + List<String> path = new ArrayList<String>(); + path.add("Java"); + path.add("Build Path"); + return path; + } + }; + return open.preferenceOpen(page); + } + +}

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41877 - in trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test: dialog and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-06-12 03:40:38 -0400 (Tue, 12 Jun 2012) New Revision: 41877 Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/UserLibrariesFilesetDialog.java Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/context/ArchiveContextMenu.java trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java Log: UserLibrariesFilesetDialog + tools for working with this dialog implemented Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/context/ArchiveContextMenu.java =================================================================== --- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/context/ArchiveContextMenu.java 2012-06-12 06:33:18 UTC (rev 41876) +++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/context/ArchiveContextMenu.java 2012-06-12 07:40:38 UTC (rev 41877) @@ -17,6 +17,7 @@ import org.jboss.tools.archives.ui.bot.test.dialog.EditArchiveDialog; import org.jboss.tools.archives.ui.bot.test.dialog.FolderCreatingDialog; import org.jboss.tools.archives.ui.bot.test.dialog.NewJarDialog; +import org.jboss.tools.archives.ui.bot.test.dialog.UserLibrariesFilesetDialog; import org.jboss.tools.ui.bot.ext.SWTBotFactory; import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; @@ -61,6 +62,15 @@ return new FolderCreatingDialog(); } + public UserLibrariesFilesetDialog createUserLibraryFileset(SWTBotTree tree, + SWTBotTreeItem item) { + ContextMenuHelper.prepareTreeItemForContextMenu(tree, item); + SWTBotMenu menu = new SWTBotMenu(ContextMenuHelper. + getContextMenu(tree, "New User Library Fileset", false)); + menu.click(); + return new UserLibrariesFilesetDialog(); + } + public EditArchiveDialog editArchive(SWTBotTree tree, SWTBotTreeItem item) { ContextMenuHelper.prepareTreeItemForContextMenu(tree, item); Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/UserLibrariesFilesetDialog.java =================================================================== --- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/UserLibrariesFilesetDialog.java (rev 0) +++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/UserLibrariesFilesetDialog.java 2012-06-12 07:40:38 UTC (rev 41877) @@ -0,0 +1,64 @@ +/******************************************************************************* + * 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.archives.ui.bot.test.dialog; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.ui.bot.ext.SWTBotFactory; +import org.jboss.tools.ui.bot.ext.types.IDELabel; + +/** + * + * @author jjankovi + * + */ +public class UserLibrariesFilesetDialog { + + private SWTBotShell shell = null; + private SWTBot bot = null; + private final String DIALOG_TITLE = "User Library Fileset Wizard"; + + public UserLibrariesFilesetDialog() { + shell = SWTBotFactory.getBot().shell(getDialogTitle()); + bot = shell.bot(); + } + + private String getDialogTitle() { + return DIALOG_TITLE; + } + + public List<String> getUserLibraries() { + List<String> userLibraries = new ArrayList<String>(); + for (SWTBotTreeItem ti : bot.tree().getAllItems()) { + userLibraries.add(ti.getText()); + } + return userLibraries; + } + + public UserLibrariesFilesetDialog selectUserLibrary(String library) { + bot.tree().select(library); + return this; + } + + public void cancel() { + bot.button(IDELabel.Button.CANCEL).click(); + } + + public void finish() { + bot.button(IDELabel.Button.FINISH).click(); + SWTBotFactory.getUtil().waitForNonIgnoredJobs(); + } + +} Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java =================================================================== --- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java 2012-06-12 06:33:18 UTC (rev 41876) +++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java 2012-06-12 07:40:38 UTC (rev 41877) @@ -19,6 +19,7 @@ import org.jboss.tools.archives.ui.bot.test.dialog.EditArchiveDialog; import org.jboss.tools.archives.ui.bot.test.dialog.FolderCreatingDialog; import org.jboss.tools.archives.ui.bot.test.dialog.NewJarDialog; +import org.jboss.tools.archives.ui.bot.test.dialog.UserLibrariesFilesetDialog; import org.jboss.tools.ui.bot.ext.SWTBotFactory; import org.jboss.tools.ui.bot.ext.helper.TreeHelper; import org.jboss.tools.ui.bot.ext.view.ProjectExplorer; @@ -62,6 +63,12 @@ return contextTool.createFolder(tree, treeItem); } + public UserLibrariesFilesetDialog createUserLibraryFileset(String archive) { + SWTBotTree tree = this.bot().tree(); + SWTBotTreeItem treeItem = explorer.getNode(archive); + return contextTool.createUserLibraryFileset(tree, treeItem); + } + public EditArchiveDialog editArchive(String archive) { SWTBotTree tree = this.bot().tree(); SWTBotTreeItem treeItem = explorer.getNode(archive); Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java =================================================================== --- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java 2012-06-12 06:33:18 UTC (rev 41876) +++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java 2012-06-12 07:40:38 UTC (rev 41877) @@ -18,6 +18,7 @@ import org.jboss.tools.archives.ui.bot.test.dialog.EditArchiveDialog; import org.jboss.tools.archives.ui.bot.test.dialog.FolderCreatingDialog; import org.jboss.tools.archives.ui.bot.test.dialog.NewJarDialog; +import org.jboss.tools.archives.ui.bot.test.dialog.UserLibrariesFilesetDialog; import org.jboss.tools.ui.bot.ext.gen.ActionItem.View.JBossToolsProjectarchives; import org.jboss.tools.ui.bot.ext.helper.TreeHelper; import org.jboss.tools.ui.bot.ext.types.IDELabel; @@ -67,6 +68,12 @@ return contextTool.createFolder(tree, treeItem); } + public UserLibrariesFilesetDialog createUserLibraryFileset(String... pathToArchive) { + SWTBotTree tree = this.bot().tree(); + SWTBotTreeItem treeItem = TreeHelper.expandNode(this.bot(), pathToArchive); + return contextTool.createUserLibraryFileset(tree, treeItem); + } + public EditArchiveDialog editArchive(String... pathToArchive) { SWTBotTree tree = this.bot().tree(); SWTBotTreeItem treeItem = TreeHelper.expandNode(this.bot(), pathToArchive); @@ -94,7 +101,7 @@ public boolean itemExists(String... path) { try { - bot.tree(0).getTreeItem(path[0]).collapse(); + this.bot().tree(0).getTreeItem(path[0]).collapse(); TreeHelper.expandNode(bot, path); return true; } catch (WidgetNotFoundException exc) {

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41876 - trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test.

by jbosstools-commits＠lists.jboss.org

Author: jgargula Date: 2012-06-12 02:33:18 -0400 (Tue, 12 Jun 2012) New Revision: 41876 Modified: trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml Log: Increased timeout for execution. Modified: trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml =================================================================== --- trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml 2012-06-12 01:47:43 UTC (rev 41875) +++ trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml 2012-06-12 06:33:18 UTC (rev 41876) @@ -24,6 +24,7 @@ <useUIThread>false</useUIThread> <testSuite>org.jboss.tools.drools.ui.bot.test</testSuite> <testClass>org.jboss.tools.drools.ui.bot.test.DroolsAllBotTests</testClass> + <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> <dependencies combine.children="append"> <dependency> <type>p2-installable-unit</type>

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41875 - trunk/openshift/docs/reference/en-US.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2012-06-11 21:47:43 -0400 (Mon, 11 Jun 2012) New Revision: 41875 Modified: trunk/openshift/docs/reference/en-US/Book_Info.xml trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml trunk/openshift/docs/reference/en-US/Viewing_the_remote_console.xml Log: updated with QU corrections Modified: trunk/openshift/docs/reference/en-US/Book_Info.xml =================================================================== --- trunk/openshift/docs/reference/en-US/Book_Info.xml 2012-06-12 01:34:15 UTC (rev 41874) +++ trunk/openshift/docs/reference/en-US/Book_Info.xml 2012-06-12 01:47:43 UTC (rev 41875) @@ -13,7 +13,7 @@ <edition>5.0.0</edition> - <pubsnumber>9</pubsnumber> + <pubsnumber>10</pubsnumber> <abstract> <para> Modified: trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml =================================================================== --- trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml 2012-06-12 01:34:15 UTC (rev 41874) +++ trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml 2012-06-12 01:47:43 UTC (rev 41875) @@ -99,7 +99,7 @@ </imageobject> <textobject> <phrase> - Configuring the project and server adaptor settings. + Configuring the project and server adapter settings. </phrase> </textobject> </mediaobject> @@ -165,7 +165,7 @@ The OpenShift application that you created through the wizard, will appear in your <guilabel>Package Explorer</guilabel> tab. </para> <figure id="application_creation_11"> - <title>Publising your project through the server adaptor</title> + <title>Publising your project through the server adapter</title> <mediaobject> <imageobject> <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_11.png" format="PNG" /> @@ -178,7 +178,7 @@ </mediaobject> </figure> <para> - The wizard has also created a server adaptor that connects to your OpenShift service. In the <guilabel>Servers</guilabel> tab there will be an OpenShift server available that contains your application. Any changes you make locally to the application can be published to your OpenShift instance by right-clicking on the application under the server in the <guilabel>Servers</guilabel> view, and selecting <guimenuitem>Full Publish</guimenuitem>. + The wizard has also created a server adapter that connects to your OpenShift service. In the <guilabel>Servers</guilabel> tab there will be an OpenShift server available that contains your application. Any changes you make locally to the application can be published to your OpenShift instance by right-clicking on the application under the server in the <guilabel>Servers</guilabel> view, and selecting <guimenuitem>Full Publish</guimenuitem>. </para> <figure id="application_creation_12"> <title>OpenShift server overview and settings</title> Modified: trunk/openshift/docs/reference/en-US/Viewing_the_remote_console.xml =================================================================== --- trunk/openshift/docs/reference/en-US/Viewing_the_remote_console.xml 2012-06-12 01:34:15 UTC (rev 41874) +++ trunk/openshift/docs/reference/en-US/Viewing_the_remote_console.xml 2012-06-12 01:47:43 UTC (rev 41875) @@ -11,14 +11,14 @@ Similar to when you are running a server locally, you are also able to see console output for your remote OpenShift server. To have this output displayed to you, right-click on your OpenShift server in the <guilabel>Servers</guilabel> tab and select <menuchoice><guimenuitem>OpenShift</guimenuitem><guimenuitem>Tail files</guimenuitem></menuchoice>. </para> <figure id="openshift_remote_console_01"> - <title>Selecting the OpenShift Profile</title> + <title>Tailing OpenShift server output</title> <mediaobject> <imageobject> <imagedata fileref="images/OpenShift_Remote_Console/openshift_remote_console_01.png" format="PNG" /> </imageobject> <textobject> <phrase> - Selecting the remote console for the OpenShift server adapter. + Selecting OpenShift server console viewing. </phrase> </textobject> </mediaobject> @@ -27,7 +27,7 @@ A new tab will open called <guilabel>Console</guilabel> and display the last 100 lines of the servers <filename>boot.log</filename> and <filename>server.log</filename> files. This <guilabel>Console</guilabel> tab will now tail the content of these files on the server, outputing any updates to you, as they occur. </para> <figure id="openshift_remote_console_02"> - <title>Selecting the OpenShift Profile</title> + <title>Viewing OpenShift server console output</title> <mediaobject> <imageobject> <imagedata fileref="images/OpenShift_Remote_Console/openshift_remote_console_02.png" format="PNG" />

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41874 - in workspace/dgolovin/new-releng: features/org.jboss.tools.tp.dependencies and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2012-06-11 21:34:15 -0400 (Mon, 11 Jun 2012) New Revision: 41874 Modified: workspace/dgolovin/new-releng/.project workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/feature.xml workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/pom.xml workspace/dgolovin/new-releng/parent/pom.xml workspace/dgolovin/new-releng/target-platform/jboss.tools.tp.product workspace/dgolovin/new-releng/target-platform/pom.xml Log: target platform build for juno Modified: workspace/dgolovin/new-releng/.project =================================================================== --- workspace/dgolovin/new-releng/.project 2012-06-12 01:03:50 UTC (rev 41873) +++ workspace/dgolovin/new-releng/.project 2012-06-12 01:34:15 UTC (rev 41874) @@ -8,4 +8,16 @@ </buildSpec> <natures> </natures> + <linkedResources> + <link> + <name>jbdevstudio-beta3</name> + <type>2</type> + <location>/home/eskimo/jbdevstudio-beta3</location> + </link> + <link> + <name>jbdevstudio-beta3-maven</name> + <type>2</type> + <location>/home/eskimo/jbdevstudio-beta3-maven</location> + </link> + </linkedResources> </projectDescription> Modified: workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/feature.xml =================================================================== --- workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/feature.xml 2012-06-12 01:03:50 UTC (rev 41873) +++ workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/feature.xml 2012-06-12 01:34:15 UTC (rev 41874) @@ -23,12 +23,12 @@ version="0.0.0" unpack="false"/> - <plugin +  <plugin id="org.slf4j.api" @@ -37,11 +37,18 @@ version="0.0.0" unpack="false"/> - <plugin +  + + <plugin + id="javax.el" + download-size="0" + install-size="0" + version="0.0.0" unpack="false"/> - + </feature> Modified: workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/pom.xml =================================================================== --- workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/pom.xml 2012-06-12 01:03:50 UTC (rev 41873) +++ workspace/dgolovin/new-releng/features/org.jboss.tools.tp.dependencies/pom.xml 2012-06-12 01:34:15 UTC (rev 41874) @@ -8,7 +8,7 @@ <version>1.0.0-SNAPSHOT</version> </parent> <groupId>com.jboss.tools.releng.features</groupId> - <artifactId>org.jboss.tools.releng.dependencies</artifactId> + <artifactId>org.jboss.tools.tp.dependencies</artifactId> <name>org.jboss.tools.releng.dependencies feature</name> <packaging>eclipse-feature</packaging> Modified: workspace/dgolovin/new-releng/parent/pom.xml =================================================================== --- workspace/dgolovin/new-releng/parent/pom.xml 2012-06-12 01:03:50 UTC (rev 41873) +++ workspace/dgolovin/new-releng/parent/pom.xml 2012-06-12 01:34:15 UTC (rev 41874) @@ -9,7 +9,7 @@ <packaging>pom</packaging> <properties> - <tychoVersion>0.10.0</tychoVersion> + <tychoVersion>0.15.0</tychoVersion> <eclipse.update.url>http://mirrors.xmission.com/eclipse/releases/indigo/201105200900</eclipse.update.url> </properties> @@ -20,14 +20,34 @@ <version>1.3</version> </plugin> <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-packaging-plugin</artifactId> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-packaging-plugin</artifactId> <version>${tychoVersion}</version> <configuration> <format>'v'yyyyMMddHHmm</format> <archiveSite>true</archiveSite> <environments> <environment> + <os>macosx</os> + <ws>cocoa</ws> + <arch>x86</arch> + </environment> + <environment> + <os>macosx</os> + <ws>cocoa</ws> + <arch>x86_64</arch> + </environment> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86</arch> + </environment> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86_64</arch> + </environment> + <environment> <os>linux</os> <ws>gtk</ws> <arch>x86</arch> @@ -42,14 +62,14 @@ </plugin> <plugin> - <groupId>org.sonatype.tycho</groupId> + <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-maven-plugin</artifactId> <version>${tychoVersion}</version> <extensions>true</extensions> </plugin> <plugin> - <groupId>org.sonatype.tycho</groupId> + <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> <version>${tychoVersion}</version> <configuration> @@ -57,6 +77,26 @@ <ignoreTychoRepositories>true</ignoreTychoRepositories> <environments> <environment> + <os>macosx</os> + <ws>cocoa</ws> + <arch>x86</arch> + </environment> + <environment> + <os>macosx</os> + <ws>cocoa</ws> + <arch>x86_64</arch> + </environment> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86</arch> + </environment> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86_64</arch> + </environment> + <environment> <os>linux</os> <ws>gtk</ws> <arch>x86</arch> @@ -74,8 +114,8 @@ To allow all tests in a pom to pass/fail, use commandline flag: -fae (fail at end) --> <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-test-plugin</artifactId> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> <version>${tychoVersion}</version> <configuration> <useUIHarness>true</useUIHarness> @@ -98,8 +138,8 @@ </configuration> </plugin> <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-compiler-plugin</artifactId> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-compiler-plugin</artifactId> <version>${tychoVersion}</version> <configuration> <encoding>UTF-8</encoding> @@ -144,8 +184,8 @@ </configuration> </plugin> <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-test-plugin</artifactId> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> <version>${tychoVersion}</version> <configuration> <systemProperties combine.children="append"> @@ -508,19 +548,8 @@ eclipse --> <repositories> <repository> - <id>eclipse-indigo</id> - <url>http://mirrors.xmission.com/eclipse/releases/indigo</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> <id>eclipse-juno</id> - <url>http://mirrors.xmission.com/eclipse/releases/juno</url> + <url>http://download.eclipse.org/releases/juno</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -564,7 +593,7 @@ </repository> <repository> <id>eclipse.wtp</id> - <url>http://download.eclipse.org/webtools/repository/juno/</url> + <url>http://download.eclipse.org/webtools/downloads/drops/R3.4.0/S-3.4.0RC2-20...</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -617,9 +646,9 @@ <enabled>true</enabled> </releases> </repository> - <repository> - <id>gwt</id> - <url>http://dl.google.com/eclipse/plugin/3.7</url> + <repository> - <id>jetty</id> - <url>http://download.eclipse.org/jetty/updates/jetty-bundles-8.x</url> + <id>eclipse-4</id> + <url>http://download.eclipse.org/eclipse/updates/4.2milestones</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -640,5 +669,4 @@ </releases> </repository> </repositories> - </project> Modified: workspace/dgolovin/new-releng/target-platform/jboss.tools.tp.product =================================================================== --- workspace/dgolovin/new-releng/target-platform/jboss.tools.tp.product 2012-06-12 01:03:50 UTC (rev 41873) +++ workspace/dgolovin/new-releng/target-platform/jboss.tools.tp.product 2012-06-12 01:34:15 UTC (rev 41874) @@ -112,8 +112,9 @@ <feature id="org.eclipse.uml2.sdk"/> <feature id="org.eclipse.jgit"/> <feature id="org.eclipse.egit"/> - <feature id="com.google.gdt.eclipse.suite.e37.feature"/> - <feature id="com.google.gwt.eclipse.sdkbundle.e37.feature"/> + <feature id="org.jboss.tools.tp.dependencies"/> +  </features> Modified: workspace/dgolovin/new-releng/target-platform/pom.xml =================================================================== --- workspace/dgolovin/new-releng/target-platform/pom.xml 2012-06-12 01:03:50 UTC (rev 41873) +++ workspace/dgolovin/new-releng/target-platform/pom.xml 2012-06-12 01:34:15 UTC (rev 41874) @@ -14,7 +14,7 @@ <build> <plugins> <plugin> - <groupId>org.sonatype.tycho</groupId> + <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-p2-publisher-plugin</artifactId> <version>${tychoVersion}</version> <configuration> @@ -22,7 +22,15 @@ </configuration> </plugin> <plugin> - <groupId>org.sonatype.tycho</groupId> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-repository-plugin</artifactId> + <version>${tychoVersion}</version> + <configuration> + <includeAllDependencies>true</includeAllDependencies> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-p2-director-plugin</artifactId> <version>${tychoVersion}</version> <executions>

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r41873 - trunk/documentation/guides/JBDS_Release_Notes/en-US.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2012-06-11 21:03:50 -0400 (Mon, 11 Jun 2012) New Revision: 41873 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml Log: updated with new known issue Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml =================================================================== --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2012-06-12 00:09:48 UTC (rev 41872) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2012-06-12 01:03:50 UTC (rev 41873) @@ -8,7 +8,7 @@ <productname>JBoss Developer Studio</productname> <productnumber>5.0</productnumber> <edition>5.0.0</edition> - <pubsnumber>8</pubsnumber> + <pubsnumber>9</pubsnumber> <abstract> <para> These release notes contain important information related to the JBoss Developer Studio. New features, known issues, resources, and other current issues are addressed here. Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml =================================================================== --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml 2012-06-12 00:09:48 UTC (rev 41872) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml 2012-06-12 01:03:50 UTC (rev 41873) @@ -21,5 +21,16 @@ </para> </listitem> </varlistentry> +  + <varlistentry> + <term> + <ulink url="https://issues.jboss.org/jira/browse/JBIDE-12071">JBIDE-12071</ulink> + </term> + <listitem> + <para> + When adding a project to an OpenShift server using the context menu, or you remove a project from the OpenShift server, no dialog appears to publish or unpublish the project. The current workaround is to manually publish and unpublish a project after performing one of the above actions. + </para> + </listitem> + </varlistentry> </variablelist> </section>

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