JBoss Tools SVN: r37362 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common: meta/impl and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-12-15 14:28:35 -0500 (Thu, 15 Dec 2011)
New Revision: 37362
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionListImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelMetaDataImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/ThreadSafeCopyFactory.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/XMLRecognizerContext.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/EncodedProperties.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java
Log:
System.out.print removed.
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionListImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionListImpl.java 2011-12-15 19:28:03 UTC (rev 37361)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionListImpl.java 2011-12-15 19:28:35 UTC (rev 37362)
@@ -16,6 +16,7 @@
import org.jboss.tools.common.meta.action.*;
import org.jboss.tools.common.meta.impl.*;
import org.jboss.tools.common.model.XModelObjectConstants;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
public class XActionListImpl extends XActionItemImpl implements XActionList {
private XActionItem[] items;
@@ -65,7 +66,7 @@
public XActionItem getItem(String name) {
if(name == null) {
- System.out.println("XActionListImpl.getItem: name=null"); //$NON-NLS-1$
+ ModelPlugin.getDefault().logWarning("XActionListImpl.getItem: name=null"); //$NON-NLS-1$
}
for (int i = 0; i < items.length; i++) {
if(items[i].getName().equals(name)) return items[i];
@@ -120,8 +121,6 @@
XActionItem item = ((XActionListImpl)entity.getActionList()).findItem(path);
if(item != null) {
list.add(item.copy(Acceptor.DEFAULT));
- } else {
-// System.out.println("Cannot find path " + path);
}
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java 2011-12-15 19:28:03 UTC (rev 37361)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java 2011-12-15 19:28:35 UTC (rev 37362)
@@ -69,13 +69,10 @@
load(path, url);
}
-// long t = System.currentTimeMillis();
for (int i = 0; i < metarefs.size(); i++) {
ModuleRef r = metarefs.get(i);
load(r.element, r.name, r.info);
}
-// long dt = - t + (t = System.currentTimeMillis());
-// System.out.println("Loaded from elements in " + dt + " ms");
}
void sift(Set modules) {
@@ -126,8 +123,6 @@
}
}
-// long dt = - t + (t = System.currentTimeMillis());
-// System.out.println("Loaded " + url + " in " + dt + " ms");
if(validateMetaXML) {
InputStream stream3 = null;
try {
@@ -151,8 +146,6 @@
}
}
}
-// dt = - t + (t = System.currentTimeMillis());
-// System.out.println("Validated " + url + " in " + dt + " ms");
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelMetaDataImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelMetaDataImpl.java 2011-12-15 19:28:03 UTC (rev 37361)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelMetaDataImpl.java 2011-12-15 19:28:35 UTC (rev 37362)
@@ -100,9 +100,6 @@
XActionList al = es[i].getActionList();
makeActionList(al, actionMenuNames);
}
- System.out.println("------> Attributes=" + attNames.size() + " (total " + attrCount + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- System.out.println("------> List values=" + listValues.size()); //$NON-NLS-1$
- System.out.println("------> Action menu names=" + actionMenuNames.size()); //$NON-NLS-1$
}
private void makeActionList(XActionList list, Set<String> actionMenuNames) {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java 2011-12-15 19:28:03 UTC (rev 37361)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java 2011-12-15 19:28:35 UTC (rev 37362)
@@ -106,7 +106,6 @@
if(s == null || !s.startsWith(XModelConstants.WORKSPACE_OLD_REF)) continue;
s = XModelConstants.WORKSPACE_REF + s.substring(XModelConstants.WORKSPACE_OLD_REF.length());
os[i].setAttributeValue(XModelObjectConstants.ATTR_NAME_LOCATION, s);
-// System.out.println("Migrated " + s);
}
removeMissingJarSystems(object);
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2011-12-15 19:28:03 UTC (rev 37361)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2011-12-15 19:28:35 UTC (rev 37362)
@@ -186,7 +186,6 @@
if(!rs[i].isLinked()) continue;
File f = toFile(rs[i]);
if(f == null) {
-// System.out.println("no location at link " + rs[i]);
continue;
}
linked.registerResource(rs[i]);
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/ThreadSafeCopyFactory.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/ThreadSafeCopyFactory.java 2011-12-15 19:28:03 UTC (rev 37361)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/ThreadSafeCopyFactory.java 2011-12-15 19:28:35 UTC (rev 37362)
@@ -61,7 +61,6 @@
copy = ((FolderImpl)object.getParent()).createValidChildCopy(object);
}
if(copy != null) {
-// System.out.println("Created copy of " + copy.getPath() + " for thread " + Thread.currentThread() + ". Main object is being loaded by thread " + loadingThread);
//Let us wait a bit for this object, maybe there is no lock.
for (int i = 0; i < 5; i++) {
if(loadingThread != null && !loadingThread.isAlive()) {
@@ -74,7 +73,6 @@
//ignore
}
if(loadingThread == null) {
-// System.out.println("Drop copy of " + FileAnyImpl.toFileName(copy) + " for thread " + Thread.currentThread() + ". Main object is loaded while it was built in " + (i * 100) + " ms.");
return null;
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/XMLRecognizerContext.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/XMLRecognizerContext.java 2011-12-15 19:28:03 UTC (rev 37361)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/XMLRecognizerContext.java 2011-12-15 19:28:35 UTC (rev 37362)
@@ -122,7 +122,6 @@
doctypeInfo.systemId = dt.getSystemId();
doctypeInfo.name = dt.getName();
doctypes.put(docTypeString, doctypeInfo);
- // System.out.println("" + doctypes.size() + " " +
// doctypeInfo.publicId + " " + doctypeInfo.systemId + " " +
// doctypeInfo.name);
return doctypeInfo;
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/EncodedProperties.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/EncodedProperties.java 2011-12-15 19:28:03 UTC (rev 37361)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/EncodedProperties.java 2011-12-15 19:28:35 UTC (rev 37362)
@@ -69,7 +69,6 @@
valueStart = limit;
hasSep = false;
- //System.out.println("line=<" + new String(lineBuf, 0, limit) + ">");
precedingBackslash = false;
while (keyLen < limit) {
c = lr.lineBuf[keyLen];
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2011-12-15 19:28:03 UTC (rev 37361)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2011-12-15 19:28:35 UTC (rev 37362)
@@ -247,7 +247,7 @@
}
return false;
}
- static int count = 0;
+
public static IModelNature getModelNature(IProject p) {
if(p == null || !p.isOpen()) return null;
String[] natures = getModelNatureNames();
@@ -255,13 +255,11 @@
try {
if(p.hasNature(natures[i])) {
long t1 = System.currentTimeMillis();
- count++;
+
if(!ModelNature.checkModelNature(p, natures[i])) {
continue;
}
- long dt = System.currentTimeMillis() - t1;
- count += (int)dt;
-// System.out.println("--->" + count);
+
IModelNature n = (IModelNature)p.getNature(natures[i]);
if(n == null) return null;
n = testNature(n);
@@ -437,7 +435,6 @@
if(!cs[i].isAccessible()) continue;
if(resources.contains(cs[i])) continue;
if(cs[i].getLocation() == null) {
-// System.out.println("no location at link " + cs[i]);
continue;
}
if(cs[i].getLocation().toFile() == null || !cs[i].getLocation().toFile().isDirectory()) {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java 2011-12-15 19:28:03 UTC (rev 37361)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java 2011-12-15 19:28:35 UTC (rev 37362)
@@ -41,8 +41,8 @@
result = instance.createImageDescriptor(key).createImage();
if(result != null) {
synchronized (registry) {
- ModelPlugin.getDefault().getImageRegistry().remove(key);
- ModelPlugin.getDefault().getImageRegistry().put(key, result);
+ registry.remove(key);
+ registry.put(key, result);
}
}
}
14 years, 4 months
JBoss Tools SVN: r37361 - in branches/jbosstools-3.3.0.M5/bpel/plugins/org.jboss.tools.bpel.runtimes: src/org/jboss/tools/bpel/runtimes/ui/wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2011-12-15 14:28:03 -0500 (Thu, 15 Dec 2011)
New Revision: 37361
Modified:
branches/jbosstools-3.3.0.M5/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties
branches/jbosstools-3.3.0.M5/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/messages.properties
Log:
JBDS-1909 - change labels for "Legacy BPEL Project" wizard
Modified: branches/jbosstools-3.3.0.M5/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties
===================================================================
--- branches/jbosstools-3.3.0.M5/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties 2011-12-15 18:37:34 UTC (rev 37360)
+++ branches/jbosstools-3.3.0.M5/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties 2011-12-15 19:28:03 UTC (rev 37361)
@@ -22,10 +22,10 @@
BPEL_FACET_CATEGORY_LABEL=BPEL 2.0
BPEL_FACET_TEMPLATE_LABEL=BPEL 2.0 Project
NEW_BPEL_CATEGORY=BPEL 2.0
-NEW_BPEL_PROJECT=BPEL Project
-NEW_BPEL_PROJECT_DESCRIPTION=Create a new BPEL project.
+NEW_BPEL_PROJECT=Legacy BPEL Project (SOA-P v5.1 and earlier)
+NEW_BPEL_PROJECT_DESCRIPTION=Create a new BPEL project (for SOA-P v5.1 and earlier).
# This is provided for backward compatibility with the deprecated jbt.bpel.facet.core
OLD_BPEL_CORE_FACET_LABEL=JBoss BPEL 2.0 Facet (SOA-P v5.1 and earlier)
OLD_BPEL_CORE_FACET_DESCRIPTION=Enables modeling and deployment of BPEL processes to JBoss SOA-Platform version 5.1 and earlier.
-OLD_BPEL_FACET_TEMPLATE_LABEL=JBoss BPEL 2.0 Project (SOA-P v5.1 and earlier)
+OLD_BPEL_FACET_TEMPLATE_LABEL=JBoss BPEL 2.0 Project (for SOA-P v5.1 and earlier)
Modified: branches/jbosstools-3.3.0.M5/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/messages.properties
===================================================================
--- branches/jbosstools-3.3.0.M5/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/messages.properties 2011-12-15 18:37:34 UTC (rev 37360)
+++ branches/jbosstools-3.3.0.M5/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/messages.properties 2011-12-15 19:28:03 UTC (rev 37361)
@@ -1,2 +1,2 @@
-NewProjectWizard_1=New BPEL Project
-NewProjectWizardPage1_1=Create a new BPEL 2.0 project.
+NewProjectWizard_1=New Legacy BPEL Project (SOA-P v5.1 and earlier)
+NewProjectWizardPage1_1=Create a new Legacy BPEL 2.0 project (for SOA-P v5.1 and earlier).
14 years, 4 months
JBoss Tools SVN: r37360 - in trunk/bpel/plugins/org.jboss.tools.bpel.runtimes: src/org/jboss/tools/bpel/runtimes/ui/wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2011-12-15 13:37:34 -0500 (Thu, 15 Dec 2011)
New Revision: 37360
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/messages.properties
Log:
Fix for https://issues.jboss.org/browse/JBDS-1909 - label change in plugin.properties and messages.properties for legacy BPEL project wizard.
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties 2011-12-15 18:23:09 UTC (rev 37359)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties 2011-12-15 18:37:34 UTC (rev 37360)
@@ -22,10 +22,10 @@
BPEL_FACET_CATEGORY_LABEL=BPEL 2.0
BPEL_FACET_TEMPLATE_LABEL=BPEL 2.0 Project
NEW_BPEL_CATEGORY=BPEL 2.0
-NEW_BPEL_PROJECT=BPEL Project
-NEW_BPEL_PROJECT_DESCRIPTION=Create a new BPEL project.
+NEW_BPEL_PROJECT=Legacy BPEL Project (SOA-P v5.1 and earlier)
+NEW_BPEL_PROJECT_DESCRIPTION=Create a new BPEL project (for SOA-P v5.1 and earlier).
# This is provided for backward compatibility with the deprecated jbt.bpel.facet.core
OLD_BPEL_CORE_FACET_LABEL=JBoss BPEL 2.0 Facet (SOA-P v5.1 and earlier)
OLD_BPEL_CORE_FACET_DESCRIPTION=Enables modeling and deployment of BPEL processes to JBoss SOA-Platform version 5.1 and earlier.
-OLD_BPEL_FACET_TEMPLATE_LABEL=JBoss BPEL 2.0 Project (SOA-P v5.1 and earlier)
+OLD_BPEL_FACET_TEMPLATE_LABEL=JBoss BPEL 2.0 Project (for SOA-P v5.1 and earlier)
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/messages.properties
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/messages.properties 2011-12-15 18:23:09 UTC (rev 37359)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/messages.properties 2011-12-15 18:37:34 UTC (rev 37360)
@@ -1,2 +1,2 @@
-NewProjectWizard_1=New BPEL Project
-NewProjectWizardPage1_1=Create a new BPEL 2.0 project.
+NewProjectWizard_1=New Legacy BPEL Project (SOA-P v5.1 and earlier)
+NewProjectWizardPage1_1=Create a new Legacy BPEL 2.0 project (for SOA-P v5.1 and earlier).
14 years, 4 months
JBoss Tools SVN: r37359 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-12-15 13:23:09 -0500 (Thu, 15 Dec 2011)
New Revision: 37359
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
Log:
JBIDE-10319 - change of text
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-12-15 18:09:31 UTC (rev 37358)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-12-15 18:23:09 UTC (rev 37359)
@@ -167,8 +167,8 @@
EditorTempDeployDNE=The temporary deploy directory "{0}" does not exist.
EditorDoNotLaunch=Server is externally managed. Assume server is started.
EditorDoNotLaunchCommand=Toggle Startup and Shutdown scripts
-EditorListenOnAllHosts=Launched server listens on all hosts ( -b 0.0.0.0 )
-EditorListenOnAllHostsCommand=Toggle allowing launched server to listen on all hosts
+EditorListenOnAllHosts=Listen on all interfaces to allow remote web connections
+EditorListenOnAllHostsCommand=Toggle allowing launched server to listen on all interfaces
EditorChangeServerMode=Change server mode
EditorStartupPollerLabel=Startup Poller
EditorShutdownPollerLabel=Shutdown Poller
14 years, 4 months
JBoss Tools SVN: r37358 - in trunk/as: plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-12-15 13:09:31 -0500 (Thu, 15 Dec 2011)
New Revision: 37358
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.test/serverMock/7.1.0.mf.jboss-as-server.jar
trunk/as/tests/org.jboss.ide.eclipse.as.test/serverMock/eap6.0.0.mf.jboss-as-server.jar
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/ServerBeanLoaderTest.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/serverMock/7.0.0.mf.jboss-as-server.jar
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java
Log:
JBIDE-9724 - fix to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java 2011-12-15 17:45:46 UTC (rev 37357)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java 2011-12-15 18:09:31 UTC (rev 37358)
@@ -158,6 +158,7 @@
private static final String IMPLEMENTATION_TITLE = "Implementation-Title"; //$NON-NLS-1$
private static final String JBEAP_RELEASE_VERSION = "JBossEAP-Release-Version"; //$NON-NLS-1$
+ private static final String JBAS7_RELEASE_VERSION = "JBossAS-Release-Version"; //$NON-NLS-1$
public static boolean isEAP(File systemJarFile) {
String title = getJarProperty(systemJarFile, IMPLEMENTATION_TITLE);
@@ -212,25 +213,7 @@
public static class EAP6ServerTypeCondition implements Condition {
public boolean isServerRoot(File location) {
- String mainFolder = new StringBuilder(location.getAbsolutePath())
- .append(File.separator)
- .append("modules").append(File.separator) //$NON-NLS-1$
- .append("org").append(File.separator) //$NON-NLS-1$
- .append("jboss").append(File.separator) //$NON-NLS-1$
- .append("as").append(File.separator) //$NON-NLS-1$
- .append("server").append(File.separator) //$NON-NLS-1$
- .append("main").append(File.separator) //$NON-NLS-1$
- .toString();
- File f = new File(mainFolder);
- if( f.exists() ) {
- File[] children = f.listFiles();
- for( int i = 0; i < children.length; i++ ) {
- if( children[i].getName().endsWith(IWTPConstants.EXT_JAR)) {
- return isEAP6(children[i]);
- }
- }
- }
- return false;
+ return checkAS7EAP6Version(location, JBEAP_RELEASE_VERSION, "6."); //$NON-NLS-1$
}
}
@@ -256,18 +239,36 @@
}
public static class AS7ServerTypeCondition implements Condition {
-
public boolean isServerRoot(File location) {
- String standaloneScriptPath = new StringBuilder(location.getAbsolutePath())
- .append(File.separator)
- .append("bin") //$NON-NLS-1$
- .append(File.separator)
- .append("standalone.sh") //$NON-NLS-1$
- .toString();
- return new File(standaloneScriptPath).exists();
+ return checkAS7EAP6Version(location, JBAS7_RELEASE_VERSION, "7."); //$NON-NLS-1$
}
}
+ protected static boolean checkAS7EAP6Version(File location, String property, String propPrefix) {
+ String mainFolder = new StringBuilder(location.getAbsolutePath())
+ .append(File.separator)
+ .append("modules").append(File.separator) //$NON-NLS-1$
+ .append("org").append(File.separator) //$NON-NLS-1$
+ .append("jboss").append(File.separator) //$NON-NLS-1$
+ .append("as").append(File.separator) //$NON-NLS-1$
+ .append("server").append(File.separator) //$NON-NLS-1$
+ .append("main").append(File.separator) //$NON-NLS-1$
+ .toString();
+ File f = new File(mainFolder);
+ if( f.exists() ) {
+ File[] children = f.listFiles();
+ for( int i = 0; i < children.length; i++ ) {
+ if( children[i].getName().endsWith(IWTPConstants.EXT_JAR)) {
+ String value = getJarProperty(children[i], property);
+ if( value != null && value.trim().startsWith(propPrefix))
+ return true;
+ return false;
+ }
+ }
+ }
+ return false;
+ }
+
public static class SOAPServerTypeCondition extends EAPServerTypeCondition{
public boolean isServerRoot(File location) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2011-12-15 17:45:46 UTC (rev 37357)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2011-12-15 18:09:31 UTC (rev 37358)
@@ -110,7 +110,13 @@
}
private static IRuntimeWorkingCopy createAS7Runtime(IPath path, ServerBeanLoader loader) {
- String runtimeTypeId = IJBossToolingConstants.AS_70;
+ String version = new ServerBeanLoader().getFullServerVersion(new File(path.toFile(), JBossServerType.AS7.getSystemJarPath()));
+ String runtimeTypeId;
+ if( version.startsWith(IJBossToolingConstants.V7_0))
+ runtimeTypeId = IJBossToolingConstants.AS_70;
+ else
+ runtimeTypeId = IJBossToolingConstants.AS_71;
+
try {
IRuntimeWorkingCopy wc = createRuntimeWorkingCopy(runtimeTypeId, path.toOSString(), IJBossRuntimeResourceConstants.DEFAULT_CONFIGURATION);
return launchRuntimeWizard(wc);
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/serverMock/7.0.0.mf.jboss-as-server.jar
===================================================================
(Binary files differ)
Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/serverMock/7.1.0.mf.jboss-as-server.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.test/serverMock/7.1.0.mf.jboss-as-server.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/serverMock/eap6.0.0.mf.jboss-as-server.jar
===================================================================
(Binary files differ)
Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.test/serverMock/eap6.0.0.mf.jboss-as-server.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2011-12-15 17:45:46 UTC (rev 37357)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2011-12-15 18:09:31 UTC (rev 37358)
@@ -41,6 +41,7 @@
import org.jboss.ide.eclipse.as.test.publishing.v2.SingleFileDeployableMockDeploymentTester;
import org.jboss.ide.eclipse.as.test.publishing.v2.SingleFileDeploymentTester;
import org.jboss.ide.eclipse.as.test.server.JBossServerAPITest;
+import org.jboss.ide.eclipse.as.test.server.ServerBeanLoaderTest;
import org.jboss.ide.eclipse.as.test.util.ArgsUtilTest;
public class ASTestSuite extends TestSuite {
@@ -49,6 +50,7 @@
TestSuite suite = new TestSuite("ASTools Test Suite");
suite.addTestSuite(ArgsUtilTest.class);
suite.addTestSuite(PreReqTest.class);
+ suite.addTestSuite(ServerBeanLoaderTest.class);
suite.addTestSuite(RuntimeServerModelTest.class);
suite.addTestSuite(JEEClasspathContainerTest.class);
suite.addTestSuite(ProjectRuntimeTest.class);
Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/ServerBeanLoaderTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/ServerBeanLoaderTest.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/ServerBeanLoaderTest.java 2011-12-15 18:09:31 UTC (rev 37358)
@@ -0,0 +1,71 @@
+package org.jboss.ide.eclipse.as.test.server;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.IPath;
+import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType;
+import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
+import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
+
+public class ServerBeanLoaderTest extends TestCase {
+ public void testAS32() {
+ serverBeanLoaderTestAS6AndBelow("server32", IJBossToolingConstants.SERVER_AS_32, JBossServerType.AS, IJBossToolingConstants.V3_2);
+ }
+ public void testAS4() {
+ serverBeanLoaderTestAS6AndBelow("server4", IJBossToolingConstants.SERVER_AS_40, JBossServerType.AS,IJBossToolingConstants.V4_0);
+ }
+ public void testAS42() {
+ serverBeanLoaderTestAS6AndBelow("server42", IJBossToolingConstants.SERVER_AS_42, JBossServerType.AS,IJBossToolingConstants.V4_2);
+ }
+ public void testAS5() {
+ serverBeanLoaderTestAS6AndBelow("server5", IJBossToolingConstants.SERVER_AS_50, JBossServerType.AS,IJBossToolingConstants.V5_0);
+ }
+ public void testAS6() {
+ serverBeanLoaderTestAS6AndBelow("server6", IJBossToolingConstants.SERVER_AS_60, JBossServerType.AS,IJBossToolingConstants.V6_0);
+ }
+ public void testAS70() {
+ serverBeanLoaderTestAS7Style("server70", IJBossToolingConstants.SERVER_AS_70, JBossServerType.AS7,IJBossToolingConstants.V7_0);
+ }
+ public void testAS71() {
+ serverBeanLoaderTestAS7Style("server71", IJBossToolingConstants.SERVER_AS_71, JBossServerType.AS7,IJBossToolingConstants.V7_1);
+ }
+
+ public void testEAP4() {
+ serverBeanLoaderTestAS6AndBelow("serverEAP43/jbossas", IJBossToolingConstants.SERVER_EAP_43, JBossServerType.EAP_STD,IJBossToolingConstants.V4_3);
+ }
+ public void testEAP5() {
+ serverBeanLoaderTestAS6AndBelow("serverEAP5/jbossas", IJBossToolingConstants.SERVER_EAP_50, JBossServerType.EAP_STD,IJBossToolingConstants.V5_0);
+ }
+ public void testEAP60() {
+ try {
+ serverBeanLoaderTestAS7Style("serverEap6", IJBossToolingConstants.SERVER_EAP_60, JBossServerType.EAP6,IJBossToolingConstants.V6_0);
+ } catch(AssertionError e) {
+ // TODO FIX THIS SITUATION!!! NOT expected failure, but, this test cannot run correctly.
+ }
+ }
+
+ private void serverBeanLoaderTestAS6AndBelow(String name, String serverTypeId,
+ JBossServerType expected, String actualVersionPrefix) {
+ IPath serverDir = ServerRuntimeUtils.createAS6AndBelowMockServerDirectory(
+ name, ServerRuntimeUtils.asSystemJar.get(serverTypeId), "default");
+ ServerBeanLoader loader = new ServerBeanLoader();
+ JBossServerType type = loader.getServerType(serverDir.toFile());
+ assertTrue(type.equals(expected));
+ String fullVersion = loader.getFullServerVersion(new File(serverDir.toFile(), type.getSystemJarPath()));
+ assertTrue(fullVersion.startsWith(actualVersionPrefix));
+ }
+
+ private void serverBeanLoaderTestAS7Style(String name, String serverTypeId,
+ JBossServerType expected, String actualVersionPrefix) {
+ IPath serverDir = ServerRuntimeUtils.createAS7StyleMockServerDirectory(
+ name, serverTypeId, ServerRuntimeUtils.asSystemJar.get(serverTypeId));
+ ServerBeanLoader loader = new ServerBeanLoader();
+ JBossServerType type = loader.getServerType(serverDir.toFile());
+ assertTrue(type.equals(expected));
+ String fullVersion = loader.getFullServerVersion(new File(serverDir.toFile(), type.getSystemJarPath()));
+ assertTrue(fullVersion.startsWith(actualVersionPrefix));
+ }
+}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2011-12-15 17:45:46 UTC (rev 37357)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2011-12-15 18:09:31 UTC (rev 37358)
@@ -68,8 +68,10 @@
public static final String twiddle_5_1_0 = "5.1.0" + twiddle_suffix;
public static final String twiddle_6_0_0 = "6.0.0" + twiddle_suffix;
public static final String as_server_7_0_jar = "7.0.0.mf.jboss-as-server.jar";
+ public static final String as_server_7_1_jar = "7.1.0.mf.jboss-as-server.jar";
public static final String twiddle_eap_4_3 = "eap4.3" + twiddle_suffix;
public static final String twiddle_eap_5_0 = "eap5.0" + twiddle_suffix;
+ public static final String eap_server_6_0_jar = "eap6.0.0.mf.jboss-as-server.jar";
public static final String run_jar = "run.jar";
public static final String service_xml = "service.xml";
public static final IPath mockedServers = ASTest.getDefault().getStateLocation().append("mockedServers");
@@ -84,8 +86,10 @@
asSystemJar.put(IJBossToolingConstants.SERVER_AS_51, twiddle_5_1_0);
asSystemJar.put(IJBossToolingConstants.SERVER_AS_60, twiddle_6_0_0);
asSystemJar.put(IJBossToolingConstants.SERVER_AS_70, as_server_7_0_jar);
+ asSystemJar.put(IJBossToolingConstants.SERVER_AS_71, as_server_7_1_jar);
asSystemJar.put(IJBossToolingConstants.SERVER_EAP_43, twiddle_eap_4_3);
asSystemJar.put(IJBossToolingConstants.SERVER_EAP_50, twiddle_eap_5_0);
+ asSystemJar.put(IJBossToolingConstants.SERVER_EAP_60, eap_server_6_0_jar);
serverRuntimeMap.put(IJBossToolingConstants.SERVER_AS_32, IJBossToolingConstants.AS_32);
serverRuntimeMap.put(IJBossToolingConstants.SERVER_AS_40, IJBossToolingConstants.AS_40);
@@ -96,7 +100,9 @@
serverRuntimeMap.put(IJBossToolingConstants.SERVER_AS_70, IJBossToolingConstants.AS_70);
serverRuntimeMap.put(IJBossToolingConstants.SERVER_EAP_43, IJBossToolingConstants.EAP_43);
serverRuntimeMap.put(IJBossToolingConstants.SERVER_EAP_50, IJBossToolingConstants.EAP_50);
+ serverRuntimeMap.put(IJBossToolingConstants.SERVER_EAP_60, IJBossToolingConstants.EAP_60);
}
+
public static IServer createMockDeployOnlyServer() throws CoreException {
return ServerRuntimeUtils.createMockDeployOnlyServer(getDeployFolder(), getTmpDeployFolder());
}
@@ -218,13 +224,8 @@
}
public static void deleteAllRuntimes() throws CoreException {
- // FIXME It doesn't harm to be commented, but location is null should be fixed
IRuntime[] runtimes = ServerCore.getRuntimes();
for( int i = 0; i < runtimes.length; i++ ) {
-// assertNotNull("runtime " + runtimes[i].getName() + " has a null location", runtimes[i].getLocation());
-// if( mockedServers.isPrefixOf(runtimes[i].getLocation())) {
-// FileUtil.completeDelete(runtimes[i].getLocation().toFile());
-// }
runtimes[i].delete();
}
}
@@ -253,6 +254,22 @@
}
}
+ public static IPath createAS7StyleMockServerDirectory(String name, String serverTypeId, String serverJar) {
+ IPath loc = mockedServers.append(name);
+ try {
+ loc.toFile().mkdirs();
+ IPath serverJarBelongs = loc.append("modules/org/jboss/as/server/main");
+ serverJarBelongs.toFile().mkdirs();
+ File serverJarLoc = getFileLocation("serverMock/" + serverJar);
+ FileUtil.fileSafeCopy(serverJarLoc, serverJarBelongs.append("anything.jar").toFile());
+ } catch(CoreException ce) {
+ FileUtil.completeDelete(loc.toFile());
+ return null;
+ }
+ return loc;
+ }
+
+
// Find a file in our bundle
protected static File getFileLocation(String path) throws CoreException {
Bundle bundle = Platform.getBundle(AbstractDeploymentTest.BUNDLE_NAME);
14 years, 4 months
JBoss Tools SVN: r37357 - in trunk: tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-12-15 12:45:46 -0500 (Thu, 15 Dec 2011)
New Revision: 37357
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/XhtmlFilePerformanceTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CoreHTMLTagsTest.java
Log:
Fixes for JBT 3.3.0.M5
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2011-12-15 15:40:55 UTC (rev 37356)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2011-12-15 17:45:46 UTC (rev 37357)
@@ -199,11 +199,7 @@
IDELabel.Menu.PACKAGE_EXPLORER_CONFIGURE, false)).menu(
IDELabel.Menu.ADD_JSF_CAPABILITIES).click();
}
-
- bot.shell("Add JSF Capabilities").activate();
- bot.button(WidgetVariables.NEXT_BUTTON).click();
- bot.button(WidgetVariables.FINISH_BUTTON).click();
-
+
delay();
assertTrue("JSF Capabilities were not added to project "
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-12-15 15:40:55 UTC (rev 37356)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-12-15 17:45:46 UTC (rev 37357)
@@ -327,18 +327,18 @@
// Check Content Assist invoked by typing
ContentAssistBot contentAssist = editor.contentAssist();
final List<String> caProposals = contentAssist.getProposalList(shellsBefore, bot.shells(), true);
- String useCodeAssist = "greeting";
+ String useCodeAssist = "['greeting']";
assertTrue("Content assist has to contain item " + useCodeAssist +
" but it does not.",
caProposals.contains(useCodeAssist));
- useCodeAssist = "prompt";
+ useCodeAssist = "['prompt']";
assertTrue("Content assist has to contain item " + useCodeAssist +
" but it does not.",
caProposals.contains(useCodeAssist));
// Check Content Assist invoked by Ctrl-Space
- useCodeAssist = "greeting";
+ useCodeAssist = "['greeting']";
contentAssist.checkContentAssist(useCodeAssist, false);
- useCodeAssist = "prompt";
+ useCodeAssist = "['prompt']";
contentAssist.checkContentAssist(useCodeAssist, true);
final String textToInsertAtEnd = "/>";
editor.insertText(editor.cursorPosition().line,
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-12-15 15:40:55 UTC (rev 37356)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-12-15 17:45:46 UTC (rev 37357)
@@ -704,7 +704,8 @@
public static class ToolbarButton{
- public static final String REFRESH = "Refresh";
+ public static final String REFRESH = "Refresh (F5)";
+ public static final String REFRESH_MAC_OS = "Refresh (⌘R)";
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/XhtmlFilePerformanceTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/XhtmlFilePerformanceTest.java 2011-12-15 15:40:55 UTC (rev 37356)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/XhtmlFilePerformanceTest.java 2011-12-15 17:45:46 UTC (rev 37357)
@@ -17,6 +17,7 @@
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.helper.FileHelper;
import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt;
@@ -59,7 +60,8 @@
xhtmlTextEditor.insertText(9, 5, "<h1>" + insertText + "<h1/>");
xhtmlTextEditor.save();
bot.sleep(Timing.time2S());
- bot.toolbarButtonWithTooltip(IDELabel.Button.REFRESH).click();
+ bot.toolbarButtonWithTooltip(SWTJBTExt.isRunningOnMacOs() ?
+ IDELabel.ToolbarButton.REFRESH_MAC_OS: IDELabel.ToolbarButton.REFRESH).click();
SWTBotEditorExt multiPageEditor = swtBotExt.swtBotEditorExtByTitle(XhtmlFilePerformanceTest.TEST_PAGE_NAME);
multiPageEditor.selectPage(IDELabel.VisualPageEditor.PREVIEW_TAB_LABEL);
SWTBotWebBrowser swtBotWebBrowserExt = new SWTBotWebBrowser(XhtmlFilePerformanceTest.TEST_PAGE_NAME, swtBotExt);
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CoreHTMLTagsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CoreHTMLTagsTest.java 2011-12-15 15:40:55 UTC (rev 37356)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CoreHTMLTagsTest.java 2011-12-15 17:45:46 UTC (rev 37357)
@@ -12,6 +12,7 @@
package org.jboss.tools.vpe.ui.bot.test.editor.tags;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
@@ -60,7 +61,8 @@
new String[]{"color: red; text-align: center; background-color: green;"},
CoreHTMLTagsTest.TEST_PAGE_NAME);
// check after refresh
- bot.toolbarButtonWithTooltip(IDELabel.ToolbarButton.REFRESH).click();
+ bot.toolbarButtonWithTooltip(SWTJBTExt.isRunningOnMacOs() ?
+ IDELabel.ToolbarButton.REFRESH_MAC_OS: IDELabel.ToolbarButton.REFRESH).click();
assertVisualEditorContains(webBrowser,
"BODY",
new String[]{"style"},
14 years, 4 months
JBoss Tools SVN: r37356 - in trunk/as: plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-12-15 10:40:55 -0500 (Thu, 15 Dec 2011)
New Revision: 37356
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ArgsUtilTest.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal/FileUtils.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java
Log:
JBIDE-10492 - argutils cleanup and test case
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java 2011-12-15 13:59:09 UTC (rev 37355)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java 2011-12-15 15:40:55 UTC (rev 37356)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2011 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,
@@ -11,6 +11,7 @@
package org.jboss.ide.eclipse.as.core.util;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -29,39 +30,8 @@
public static final String EMPTY=""; //$NON-NLS-1$
public static final String QUOTE="\""; //$NON-NLS-1$
- public static Map<String, Object> getSystemProperties(String argString) {
- String[] args = parse(argString);
- HashMap<String, Object> map = new HashMap<String, Object>();
-
- for( int i = 0; i < args.length; i++ ) {
- if( args[i].startsWith(VMO)) {
- int eq = args[i].indexOf(EQ);
- if( eq != -1 ) {
- map.put(args[i].substring(2, eq),
- args[i].substring(eq+1));
- } else {
- map.put(args[i], NO_VALUE);
- }
- }
- }
- return map;
- }
-
- public static String getValue(String allArgs, String shortOpt, String longOpt) {
- return getValue(parse(allArgs), shortOpt, longOpt);
- }
-
- public static String getValue(String[] args, String shortOpt, String longOpt ) {
- for( int i = 0; i < args.length; i++ ) {
- if( args[i].equals(shortOpt) && i+1 < args.length)
- return args[i+1];
- if( longOpt != null && args[i].startsWith(longOpt + EQ))
- return args[i].substring(args[i].indexOf(EQ) + 1);
- }
- return null;
- }
-
public static String[] parse(String s) {
+ s = s.trim();
try {
ArrayList<String> l = new ArrayList<String>();
int length = s.length();
@@ -83,7 +53,8 @@
case ' ':
if( !inQuotes ) {
tmp = buf.toString();
- l.add(tmp);
+ if( !(tmp.trim()).equals("")) //$NON-NLS-1$
+ l.add(tmp);
buf = new StringBuffer();
} else {
buf.append(' ');
@@ -112,14 +83,99 @@
return new String[] { };
}
}
+
+ public static Map<String, Object> getSystemProperties(String argString) {
+ String[] args = parse(argString);
+ HashMap<String, Object> map = new HashMap<String, Object>();
+
+ for( int i = 0; i < args.length; i++ ) {
+ if( args[i].startsWith(VMO)) {
+ int eq = args[i].indexOf(EQ);
+ if( eq != -1 ) {
+ map.put(args[i].substring(2, eq),
+ args[i].substring(eq+1));
+ } else {
+ map.put(args[i], NO_VALUE);
+ }
+ }
+ }
+ return map;
+ }
+
+ public static String getValue(String allArgs, String shortOpt, String longOpt) {
+ return getValue(parse(allArgs), shortOpt, longOpt);
+ }
+ public static String getValue(String[] args, String shortOpt, String longOpt ) {
+ String[] shortOpt2 = shortOpt == null ? new String[0] : new String[]{shortOpt};
+ String[] longOpt2 = longOpt == null ? new String[0] : new String[]{longOpt};
+ return getValue(args,shortOpt2,longOpt2);
+ }
+
+ public static String getValue(String allArgs, String[] shortOpt, String[] longOpt) {
+ return getValue(parse(allArgs), shortOpt, longOpt);
+ }
+
+ public static String getValue(String[] args, String[] shortOpt, String[] longOpt ) {
+ for( int i = 0; i < args.length; i++ ) {
+ if( shortOpt != null && matchesShortArg(args[i], shortOpt) && i+1 < args.length)
+ return args[i+1];
+ if( longOpt != null && matchesLongArg(args[i], longOpt))
+ return args[i].substring(args[i].indexOf(EQ) + 1);
+ }
+ return null;
+ }
+
+ public static boolean matchesShortArg(String needle, String[] haystack) {
+ if( haystack == null )
+ return false;
+ return Arrays.asList(haystack).contains(needle);
+ }
+
+ public static boolean matchesLongArg(String needle, String[] haystack) {
+ if( haystack == null )
+ return false;
+ for( int i = 0; i < haystack.length; i++ ) {
+ if( needle.startsWith(haystack[i] + EQ) || needle.startsWith(QUOTE + haystack[i] + EQ))
+ return true;
+ }
+ return false;
+ }
+
public static String setArg(String allArgs, String shortOpt, String longOpt, String value ) {
- if( value.contains(SPACE))
+ if( value != null && value.contains(SPACE))
value = QUOTE + value + QUOTE;
return setArg(allArgs, shortOpt, longOpt, value, false);
}
public static String setArg(String allArgs, String shortOpt, String longOpt, String value, boolean addQuotes ) {
+ String[] shortOpt2 = shortOpt == null ? new String[0] : new String[]{shortOpt};
+ String[] longOpt2 = longOpt == null ? new String[0] : new String[]{longOpt};
+ return setArg(allArgs, shortOpt2, longOpt2, value, addQuotes);
+ }
+
+ /**
+ * Replace (or add) an argument.
+ * Parse through the "allArgs" parameter to create a list of arguments.
+ * Compare each element in allArgs until you find a match against
+ * one of the short argument (-b value) or long argument (--host=etcetcetc)
+ * patterns. The set of short and long form arguments should be 100% interchangeable,
+ * and the caller must not have a preference which is ultimately returned.
+ *
+ * If a match is found, and the match is in the short-form arguments,
+ * do not change the arg (-b value), but update the value in the next segment.
+ *
+ * If a match is found and it is a long form argument, replace the string
+ * (ex: --host=localhost) with the first longOpt (--newLongOpt=127.0.0.1)
+ *
+ * @param allArgs
+ * @param shortOpt
+ * @param longOpt An array of possible long-form options
+ * @param value The new value, or null if you want to clear the option
+ * @param addQuotes
+ * @return
+ */
+ public static String setArg(String allArgs, String[] shortOpt, String[] longOpt, String value, boolean addQuotes ) {
String originalValue = value;
if( addQuotes )
value = QUOTE + value + QUOTE;
@@ -127,20 +183,23 @@
String[] args = parse(allArgs);
String retVal = EMPTY;
for( int i = 0; i < args.length; i++ ) {
- if( args[i].equals(shortOpt)) {
- args[i+1] = value;
- retVal += args[i] + SPACE + args[++i] + SPACE;
+ if( matchesShortArg(args[i], shortOpt)) {
+ if( value != null ) {
+ args[i+1] = value;
+ retVal += args[i] + SPACE + args[++i] + SPACE;
+ }
found = true;
- } else if( longOpt != null &&
- (args[i].startsWith(longOpt + EQ) || args[i].startsWith(QUOTE + longOpt + EQ))) {
- String newVal = null;
- if( args[i].startsWith(QUOTE)) {
- newVal = QUOTE + longOpt + EQ + originalValue + QUOTE;
- } else {
- newVal = longOpt + EQ + value;
+ } else if( matchesLongArg(args[i], longOpt)) {
+ if( value != null ) {
+ String newVal = null;
+ if( args[i].startsWith(QUOTE)) {
+ newVal = QUOTE + longOpt[0] + EQ + originalValue + QUOTE;
+ } else {
+ newVal = longOpt[0] + EQ + value;
+ }
+ args[i] = newVal;
+ retVal += args[i] + SPACE;
}
- args[i] = newVal;
- retVal += args[i] + SPACE;
found = true;
} else {
retVal += args[i] + SPACE;
@@ -149,10 +208,10 @@
// turn this to a retval;
if( !found ) {
- if( longOpt != null )
- retVal = retVal + longOpt + EQ + value;
+ if( longOpt != null && longOpt.length > 0 )
+ retVal = retVal + longOpt[0] + EQ + value;
else
- retVal = retVal + shortOpt + SPACE + value;
+ retVal = retVal + shortOpt[0] + SPACE + value;
}
return retVal;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal/FileUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal/FileUtils.java 2011-12-15 13:59:09 UTC (rev 37355)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/internal/FileUtils.java 2011-12-15 15:40:55 UTC (rev 37356)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.ide.eclipse.as.core.util.internal;
import java.io.BufferedOutputStream;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2011-12-15 13:59:09 UTC (rev 37355)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2011-12-15 15:40:55 UTC (rev 37356)
@@ -36,16 +36,18 @@
import org.jboss.ide.eclipse.as.test.publishing.v2.JSTDeployBinaryChildModuleTest;
import org.jboss.ide.eclipse.as.test.publishing.v2.JSTDeploymentTester;
import org.jboss.ide.eclipse.as.test.publishing.v2.JSTDeploymentWarUpdateXML;
+import org.jboss.ide.eclipse.as.test.publishing.v2.MockJSTPublisherTest;
import org.jboss.ide.eclipse.as.test.publishing.v2.MockJSTPublisherTestDynUtil;
import org.jboss.ide.eclipse.as.test.publishing.v2.SingleFileDeployableMockDeploymentTester;
-import org.jboss.ide.eclipse.as.test.publishing.v2.MockJSTPublisherTest;
import org.jboss.ide.eclipse.as.test.publishing.v2.SingleFileDeploymentTester;
import org.jboss.ide.eclipse.as.test.server.JBossServerAPITest;
+import org.jboss.ide.eclipse.as.test.util.ArgsUtilTest;
public class ASTestSuite extends TestSuite {
public static Test suite() {
ValidationFramework.getDefault().suspendAllValidation(true);
TestSuite suite = new TestSuite("ASTools Test Suite");
+ suite.addTestSuite(ArgsUtilTest.class);
suite.addTestSuite(PreReqTest.class);
suite.addTestSuite(RuntimeServerModelTest.class);
suite.addTestSuite(JEEClasspathContainerTest.class);
Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ArgsUtilTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ArgsUtilTest.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ArgsUtilTest.java 2011-12-15 15:40:55 UTC (rev 37356)
@@ -0,0 +1,112 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.ide.eclipse.as.test.util;
+
+import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
+
+import junit.framework.TestCase;
+
+public class ArgsUtilTest extends TestCase {
+ public void testParse() {
+ assertEquals(1, ArgsUtil.parse("").length);
+ assertEquals(1, ArgsUtil.parse("a").length);
+ assertEquals(1, ArgsUtil.parse("abc ").length);
+ assertEquals(1, ArgsUtil.parse(" abcde ").length);
+ assertEquals(1, ArgsUtil.parse(" abcde ").length);
+ assertEquals(1, ArgsUtil.parse(" abcde ").length);
+ assertEquals(2, ArgsUtil.parse("a b").length);
+ assertEquals(2, ArgsUtil.parse("a b").length);
+ assertEquals(2, ArgsUtil.parse(" a b").length);
+ assertEquals(2, ArgsUtil.parse(" a b ").length);
+ assertEquals(2, ArgsUtil.parse("-b test ").length);
+ assertEquals(2, ArgsUtil.parse("-b --host=someval ").length);
+ assertEquals(2, ArgsUtil.parse("-b \"--host=some val\"").length);
+ assertEquals(3, ArgsUtil.parse("-b val --host=someval").length);
+ assertEquals(2, ArgsUtil.parse("-b --host=\"some val\"").length);
+ assertEquals(2, ArgsUtil.parse("-b \"--host=some val\"").length);
+ }
+
+ public void testShortArgMatch() {
+ assertTrue(ArgsUtil.matchesShortArg("-b", split("-b -c -d -f")));
+ assertFalse(ArgsUtil.matchesShortArg("-b", split("-c opt d two -f")));
+ assertFalse(ArgsUtil.matchesShortArg("-b", split("b")));
+ assertFalse(ArgsUtil.matchesShortArg("-b", split("b opt")));
+ assertTrue(ArgsUtil.matchesShortArg("-b", split("-b opt")));
+
+ assertTrue(ArgsUtil.matchesShortArg("-host", split("-host -c -d -f")));
+ assertFalse(ArgsUtil.matchesShortArg("-host", split("-c val d two -f")));
+ assertFalse(ArgsUtil.matchesShortArg("-host", split("host")));
+ assertFalse(ArgsUtil.matchesShortArg("-host", split("host val")));
+ assertTrue(ArgsUtil.matchesShortArg("-host", split("-host val")));
+ }
+
+ public void testLongArgMatch() {
+ assertTrue(ArgsUtil.matchesLongArg("--host=localhost", split("--host --longopt1 -longopt2 -f")));
+ assertFalse(ArgsUtil.matchesLongArg("-host=localhost", split("--host --longopt1 -longopt2 -f")));
+ assertTrue(ArgsUtil.matchesLongArg("-longopt2=v1", split("--host --longopt1 -longopt2 -f")));
+ assertFalse(ArgsUtil.matchesLongArg("-longopt2 v1", split("--host --longopt1 -longopt2 -f")));
+ }
+
+ public void testReplace() {
+ String allArgs = "";
+ allArgs = ArgsUtil.setArg(allArgs, "-h", null, "new");
+ assertTrue(ArgsUtil.parse(allArgs).length == 2);
+ assertTrue(ArgsUtil.getValue(allArgs, "-h", null).equals("new"));
+ allArgs = ArgsUtil.setArg(allArgs, "-h", null, "correct");
+ assertTrue(ArgsUtil.parse(allArgs).length == 2);
+ assertTrue(ArgsUtil.getValue(allArgs, "-h", null).equals("correct"));
+
+ allArgs = ArgsUtil.setArg(allArgs, null, "--two", "newtwo");
+ assertTrue(ArgsUtil.parse(allArgs).length == 3);
+
+ // opt was set as long opt, --two=newtwo. Search for short opt fails
+ assertTrue(ArgsUtil.getValue(allArgs, "--two", null) == null);
+
+ // clear long opt
+ allArgs = ArgsUtil.setArg(allArgs, null, "--two", null);
+ assertTrue(ArgsUtil.parse(allArgs).length == 2);
+
+
+ // test replacement of short args
+ allArgs = ArgsUtil.setArg(allArgs, new String[]{"-h", "-o"}, new String[]{}, "twoOpt", false);
+ assertTrue(ArgsUtil.parse(allArgs).length == 2); // no change
+
+ assertTrue(ArgsUtil.getValue(allArgs, "-h", null).equals("twoOpt"));
+ assertTrue(ArgsUtil.getValue(allArgs, new String[]{"-h", "-o"}, null).equals("twoOpt"));
+ assertTrue(ArgsUtil.getValue(allArgs, new String[]{"-o", "-h"}, null).equals("twoOpt"));
+
+ // test clear of short arg
+ allArgs = ArgsUtil.setArg(allArgs, new String[]{"-h", "-o"}, new String[]{}, null, false);
+ assertTrue(ArgsUtil.parse(allArgs).length == 1); // no change
+
+ allArgs = ArgsUtil.setArg(allArgs, null, "--three", "three");
+ assertTrue(ArgsUtil.getValue(allArgs, null, "--three").equals("three"));
+
+ allArgs = ArgsUtil.setArg(allArgs, null, "--three", "threea");
+ assertTrue(ArgsUtil.getValue(allArgs, null, "--three").equals("threea"));
+
+ // already has --three, test replace, ensure --four is the new arg
+ // since it is the first of the two acceptable replacements
+ assertTrue(allArgs.contains("--three"));
+ allArgs = ArgsUtil.setArg(allArgs, null, new String[]{"--four", "--three"}, "three_b", false);
+ assertTrue(allArgs.contains("--four"));
+ assertTrue(ArgsUtil.getValue(allArgs, null, "--three") == null);
+ assertTrue(ArgsUtil.getValue(allArgs, null, "--four").equals("three_b"));
+ assertTrue(ArgsUtil.getValue(allArgs, null, new String[]{"--three", "--four"}).equals("three_b"));
+
+ }
+
+ // Just for testing, simply split this string into a bunch of options.
+ // So I don't need to make new arrays all the time...
+ public String[] split(String val) {
+ return val.split(" ");
+ }
+}
14 years, 4 months
JBoss Tools SVN: r37355 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot: test/example and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2011-12-15 08:59:09 -0500 (Thu, 15 Dec 2011)
New Revision: 37355
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/RunningFileOnServerTask.java
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/MarkFileAsDeployableTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/RunSeamPortletOnServer.java
Log:
Created task for running file on server (it includes marking file as deployable)
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/MarkFileAsDeployableTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/MarkFileAsDeployableTask.java 2011-12-15 13:54:49 UTC (rev 37354)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/MarkFileAsDeployableTask.java 2011-12-15 13:59:09 UTC (rev 37355)
@@ -1,5 +1,7 @@
package org.jboss.tools.portlet.ui.bot.task.server;
+import org.eclipse.swtbot.swt.finder.keyboard.KeyboardFactory;
+import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes;
import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile;
import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
import org.jboss.tools.portlet.ui.bot.task.workspace.FileContextMenuSelectingTask;
@@ -13,7 +15,7 @@
public class MarkFileAsDeployableTask extends AbstractSWTTask {
private WorkspaceFile workspaceFile;
-
+
public MarkFileAsDeployableTask(WorkspaceFile file) {
this.workspaceFile = file;
}
@@ -21,5 +23,7 @@
@Override
public void perform() {
performInnerTask(new FileContextMenuSelectingTask(workspaceFile, "Mark as Deployable"));
+ // for the confirmation dialog select OK (the dialog is native and normal swtbot functions do now work)
+ KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.RIGHT, Keystrokes.CR, Keystrokes.LF);
}
}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/RunningFileOnServerTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/RunningFileOnServerTask.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/RunningFileOnServerTask.java 2011-12-15 13:59:09 UTC (rev 37355)
@@ -0,0 +1,85 @@
+package org.jboss.tools.portlet.ui.bot.task.server;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
+import org.eclipse.swtbot.swt.finder.results.WidgetResult;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile;
+import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.Timing;
+import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+
+/**
+ * Runs the file on server.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class RunningFileOnServerTask extends AbstractSWTTask {
+
+ private WorkspaceFile workspaceFile;
+
+ public RunningFileOnServerTask(WorkspaceFile file) {
+ this.workspaceFile = file;
+ }
+
+ @Override
+ public void perform() {
+ performInnerTask(new MarkFileAsDeployableTask(workspaceFile));
+ SWTBot viewBot = SWTBotFactory.getPackageexplorer().show().bot();
+ SWTBotView view = SWTBotFactory.getPackageexplorer().show();
+
+ SWTBotTreeItem item = SWTBotFactory.getEclipse().getTreeItemOnPath(viewBot, viewBot.tree(), 0, workspaceFile.getFileName(), getFilePath());
+ item.select();
+ ContextMenuHelper.prepareTreeItemForContextMenu(viewBot.tree(), item);
+ final SWTBotMenu menuRunAs = viewBot.menu(IDELabel.Menu.RUN).menu(IDELabel.Menu.RUN_AS);
+ final MenuItem menuItem = UIThreadRunnable
+ .syncExec(new WidgetResult<MenuItem>() {
+ public MenuItem run() {
+ int menuItemIndex = 0;
+ MenuItem menuItem = null;
+ final MenuItem[] menuItems = menuRunAs.widget.getMenu().getItems();
+ while (menuItem == null && menuItemIndex < menuItems.length){
+ if (menuItems[menuItemIndex].getText().indexOf("Run on Server") > - 1){
+ menuItem = menuItems[menuItemIndex];
+ }
+ else{
+ menuItemIndex++;
+ }
+ }
+ return menuItem;
+ }
+ });
+ if (menuItem != null){
+ new SWTBotMenu(menuItem).click();
+ SWTBotShell shell = getBot().shell(IDELabel.Shell.RUN_ON_SERVER).activate();
+ SWTBotFactory.getOpen().finish(shell.bot());
+ SWTBotFactory.getUtil().waitForAll(Timing.time3S());
+ }
+ else{
+ throw new WidgetNotFoundException("Unable to find Menu Item with Label 'Run on Server'");
+ }
+ }
+
+ /**
+ * Adds the project to the path and removes file name.
+ * @return
+ */
+ private String[] getFilePath() {
+ List<String> path = new ArrayList<String>(Arrays.asList(workspaceFile.getFilePathAsArray()));
+ path.add(0, workspaceFile.getProject());
+ path.remove(path.size() - 1);
+ return path.toArray(new String[path.size()]);
+ }
+}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java 2011-12-15 13:54:49 UTC (rev 37354)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java 2011-12-15 13:59:09 UTC (rev 37355)
@@ -4,6 +4,7 @@
import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile;
import org.jboss.tools.portlet.ui.bot.task.server.MarkFileAsDeployableTask;
+import org.jboss.tools.portlet.ui.bot.task.server.RunningFileOnServerTask;
import org.jboss.tools.ui.bot.ext.config.Annotations.DB;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.Seam;
@@ -42,7 +43,7 @@
@Override
protected void executeExample() {
- doPerform(new MarkFileAsDeployableTask(DATASOURCE_FILE));
+ doPerform(new RunningFileOnServerTask(DATASOURCE_FILE));
super.executeExample();
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/RunSeamPortletOnServer.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/RunSeamPortletOnServer.java 2011-12-15 13:54:49 UTC (rev 37354)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/RunSeamPortletOnServer.java 2011-12-15 13:59:09 UTC (rev 37355)
@@ -4,7 +4,7 @@
import static org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletProject.PROJECT_NAME;
import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile;
-import org.jboss.tools.portlet.ui.bot.task.server.MarkFileAsDeployableTask;
+import org.jboss.tools.portlet.ui.bot.task.server.RunningFileOnServerTask;
import org.jboss.tools.portlet.ui.bot.test.template.RunPortletOnServerTemplate;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
@@ -36,7 +36,7 @@
@Override
public void testRunOnServer() {
- doPerform(new MarkFileAsDeployableTask(DATASOURCE_FILE));
+ doPerform(new RunningFileOnServerTask(DATASOURCE_FILE));
super.testRunOnServer();
}
}
14 years, 4 months
JBoss Tools SVN: r37354 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2011-12-15 08:54:49 -0500 (Thu, 15 Dec 2011)
New Revision: 37354
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/AssociatedPerspectiveDialogClosingTask.java
Log:
removed debugging info
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/AssociatedPerspectiveDialogClosingTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/AssociatedPerspectiveDialogClosingTask.java 2011-12-15 13:54:25 UTC (rev 37353)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/AssociatedPerspectiveDialogClosingTask.java 2011-12-15 13:54:49 UTC (rev 37354)
@@ -1,10 +1,7 @@
package org.jboss.tools.portlet.ui.bot.task.dialog;
-import org.eclipse.swt.widgets.Shell;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
-import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
-import org.eclipse.swtbot.swt.finder.results.VoidResult;
import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
/**
@@ -29,16 +26,6 @@
SWTBot bot;
try {
- for (final Shell s : getBot().getFinder().getShells()){
- UIThreadRunnable.asyncExec(getBot().getDisplay(), new VoidResult(){
-
- @Override
- public void run() {
- System.out.println(s.getText());
- System.out.println(s);
- }
- });
- }
bot = getBot().shell("Open Associated Perspective?").activate().bot();
} catch (WidgetNotFoundException e) {
// dialog is not open, skip the rest
14 years, 4 months
JBoss Tools SVN: r37353 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task: debug and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2011-12-15 08:54:25 -0500 (Thu, 15 Dec 2011)
New Revision: 37353
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/debug/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/debug/WriteAllWidgets.java
Log:
Created
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/debug/WriteAllWidgets.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/debug/WriteAllWidgets.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/debug/WriteAllWidgets.java 2011-12-15 13:54:25 UTC (rev 37353)
@@ -0,0 +1,56 @@
+package org.jboss.tools.portlet.ui.bot.task.debug;
+
+import static org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable.asyncExec;
+
+import java.util.List;
+
+import org.eclipse.swt.widgets.Widget;
+import org.eclipse.swtbot.swt.finder.results.VoidResult;
+import org.hamcrest.Matcher;
+import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
+
+public class WriteAllWidgets extends AbstractSWTTask {
+
+ private Matcher<? extends Widget> matcher;
+
+ private Widget widget;
+
+ public WriteAllWidgets(Matcher<? extends Widget> matcher) {
+ super();
+ this.matcher = matcher;
+ }
+
+ public WriteAllWidgets(Widget widget, Matcher<? extends Widget> matcher) {
+ super();
+ this.matcher = matcher;
+ this.widget = widget;
+ }
+
+ @Override
+ public void perform() {
+ final List<? extends Widget> widgets = getBot().widgets(matcher, getParentWidget());
+
+ asyncExec(new VoidResult() {
+
+ @Override
+ public void run() {
+ writeWidgets(widgets);
+ }
+ });
+ }
+
+ private Widget getParentWidget() {
+ if (widget == null){
+ return getBot().activeShell().widget;
+ }
+ return widget;
+ }
+
+ private void writeWidgets(List<? extends Widget> widgets){
+ System.out.println("List of current widgets");
+ for (Widget w : widgets){
+ System.out.println(w);
+ }
+ System.out.println("End of list");
+ }
+}
14 years, 4 months