JBoss Tools SVN: r36530 - in trunk/vpe/tests/org.jboss.tools.vpe.html.test: resources/htmlTest/WebContent/pages and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-11-22 07:30:55 -0500 (Tue, 22 Nov 2011)
New Revision: 36530
Added:
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/img/jbide9975( pic ).png
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide9975( 1 )/
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide9975( 1 )/CSSUrlQuotes.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide9975( 1 )/CSSUrlQuotes.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide9975( 1 )/jbide9975( pic ).png
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9975 - JUnit with ContentTest for quotes in css url was added.
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/img/jbide9975( pic ).png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/img/jbide9975( pic ).png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide9975( 1 )/CSSUrlQuotes.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide9975( 1 )/CSSUrlQuotes.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide9975( 1 )/CSSUrlQuotes.html 2011-11-22 12:30:55 UTC (rev 36530)
@@ -0,0 +1,24 @@
+<html>
+<body>
+<!-- Check that this url will be added to style and JBDS will put the full file path in it -->
+<!-- Checking escaping slashes in this case -->
+<div ID="id1" style="background: url(../../img/jbide9975\(\ pic\ \).png);">
+[GOOD] Checking escaping slashes in this case
+</div>
+<!-- Check that this url will be added to style and JBDS will put the full file path in it -->
+<!-- Checking putting url into quotes -->
+<div ID="id2" style="background: url('jbide9975( pic ).png');">
+[GOOD] Checking putting url into quotes
+</div>
+<!-- Check that this url will NOT be added to style and JBDS will ignore it also -->
+<!-- Checking bad escaping example -->
+<div ID="id3" style="background: url(../../img/jbide9975( pic\ \).png);">
+[BAD] Checking bad escaping example
+</div>
+<!-- Check that this url will NOT be added to style and JBDS will ignore it also -->
+<!-- Checking example with no escaping at all-->
+<div ID="id4" style="background: url(jbide9975( pic ).png);">
+[BAD] Checking example with no escaping at all
+</div>
+</body>
+</html>
Copied: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide9975( 1 )/CSSUrlQuotes.html.xml (from rev 36432, trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/block/ul.html.xml)
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide9975( 1 )/CSSUrlQuotes.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide9975( 1 )/CSSUrlQuotes.html.xml 2011-11-22 12:30:55 UTC (rev 36530)
@@ -0,0 +1,32 @@
+<tests>
+ <test id="id1">
+ <DIV
+ STYLE="/.*WebContent/img/jbide9975\(%20pic%20\).png.*\) repeat scroll 0% 0% transparent; -moz-user-modify: read-write;/">
+ <SPAN CLASS="vpe-text">
+ [GOOD] Checking escaping slashes in this case
+ </SPAN>
+ </DIV>
+ </test>
+ <test id="id2">
+ <DIV
+ STYLE="/.*WebContent/pages/jbide9975\(%201%20\)/jbide9975\(%20pic%20\).png.*\) repeat scroll 0% 0% transparent; -moz-user-modify: read-write;/">
+ <SPAN CLASS="vpe-text">
+ [GOOD] Checking putting url into quotes
+ </SPAN>
+ </DIV>
+ </test>
+ <test id="id3">
+ <DIV STYLE="-moz-user-modify: read-write;">
+ <SPAN CLASS="vpe-text">
+ [BAD] Checking bad escaping example
+ </SPAN>
+ </DIV>
+ </test>
+ <test id="id4">
+ <DIV STYLE="-moz-user-modify: read-write;">
+ <SPAN CLASS="vpe-text">
+ [BAD] Checking example with no escaping at all
+ </SPAN>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide9975( 1 )/jbide9975( pic ).png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/jbide9975( 1 )/jbide9975( pic ).png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java 2011-11-22 12:06:59 UTC (rev 36529)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java 2011-11-22 12:30:55 UTC (rev 36530)
@@ -481,6 +481,10 @@
performContentTest("components/other/xmp.xhtml"); //$NON-NLS-1$
}
+ public void testCssUrl() throws Throwable {
+ performContentTest("jbide9975( 1 )/CSSUrlQuotes.html"); //$NON-NLS-1$
+ }
+
protected String getTestProjectName() {
return HtmlAllTests.IMPORT_PROJECT_NAME;
}
13 years, 1 month
JBoss Tools SVN: r36529 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test: matcher/workspace/file/xml and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2011-11-22 07:06:59 -0500 (Tue, 22 Nov 2011)
New Revision: 36529
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/XMLNode.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java
Log:
added method for splitting sml node path
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/XMLNode.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/XMLNode.java 2011-11-22 12:06:33 UTC (rev 36528)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/XMLNode.java 2011-11-22 12:06:59 UTC (rev 36529)
@@ -3,6 +3,8 @@
public class XMLNode {
+ public static final String NODES_SEPARATOR = "/";
+
private String path;
private String content;
@@ -13,10 +15,18 @@
this.content = content;
}
+ public String getNodeName(){
+ return getPathAsArray()[getPathAsArray().length - 1];
+ }
+
+ public String[] getPathAsArray(){
+ return path.split(NODES_SEPARATOR);
+ }
+
public String getPath() {
return path;
}
-
+
public void setPath(String path) {
this.path = path;
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java 2011-11-22 12:06:33 UTC (rev 36528)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java 2011-11-22 12:06:59 UTC (rev 36529)
@@ -44,23 +44,18 @@
}
private boolean containsNode(SWTBot bot, SWTBotTree tree, XMLNode node) {
- SWTBotTreeItem item = SWTEclipseExt.getTreeItemOnPathStartsWith(bot, tree, 0, getNodeName(node), getNodePath(node));
+ SWTBotTreeItem item = SWTEclipseExt.getTreeItemOnPathStartsWith(bot, tree, 0, node.getNodeName(), getNodePath(node));
return item.cell(1).contains(node.getContent());
}
private String[] getNodePath(XMLNode node) {
- String[] path = node.getPath().split("/");
+ String[] path = node.getPathAsArray();
if (path.length <= 1){
return new String[0];
}
return Arrays.copyOfRange(path, 0, path.length - 1);
}
- private String getNodeName(XMLNode node) {
- String[] path = node.getPath().split("/");
- return path[path.length - 1];
- }
-
@Override
public void describeTo(Description description) {
description.appendText("file containing nodes: " + nodes);
13 years, 1 month
JBoss Tools SVN: r36528 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2011-11-22 07:06:33 -0500 (Tue, 22 Nov 2011)
New Revision: 36528
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ProjectFacetsMatcher.java
Log:
small refactoring
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ProjectFacetsMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ProjectFacetsMatcher.java 2011-11-22 11:32:37 UTC (rev 36527)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ProjectFacetsMatcher.java 2011-11-22 12:06:33 UTC (rev 36528)
@@ -28,7 +28,9 @@
@Override
public boolean matchesSafely(String project) {
showPropertyDialog(project);
- return checkFacets();
+ boolean result = checkFacets();
+ performInnerTask(new ProjectPropertyDialogCloseTask());
+ return result;
}
private void showPropertyDialog(String project) {
@@ -45,7 +47,6 @@
}
performInnerTask(task);
- performInnerTask(new ProjectPropertyDialogCloseTask());
return task.allChecked;
}
13 years, 1 month
JBoss Tools SVN: r36527 - in trunk/ws: plugins/org.jboss.tools.ws.jaxrs.ui/META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2011-11-22 06:32:37 -0500 (Tue, 22 Nov 2011)
New Revision: 36527
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF
Log:
fixing the MANIFEST version to match with the maven/tycho ones
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF 2011-11-22 10:54:37 UTC (rev 36526)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF 2011-11-22 11:32:37 UTC (rev 36527)
@@ -4,7 +4,7 @@
Bundle-Name: %PLUGIN_NAME
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-SymbolicName: org.jboss.tools.ws.jaxrs.core;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.2.qualifier
Bundle-Activator: org.jboss.tools.ws.jaxrs.core.JBossJaxrsCorePlugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0";visibility:=reexport,
org.eclipse.core.resources;bundle-version="3.7.100";visibility:=reexport,
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF 2011-11-22 10:54:37 UTC (rev 36526)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF 2011-11-22 11:32:37 UTC (rev 36527)
@@ -4,7 +4,7 @@
Bundle-Name: %PLUGIN_NAME
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-SymbolicName: org.jboss.tools.ws.jaxrs.ui;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.2.qualifier
Bundle-Activator: org.jboss.tools.ws.jaxrs.ui.JBossJaxrsUIPlugin
Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
org.eclipse.core.runtime;visibility:=reexport,
Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF 2011-11-22 10:54:37 UTC (rev 36526)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF 2011-11-22 11:32:37 UTC (rev 36527)
@@ -4,7 +4,7 @@
Bundle-Name: %PLUGIN_NAME
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-SymbolicName: org.jboss.tools.ws.jaxrs.core.test;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.2.qualifier
Bundle-Activator: org.jboss.tools.ws.jaxrs.core.JBossJaxrsCoreTestsPlugin
Require-Bundle: org.jboss.tools.ws.jaxrs.core;bundle-version="1.2.0",
org.eclipse.ui.ide;bundle-version="3.7.0";visibility:=reexport,
13 years, 1 month
JBoss Tools SVN: r36526 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-11-22 05:54:37 -0500 (Tue, 22 Nov 2011)
New Revision: 36526
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-9975 - fixed NPE when css url equals "\"
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2011-11-22 10:30:28 UTC (rev 36525)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2011-11-22 10:54:37 UTC (rev 36526)
@@ -800,10 +800,9 @@
if (uri == null || !uri.isAbsolute()) {
String decodedUrl = decodeUrl(resolvedUrl);
Path path = new Path(decodedUrl);
- if (decodedUrl.startsWith("/") //$NON-NLS-1$
+ if (decodedUrl.startsWith("/") && (null != path.segment(0))//$NON-NLS-1$
&& path.segment(0).equals(baseFile.getProject().getName())) {
- decodedUrl = "/" //$NON-NLS-1$
- + path.removeFirstSegments(1).toPortableString();
+ decodedUrl = "/" + path.removeFirstSegments(1).toPortableString(); //$NON-NLS-1$
}
IFile file = FileUtil.getFile(decodedUrl, baseFile);
if (file != null && file.getLocation() != null) {
13 years, 1 month
JBoss Tools SVN: r36525 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/dialog.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2011-11-22 05:30:28 -0500 (Tue, 22 Nov 2011)
New Revision: 36525
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/dialog/ProjectPropertyDialogOpenTask.java
Log:
changed the way of opening view
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/dialog/ProjectPropertyDialogOpenTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/dialog/ProjectPropertyDialogOpenTask.java 2011-11-22 10:14:19 UTC (rev 36524)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/dialog/ProjectPropertyDialogOpenTask.java 2011-11-22 10:30:28 UTC (rev 36525)
@@ -14,9 +14,8 @@
@Override
public void perform() {
- SWTBotFactory.getOpen().viewOpen(ActionItem.View.JavaPackageExplorer.LABEL);
-
PackageExplorer projectExplorer = SWTBotFactory.getPackageexplorer();
+ projectExplorer.show();
projectExplorer.selectProject(project);
ContextMenuHelper.clickContextMenu(projectExplorer.bot().tree(),
13 years, 1 month
JBoss Tools SVN: r36524 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test: entity and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2011-11-22 05:14:19 -0500 (Tue, 22 Nov 2011)
New Revision: 36524
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/EntityFactory.java
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortlet.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/WorkspaceFile.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/WorkspaceMatchersFactory.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/ExistingFileMatcher.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java
Log:
Created entity factory, changed ExistingFileMatcher to use WorkspaceFile and added splitting functionality to WorkspaceFile
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortlet.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortlet.java 2011-11-22 10:07:39 UTC (rev 36523)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortlet.java 2011-11-22 10:14:19 UTC (rev 36524)
@@ -1,11 +1,11 @@
package org.jboss.tools.portlet.ui.bot.test.create;
import static org.jboss.tools.portlet.ui.bot.test.create.CreateJavaPortletProject.PROJECT_NAME;
+import static org.jboss.tools.portlet.ui.bot.test.entity.EntityFactory.file;
import static org.jboss.tools.portlet.ui.bot.test.matcher.problems.ProblemViewMatchersFactory.isNumberOfErrors;
import static org.jboss.tools.portlet.ui.bot.test.matcher.workspace.WorkspaceMatchersFactory.containsNodes;
-import static org.jboss.tools.portlet.ui.bot.test.matcher.workspace.WorkspaceMatchersFactory.existsInProject;
+import static org.jboss.tools.portlet.ui.bot.test.matcher.workspace.WorkspaceMatchersFactory.exists;
-import org.jboss.tools.portlet.ui.bot.test.entity.WorkspaceFile;
import org.jboss.tools.portlet.ui.bot.test.entity.XMLNode;
import org.jboss.tools.portlet.ui.bot.test.task.SWTTask;
import org.jboss.tools.portlet.ui.bot.test.task.wizard.web.jboss.PortletCreationTask;
@@ -35,10 +35,10 @@
doPerform(getCreatePortletTask());
doAssertThat(0, isNumberOfErrors());
- doAssertThat(CLASS_FILE, existsInProject(PROJECT_NAME));
- doAssertThat("WebContent/WEB-INF/default-object.xml", existsInProject(PROJECT_NAME));
- doAssertThat("WebContent/WEB-INF/portlet-instances.xml", existsInProject(PROJECT_NAME));
- doAssertThat(new WorkspaceFile(PROJECT_NAME, "WebContent/WEB-INF/portlet.xml"), containsNodes(new XMLNode("portlet-app/portlet/portlet-class", FULL_CLASS_NAME)));
+ doAssertThat(file(PROJECT_NAME, CLASS_FILE), exists());
+ doAssertThat(file(PROJECT_NAME, "WebContent/WEB-INF/default-object.xml"), exists());
+ doAssertThat(file(PROJECT_NAME, "WebContent/WEB-INF/portlet-instances.xml"), exists());
+ doAssertThat(file(PROJECT_NAME, "WebContent/WEB-INF/portlet.xml"), containsNodes(new XMLNode("portlet-app/portlet/portlet-class", FULL_CLASS_NAME)));
System.out.println("");
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java 2011-11-22 10:07:39 UTC (rev 36523)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java 2011-11-22 10:14:19 UTC (rev 36524)
@@ -1,7 +1,8 @@
package org.jboss.tools.portlet.ui.bot.test.create;
+import static org.jboss.tools.portlet.ui.bot.test.entity.EntityFactory.file;
import static org.jboss.tools.portlet.ui.bot.test.matcher.problems.ProblemViewMatchersFactory.isNumberOfErrors;
-import static org.jboss.tools.portlet.ui.bot.test.matcher.workspace.WorkspaceMatchersFactory.existsInProject;
+import static org.jboss.tools.portlet.ui.bot.test.matcher.workspace.WorkspaceMatchersFactory.exists;
import static org.jboss.tools.portlet.ui.bot.test.matcher.workspace.WorkspaceMatchersFactory.hasFacets;
import static org.jboss.tools.portlet.ui.bot.test.matcher.workspace.WorkspaceMatchersFactory.isExistingProject;
@@ -40,8 +41,8 @@
doAssertThat(0, isNumberOfErrors());
doAssertThat(PROJECT_NAME, isExistingProject());
- doAssertThat("WebContent/WEB-INF/portlet.xml", existsInProject(PROJECT_NAME));
- doAssertThat("JBoss Portlet Libraries", existsInProject(PROJECT_NAME));
+ doAssertThat(file(PROJECT_NAME, "WebContent/WEB-INF/portlet.xml"), exists());
+ doAssertThat(file(PROJECT_NAME, "JBoss Portlet Libraries"), exists());
doAssertThat(PROJECT_NAME, hasFacets(new FacetDefinition(FACET_NAME, FACET_CATEGORY)));
}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/EntityFactory.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/EntityFactory.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/EntityFactory.java 2011-11-22 10:14:19 UTC (rev 36524)
@@ -0,0 +1,18 @@
+package org.jboss.tools.portlet.ui.bot.test.entity;
+
+/**
+ * Convenient factory method for creating entity objects.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class EntityFactory {
+
+ private EntityFactory() {
+ // static factory methods
+ }
+
+ public static WorkspaceFile file(String project, String filePath){
+ return new WorkspaceFile(project, filePath);
+ }
+}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/WorkspaceFile.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/WorkspaceFile.java 2011-11-22 10:07:39 UTC (rev 36523)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/WorkspaceFile.java 2011-11-22 10:14:19 UTC (rev 36524)
@@ -2,16 +2,26 @@
public class WorkspaceFile {
+ public static final String FILE_SEPARATOR = "/";
+
private String project;
-
- private String file;
- public WorkspaceFile(String project, String file) {
+ private String filePath;
+
+ public WorkspaceFile(String project, String filePath) {
super();
this.project = project;
- this.file = file;
+ this.filePath = filePath;
}
+ public String getFileName(){
+ return getFilePathAsArray()[getFilePathAsArray().length - 1];
+ }
+
+ public String[] getFilePathAsArray(){
+ return getFilePath().split(FILE_SEPARATOR);
+ }
+
public String getProject() {
return project;
}
@@ -20,16 +30,16 @@
this.project = project;
}
- public String getFile() {
- return file;
+ public String getFilePath() {
+ return filePath;
}
- public void setFile(String file) {
- this.file = file;
+ public void setFilePath(String file) {
+ this.filePath = file;
}
-
+
@Override
public String toString() {
- return "Workspace file: " + getProject() + "/" + getFile();
+ return "Workspace file: " + getProject() + FILE_SEPARATOR + getFilePath();
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/WorkspaceMatchersFactory.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/WorkspaceMatchersFactory.java 2011-11-22 10:07:39 UTC (rev 36523)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/WorkspaceMatchersFactory.java 2011-11-22 10:14:19 UTC (rev 36524)
@@ -25,8 +25,8 @@
return new ExistingProjectMatcher();
}
- public static SWTMatcher<String> existsInProject(String project){
- return new ExistingFileMatcher(project);
+ public static SWTMatcher<WorkspaceFile> exists(){
+ return new ExistingFileMatcher();
}
public static SWTMatcher<String> hasFacets(FacetDefinition... facets){
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/ExistingFileMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/ExistingFileMatcher.java 2011-11-22 10:07:39 UTC (rev 36523)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/ExistingFileMatcher.java 2011-11-22 10:14:19 UTC (rev 36524)
@@ -1,6 +1,7 @@
package org.jboss.tools.portlet.ui.bot.test.matcher.workspace.file;
import org.hamcrest.Description;
+import org.jboss.tools.portlet.ui.bot.test.entity.WorkspaceFile;
import org.jboss.tools.portlet.ui.bot.test.matcher.AbstractSWTMatcher;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
@@ -11,20 +12,12 @@
* @author Lucia Jelinkova
*
*/
-public class ExistingFileMatcher extends AbstractSWTMatcher<String> {
+public class ExistingFileMatcher extends AbstractSWTMatcher<WorkspaceFile> {
- private static final String FILE_SEPARATOR = "/";
-
- private String project;
-
- public ExistingFileMatcher(String project) {
- this.project = project;
- }
-
@Override
- public boolean matchesSafely(String path) {
+ public boolean matchesSafely(WorkspaceFile file) {
SWTBotFactory.getOpen().perspective(ActionItem.Perspective.JAVA.LABEL);
- return SWTBotFactory.getPackageexplorer().isFilePresent(project, path.split(FILE_SEPARATOR));
+ return SWTBotFactory.getPackageexplorer().isFilePresent(file.getProject(), file.getFilePathAsArray());
}
@Override
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java 2011-11-22 10:07:39 UTC (rev 36523)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java 2011-11-22 10:14:19 UTC (rev 36524)
@@ -31,9 +31,8 @@
@Override
public boolean matchesSafely(WorkspaceFile file) {
- String[] filePath = file.getFile().split("/");
- SWTBotFactory.getPackageexplorer().openFile(file.getProject(), filePath);
- SWTBotEditorExt editor = SWTBotFactory.getBot().swtBotEditorExtByTitle(filePath[filePath.length - 1]);
+ SWTBotFactory.getPackageexplorer().openFile(file.getProject(), file.getFilePathAsArray());
+ SWTBotEditorExt editor = SWTBotFactory.getBot().swtBotEditorExtByTitle(file.getFileName());
SWTBotTree tree = editor.bot().tree();
for (XMLNode node : nodes){
13 years, 1 month
JBoss Tools SVN: r36522 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test: entity and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2011-11-22 04:53:40 -0500 (Tue, 22 Nov 2011)
New Revision: 36522
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/WorkspaceFile.java
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortlet.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/WorkspaceMatchersFactory.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java
Log:
changed generics and constructor of Matcher
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortlet.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortlet.java 2011-11-22 09:39:01 UTC (rev 36521)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortlet.java 2011-11-22 09:53:40 UTC (rev 36522)
@@ -2,9 +2,10 @@
import static org.jboss.tools.portlet.ui.bot.test.create.CreateJavaPortletProject.PROJECT_NAME;
import static org.jboss.tools.portlet.ui.bot.test.matcher.problems.ProblemViewMatchersFactory.isNumberOfErrors;
-import static org.jboss.tools.portlet.ui.bot.test.matcher.workspace.WorkspaceMatchersFactory.areInFile;
+import static org.jboss.tools.portlet.ui.bot.test.matcher.workspace.WorkspaceMatchersFactory.containsNodes;
import static org.jboss.tools.portlet.ui.bot.test.matcher.workspace.WorkspaceMatchersFactory.existsInProject;
+import org.jboss.tools.portlet.ui.bot.test.entity.WorkspaceFile;
import org.jboss.tools.portlet.ui.bot.test.entity.XMLNode;
import org.jboss.tools.portlet.ui.bot.test.task.SWTTask;
import org.jboss.tools.portlet.ui.bot.test.task.wizard.web.jboss.PortletCreationTask;
@@ -37,7 +38,7 @@
doAssertThat(CLASS_FILE, existsInProject(PROJECT_NAME));
doAssertThat("WebContent/WEB-INF/default-object.xml", existsInProject(PROJECT_NAME));
doAssertThat("WebContent/WEB-INF/portlet-instances.xml", existsInProject(PROJECT_NAME));
- doAssertThat(nodes(new XMLNode("portlet-app/portlet/portlet-class", FULL_CLASS_NAME)), areInFile(PROJECT_NAME, "WebContent/WEB-INF/portlet.xml"));
+ doAssertThat(new WorkspaceFile(PROJECT_NAME, "WebContent/WEB-INF/portlet.xml"), containsNodes(new XMLNode("portlet-app/portlet/portlet-class", FULL_CLASS_NAME)));
System.out.println("");
}
@@ -48,8 +49,4 @@
task.setClassName(CLASS_NAME);
return task;
}
-
- private XMLNode[] nodes(XMLNode... nodes){
- return nodes;
- }
}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/WorkspaceFile.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/WorkspaceFile.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/WorkspaceFile.java 2011-11-22 09:53:40 UTC (rev 36522)
@@ -0,0 +1,35 @@
+package org.jboss.tools.portlet.ui.bot.test.entity;
+
+public class WorkspaceFile {
+
+ private String project;
+
+ private String file;
+
+ public WorkspaceFile(String project, String file) {
+ super();
+ this.project = project;
+ this.file = file;
+ }
+
+ public String getProject() {
+ return project;
+ }
+
+ public void setProject(String project) {
+ this.project = project;
+ }
+
+ public String getFile() {
+ return file;
+ }
+
+ public void setFile(String file) {
+ this.file = file;
+ }
+
+ @Override
+ public String toString() {
+ return "Workspace file: " + getProject() + "/" + getFile();
+ }
+}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/WorkspaceMatchersFactory.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/WorkspaceMatchersFactory.java 2011-11-22 09:39:01 UTC (rev 36521)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/WorkspaceMatchersFactory.java 2011-11-22 09:53:40 UTC (rev 36522)
@@ -1,6 +1,9 @@
package org.jboss.tools.portlet.ui.bot.test.matcher.workspace;
+import java.util.Arrays;
+
import org.jboss.tools.portlet.ui.bot.test.entity.FacetDefinition;
+import org.jboss.tools.portlet.ui.bot.test.entity.WorkspaceFile;
import org.jboss.tools.portlet.ui.bot.test.entity.XMLNode;
import org.jboss.tools.portlet.ui.bot.test.matcher.SWTMatcher;
import org.jboss.tools.portlet.ui.bot.test.matcher.workspace.file.ExistingFileMatcher;
@@ -30,7 +33,7 @@
return new ProjectFacetsMatcher(facets);
}
- public static SWTMatcher<XMLNode[]> areInFile(String project, String file){
- return new XMLFileNodeContentMatcher(project, file);
+ public static SWTMatcher<WorkspaceFile> containsNodes(XMLNode... nodes){
+ return new XMLFileNodeContentMatcher(Arrays.asList(nodes));
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java 2011-11-22 09:39:01 UTC (rev 36521)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java 2011-11-22 09:53:40 UTC (rev 36522)
@@ -1,11 +1,13 @@
package org.jboss.tools.portlet.ui.bot.test.matcher.workspace.file.xml;
import java.util.Arrays;
+import java.util.List;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.hamcrest.Description;
+import org.jboss.tools.portlet.ui.bot.test.entity.WorkspaceFile;
import org.jboss.tools.portlet.ui.bot.test.entity.XMLNode;
import org.jboss.tools.portlet.ui.bot.test.matcher.AbstractSWTMatcher;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
@@ -18,22 +20,19 @@
* @author Lucia Jelinkova
*
*/
-public class XMLFileNodeContentMatcher extends AbstractSWTMatcher<XMLNode[]> {
+public class XMLFileNodeContentMatcher extends AbstractSWTMatcher<WorkspaceFile> {
- private String project;
+ private List<XMLNode> nodes;
- private String file;
-
- public XMLFileNodeContentMatcher(String project, String file) {
+ public XMLFileNodeContentMatcher(List<XMLNode> nodes) {
super();
- this.project = project;
- this.file = file;
+ this.nodes = nodes;
}
@Override
- public boolean matchesSafely(XMLNode[] nodes) {
- String[] filePath = file.split("/");
- SWTBotFactory.getPackageexplorer().openFile(project, filePath);
+ public boolean matchesSafely(WorkspaceFile file) {
+ String[] filePath = file.getFile().split("/");
+ SWTBotFactory.getPackageexplorer().openFile(file.getProject(), filePath);
SWTBotEditorExt editor = SWTBotFactory.getBot().swtBotEditorExtByTitle(filePath[filePath.length - 1]);
SWTBotTree tree = editor.bot().tree();
@@ -46,10 +45,6 @@
}
private boolean containsNode(SWTBot bot, SWTBotTree tree, XMLNode node) {
- for (String s : getNodePath(node)){
- System.out.println("Path element: " + s);
- }
- System.out.println("Name: " + getNodeName(node));
SWTBotTreeItem item = SWTEclipseExt.getTreeItemOnPathStartsWith(bot, tree, 0, getNodeName(node), getNodePath(node));
return item.cell(1).contains(node.getContent());
}
@@ -69,7 +64,7 @@
@Override
public void describeTo(Description description) {
- description.appendText("file " + project + "/" + file + " contains the node(s)");
+ description.appendText("file containing nodes: " + nodes);
}
}
13 years, 1 month
JBoss Tools SVN: r36521 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test: create and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2011-11-22 04:39:01 -0500 (Tue, 22 Nov 2011)
New Revision: 36521
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/FacetDefinition.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/XMLNode.java
Removed:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLNode.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/FacetDefinition.java
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortlet.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ProjectFacetsMatcher.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/WorkspaceMatchersFactory.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/AbstractFacetTask.java
Log:
changed package
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortlet.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortlet.java 2011-11-22 07:53:14 UTC (rev 36520)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortlet.java 2011-11-22 09:39:01 UTC (rev 36521)
@@ -5,7 +5,7 @@
import static org.jboss.tools.portlet.ui.bot.test.matcher.workspace.WorkspaceMatchersFactory.areInFile;
import static org.jboss.tools.portlet.ui.bot.test.matcher.workspace.WorkspaceMatchersFactory.existsInProject;
-import org.jboss.tools.portlet.ui.bot.test.matcher.workspace.file.xml.XMLNode;
+import org.jboss.tools.portlet.ui.bot.test.entity.XMLNode;
import org.jboss.tools.portlet.ui.bot.test.task.SWTTask;
import org.jboss.tools.portlet.ui.bot.test.task.wizard.web.jboss.PortletCreationTask;
import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase;
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java 2011-11-22 07:53:14 UTC (rev 36520)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java 2011-11-22 09:39:01 UTC (rev 36521)
@@ -5,8 +5,8 @@
import static org.jboss.tools.portlet.ui.bot.test.matcher.workspace.WorkspaceMatchersFactory.hasFacets;
import static org.jboss.tools.portlet.ui.bot.test.matcher.workspace.WorkspaceMatchersFactory.isExistingProject;
+import org.jboss.tools.portlet.ui.bot.test.entity.FacetDefinition;
import org.jboss.tools.portlet.ui.bot.test.task.AbstractSWTTask;
-import org.jboss.tools.portlet.ui.bot.test.task.facet.FacetDefinition;
import org.jboss.tools.portlet.ui.bot.test.task.facet.FacetsSelectionTask;
import org.jboss.tools.portlet.ui.bot.test.task.wizard.WizardPageDefaultsFillingTask;
import org.jboss.tools.portlet.ui.bot.test.task.wizard.web.DynamicWebProjectCreationTask;
Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/FacetDefinition.java (from rev 36504, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/FacetDefinition.java)
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/FacetDefinition.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/FacetDefinition.java 2011-11-22 09:39:01 UTC (rev 36521)
@@ -0,0 +1,35 @@
+package org.jboss.tools.portlet.ui.bot.test.entity;
+
+public class FacetDefinition {
+
+ private String category;
+
+ private String name;
+
+ public FacetDefinition(String name) {
+ super();
+ this.name = name;
+ }
+
+ public FacetDefinition(String name, String category) {
+ super();
+ this.category = category;
+ this.name = name;
+ }
+
+ public String getCategory() {
+ return category;
+ }
+
+ public void setCategory(String category) {
+ this.category = category;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
\ No newline at end of file
Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/XMLNode.java (from rev 36504, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLNode.java)
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/XMLNode.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/XMLNode.java 2011-11-22 09:39:01 UTC (rev 36521)
@@ -0,0 +1,36 @@
+package org.jboss.tools.portlet.ui.bot.test.entity;
+
+
+public class XMLNode {
+
+ private String path;
+
+ private String content;
+
+ public XMLNode(String path, String content) {
+ super();
+ this.path = path;
+ this.content = content;
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ @Override
+ public String toString() {
+ return "XML path = " + getPath() + ", content = " + getContent();
+ }
+}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ProjectFacetsMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ProjectFacetsMatcher.java 2011-11-22 07:53:14 UTC (rev 36520)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ProjectFacetsMatcher.java 2011-11-22 09:39:01 UTC (rev 36521)
@@ -5,11 +5,11 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.hamcrest.Description;
+import org.jboss.tools.portlet.ui.bot.test.entity.FacetDefinition;
import org.jboss.tools.portlet.ui.bot.test.matcher.AbstractSWTMatcher;
import org.jboss.tools.portlet.ui.bot.test.task.dialog.ProjectPropertyDialogCloseTask;
import org.jboss.tools.portlet.ui.bot.test.task.dialog.ProjectPropertyDialogOpenTask;
import org.jboss.tools.portlet.ui.bot.test.task.facet.AbstractFacetTask;
-import org.jboss.tools.portlet.ui.bot.test.task.facet.FacetDefinition;
/**
* Checks if the project has the specified facets.
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/WorkspaceMatchersFactory.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/WorkspaceMatchersFactory.java 2011-11-22 07:53:14 UTC (rev 36520)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/WorkspaceMatchersFactory.java 2011-11-22 09:39:01 UTC (rev 36521)
@@ -1,10 +1,10 @@
package org.jboss.tools.portlet.ui.bot.test.matcher.workspace;
+import org.jboss.tools.portlet.ui.bot.test.entity.FacetDefinition;
+import org.jboss.tools.portlet.ui.bot.test.entity.XMLNode;
import org.jboss.tools.portlet.ui.bot.test.matcher.SWTMatcher;
import org.jboss.tools.portlet.ui.bot.test.matcher.workspace.file.ExistingFileMatcher;
import org.jboss.tools.portlet.ui.bot.test.matcher.workspace.file.xml.XMLFileNodeContentMatcher;
-import org.jboss.tools.portlet.ui.bot.test.matcher.workspace.file.xml.XMLNode;
-import org.jboss.tools.portlet.ui.bot.test.task.facet.FacetDefinition;
/**
* Factory for workspace specific matchers (projects, files..)
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java 2011-11-22 07:53:14 UTC (rev 36520)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLFileNodeContentMatcher.java 2011-11-22 09:39:01 UTC (rev 36521)
@@ -6,6 +6,7 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.hamcrest.Description;
+import org.jboss.tools.portlet.ui.bot.test.entity.XMLNode;
import org.jboss.tools.portlet.ui.bot.test.matcher.AbstractSWTMatcher;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLNode.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLNode.java 2011-11-22 07:53:14 UTC (rev 36520)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/file/xml/XMLNode.java 2011-11-22 09:39:01 UTC (rev 36521)
@@ -1,36 +0,0 @@
-package org.jboss.tools.portlet.ui.bot.test.matcher.workspace.file.xml;
-
-
-public class XMLNode {
-
- private String path;
-
- private String content;
-
- public XMLNode(String path, String content) {
- super();
- this.path = path;
- this.content = content;
- }
-
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- @Override
- public String toString() {
- return "XML path = " + getPath() + ", content = " + getContent();
- }
-}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/AbstractFacetTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/AbstractFacetTask.java 2011-11-22 07:53:14 UTC (rev 36520)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/AbstractFacetTask.java 2011-11-22 09:39:01 UTC (rev 36521)
@@ -8,6 +8,7 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
+import org.jboss.tools.portlet.ui.bot.test.entity.FacetDefinition;
import org.jboss.tools.portlet.ui.bot.test.task.AbstractSWTTask;
/**
Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/FacetDefinition.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/FacetDefinition.java 2011-11-22 07:53:14 UTC (rev 36520)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/FacetDefinition.java 2011-11-22 09:39:01 UTC (rev 36521)
@@ -1,35 +0,0 @@
-package org.jboss.tools.portlet.ui.bot.test.task.facet;
-
-public class FacetDefinition {
-
- private String category;
-
- private String name;
-
- public FacetDefinition(String name) {
- super();
- this.name = name;
- }
-
- public FacetDefinition(String name, String category) {
- super();
- this.category = category;
- this.name = name;
- }
-
- public String getCategory() {
- return category;
- }
-
- public void setCategory(String category) {
- this.category = category;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-}
\ No newline at end of file
13 years, 1 month