gatein SVN: r3496 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-06-28 04:08:14 -0400 (Mon, 28 Jun 2010)
New Revision: 3496
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_001_CopyPasteNodeIntoTheSameNavigation.html
Log:
TESTVN-356: Clean and improve
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_001_CopyPasteNodeIntoTheSameNavigation.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_001_CopyPasteNodeIntoTheSameNavigation.html 2010-06-28 07:57:57 UTC (rev 3495)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_001_CopyPasteNodeIntoTheSameNavigation.html 2010-06-28 08:08:14 UTC (rev 3496)
@@ -27,11 +27,6 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>link=Sign in</td>
- <td></td>
-</tr>
-<tr>
<td>clickAt</td>
<td>link=Sign in</td>
<td></td>
@@ -52,7 +47,7 @@
<td>gtn</td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>clickAndWait</td>
<td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
<td></td>
</tr>
@@ -182,15 +177,10 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
+ <td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Sign out</td>
- <td></td>
-</tr>
</tbody></table>
</body>
14 years, 6 months
gatein SVN: r3495 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-06-28 03:57:57 -0400 (Mon, 28 Jun 2010)
New Revision: 3495
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_003_CopyPasteNodeIntoTheSamePlace.html
Log:
TESTVN-356: Clean and improve
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_003_CopyPasteNodeIntoTheSamePlace.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_003_CopyPasteNodeIntoTheSamePlace.html 2010-06-28 07:47:16 UTC (rev 3494)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_003_CopyPasteNodeIntoTheSamePlace.html 2010-06-28 07:57:57 UTC (rev 3495)
@@ -22,6 +22,11 @@
<td></td>
</tr>
<tr>
+ <td>windowMaximize</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Sign in</td>
<td></td>
@@ -32,6 +37,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
<td>type</td>
<td>username</td>
<td>root</td>
@@ -42,7 +52,7 @@
<td>gtn</td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>clickAndWait</td>
<td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
<td></td>
</tr>
@@ -78,12 +88,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//a[@title='Home']</td>
+ <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Home']</td>
<td></td>
</tr>
<tr>
- <td>componentExoContextMenu</td>
- <td>xpath=//div[@id='UINavigationNodeSelector']//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Home']</td>
+ <td>mouseDownRight</td>
+ <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Home']</td>
<td></td>
</tr>
<tr>
@@ -102,13 +112,13 @@
<td></td>
</tr>
<tr>
- <td>componentExoContextMenu</td>
- <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[1]</td>
+ <td>waitForElementPresent</td>
+ <td>//div[@class='UIContextMenuContainer']/div[2]/div/div/div[7]/a</td>
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[@class='UIContextMenuContainer']/div[2]/div/div/div[7]/a</td>
+ <td>mouseDownRight</td>
+ <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[1]</td>
<td></td>
</tr>
<tr>
@@ -122,11 +132,16 @@
<td></td>
</tr>
<tr>
- <td>verifyTextPresent</td>
- <td>This node name already exists.</td>
+ <td>waitForElementPresent</td>
+ <td>//div[2]/div[3]/div/div/div/div/div[2]</td>
<td></td>
</tr>
<tr>
+ <td>verifyText</td>
+ <td>//div[2]/div[3]/div/div/div/div/div[2]</td>
+ <td>This node name already exists.</td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td>
<td></td>
@@ -152,15 +167,10 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
+ <td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Sign out</td>
- <td></td>
-</tr>
</tbody></table>
</body>
14 years, 6 months
gatein SVN: r3494 - in portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui: util and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-06-28 03:47:16 -0400 (Mon, 28 Jun 2010)
New Revision: 3494
Modified:
portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java
Log:
- Cleaned code up. getSupportModes semantics with respect to view and config needs to be checked.
Modified: portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
===================================================================
--- portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2010-06-28 07:45:06 UTC (rev 3493)
+++ portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2010-06-28 07:47:16 UTC (rev 3494)
@@ -110,6 +110,7 @@
{
protected static final Log log = ExoLogger.getLogger("portal:UIPortlet");
+ private final static boolean debug = log.isDebugEnabled();
static final public String DEFAULT_THEME = "Default:DefaultTheme::Vista:VistaTheme::Mac:MacTheme";
@@ -147,14 +148,6 @@
private WindowState currentWindowState_ = WindowState.NORMAL;
- private List<String> supportModes_;
-
- private List<QName> supportedProcessingEvents_;
-
- private List<QName> supportedPublishingEvents_;
-
- private List<String> supportedPublicParams_;
-
private boolean portletInPortal_ = true;
private StateString navigationalState;
@@ -340,26 +333,6 @@
currentWindowState_ = state;
}
- public List<QName> getSupportedProcessingEvents()
- {
- return supportedProcessingEvents_;
- }
-
- public void setSupportedProcessingEvents(List<QName> supportedProcessingEvents)
- {
- supportedProcessingEvents_ = supportedProcessingEvents;
- }
-
- public List<String> getSupportedPublicRenderParameters()
- {
- return supportedPublicParams_;
- }
-
- public void setSupportedPublicRenderParameters(List<String> supportedPublicRenderParameters)
- {
- supportedPublicParams_ = supportedPublicRenderParameters;
- }
-
public String getDisplayTitle()
{
String title = getTitle();
@@ -424,119 +397,39 @@
public List<String> getSupportModes()
{
- if (supportModes_ != null)
- {
- return supportModes_;
- }
-
- List<String> supportModes = new ArrayList<String>();
-
+ // todo: use a Google Collections Lists.transform or similar?
org.gatein.pc.api.Portlet portlet = getProducedOfferedPortlet();
+ Set<ModeInfo> modes = portlet.getInfo().getCapabilities().getModes(MediaType.TEXT_HTML);
+ int modeNb = modes.size();
+ List<String> supportModes = new ArrayList<String>(modeNb);
- // if we couldn't get the portlet that just return an empty modes list
- if (portlet == null)
+ for (ModeInfo mode : modes)
{
- return supportModes;
+ // todo: PortalDataMapper seemed like "config" mode was supposed to be handled differently, albeit with a wrong implementation. Needs to be done?
+ supportModes.add(mode.getModeName());
}
- Set<ModeInfo> modes = portlet.getInfo().getCapabilities().getModes(MediaType.create("text/html"));
- Iterator<ModeInfo> modeIter = modes.iterator();
- while (modeIter.hasNext())
+ // todo: check that this is the proper behavior
+ if(modeNb > 1)
{
- ModeInfo info = modeIter.next();
- supportModes.add(info.getModeName());
- }
-
- if (supportModes.size() > 0)
- {
supportModes.remove("view");
}
- setSupportModes(supportModes);
return supportModes;
}
- public void setSupportModes(List<String> supportModes)
- {
- supportModes_ = supportModes;
- }
-
/**
* Tells, according to the info located in portlet.xml, wether this portlet can handle a portlet event with the QName
* given as the method argument
*/
public boolean supportsProcessingEvent(QName name)
{
-
- if (supportedProcessingEvents_ == null)
- {
-
- org.gatein.pc.api.Portlet portlet = getProducedOfferedPortlet();
-
- if (portlet == null)
- {
- log.info("Could not find portlet with ID : " + producerOfferedPortletContext.getId());
- return false;
- }
-
- Map<QName, EventInfo> consumedEvents =
- (Map<QName, EventInfo>)portlet.getInfo().getEventing().getConsumedEvents();
-
- if (consumedEvents == null)
- {
- return false;
- }
-
- supportedProcessingEvents_ = new ArrayList<QName>(consumedEvents.keySet());
- }
-
- for (Iterator<QName> iter = supportedProcessingEvents_.iterator(); iter.hasNext();)
- {
- QName eventName = iter.next();
- if (eventName.equals(name))
- {
- log.info("The Portlet " + producerOfferedPortletContext + " supports comsuming the event : " + name);
- return true;
- }
- }
- log.info("The portlet " + producerOfferedPortletContext + " doesn't support consuming the event : " + name);
- return false;
+ return getProducedOfferedPortlet().getInfo().getEventing().getConsumedEvents().containsKey(name);
}
public boolean supportsPublishingEvent(QName name)
{
- if (supportedPublishingEvents_ == null)
- {
- org.gatein.pc.api.Portlet portlet = getProducedOfferedPortlet();
-
- if (portlet == null)
- {
- log.info("Could not find portlet with ID : " + producerOfferedPortletContext.getId());
- return false;
- }
-
- Map<QName, EventInfo> producedEvents =
- (Map<QName, EventInfo>)portlet.getInfo().getEventing().getProducedEvents();
-
- if (producedEvents == null)
- {
- return false;
- }
-
- supportedPublishingEvents_ = new ArrayList<QName>(producedEvents.keySet());
- }
-
- for (Iterator<QName> iter = supportedPublishingEvents_.iterator(); iter.hasNext();)
- {
- QName eventName = iter.next();
- if (eventName.equals(name))
- {
- log.info("The Portlet " + producerOfferedPortletContext + " supports producing the event : " + name);
- return true;
- }
- }
- log.info("The portlet " + producerOfferedPortletContext + " doesn't support producing the event : " + name);
- return false;
+ return getProducedOfferedPortlet().getInfo().getEventing().getProducedEvents().containsKey(name);
}
/**
@@ -545,42 +438,7 @@
*/
public boolean supportsPublicParam(String supportedPublicParam)
{
- if (supportedPublicParams_ == null)
- {
-
- //
- if (producedOfferedPortlet == null)
- {
- log.info("Could not find portlet with ID : " + producerOfferedPortletContext.getId());
- return false;
- }
-
- //
- Collection<ParameterInfo> parameters =
- (Collection<ParameterInfo>)producedOfferedPortlet.getInfo().getNavigation().getPublicParameters();
- supportedPublicParams_ = new ArrayList<String>();
- for (ParameterInfo parameter : parameters)
- {
- supportedPublicParams_.add(parameter.getId());
- }
- }
-
- //
- for (String publicParam : supportedPublicParams_)
- {
- if (publicParam.equals(supportedPublicParam))
- {
- if (log.isDebugEnabled())
- {
- log.debug("The Portlet " + producerOfferedPortletContext.getId()
- + " supports the public render parameter : " + supportedPublicParam);
- }
- return true;
- }
- }
-
- //
- return false;
+ return getProducedOfferedPortlet().getInfo().getNavigation().getPublicParameter(supportedPublicParam) != null;
}
/**
Modified: portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java
===================================================================
--- portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java 2010-06-28 07:45:06 UTC (rev 3493)
+++ portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java 2010-06-28 07:47:16 UTC (rev 3494)
@@ -252,35 +252,6 @@
if (model.getAccessPermissions() != null)
uiPortlet.setAccessPermissions(model.getAccessPermissions());
uiPortlet.setModifiable(model.isModifiable());
-
- Portlet portlet = uiPortlet.getProducedOfferedPortlet();
- if (portlet == null || portlet.getInfo() == null)
- return;
-
- PortletInfo portletInfo = portlet.getInfo();
-
- /*
- * Define which portlet modes the portlet supports and hence should be shown
- * in the portlet info bar
- */
- Set<ModeInfo> modes = portletInfo.getCapabilities().getModes(MediaType.create("text/html"));
- List<String> supportModes = new ArrayList<String>();
- for (ModeInfo modeInfo : modes)
- {
- String modeName = modeInfo.getModeName().toLowerCase();
- if ("config".equals(modeInfo.getModeName()))
- {
- supportModes.add(modeName);
- }
- else
- {
- supportModes.add(modeName);
- }
- }
-
- if (supportModes.size() > 1)
- supportModes.remove("view");
- uiPortlet.setSupportModes(supportModes);
}
public static void toUIContainer(UIContainer uiContainer, Container model) throws Exception
14 years, 6 months
gatein SVN: r3493 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-06-28 03:45:06 -0400 (Mon, 28 Jun 2010)
New Revision: 3493
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_001_CopyPasteNodeIntoTheSameNavigation.html
Log:
TESTVN-356: Clean and improve
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_001_CopyPasteNodeIntoTheSameNavigation.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_001_CopyPasteNodeIntoTheSameNavigation.html 2010-06-28 07:44:48 UTC (rev 3492)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_03_001_CopyPasteNodeIntoTheSameNavigation.html 2010-06-28 07:45:06 UTC (rev 3493)
@@ -22,6 +22,11 @@
<td></td>
</tr>
<tr>
+ <td>windowMaximize</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Sign in</td>
<td></td>
@@ -32,6 +37,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
<td>type</td>
<td>username</td>
<td>root</td>
@@ -78,12 +88,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//a[@title='Home']</td>
+ <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Home']</td>
<td></td>
</tr>
<tr>
- <td>componentExoContextMenu</td>
- <td>xpath=//div[@id='UINavigationNodeSelector']//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Home']</td>
+ <td>mouseDownRight</td>
+ <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Home']</td>
<td></td>
</tr>
<tr>
@@ -113,12 +123,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@id='UINavigationNodeSelector']//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='SiteMap']</td>
+ <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='SiteMap']</td>
<td></td>
</tr>
<tr>
- <td>componentExoContextMenu</td>
- <td>xpath=//div[@id='UINavigationNodeSelector']//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='SiteMap']</td>
+ <td>mouseDownRight</td>
+ <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='SiteMap']</td>
<td></td>
</tr>
<tr>
@@ -137,11 +147,16 @@
<td></td>
</tr>
<tr>
- <td>componentExoContextMenu</td>
+ <td>waitForElementPresent</td>
<td>xpath=//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/div//a</td>
<td></td>
</tr>
<tr>
+ <td>mouseDownRight</td>
+ <td>xpath=//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/div//a</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>link=Delete Node</td>
<td></td>
14 years, 6 months
gatein SVN: r3492 - portal/branches/wsrp2-integration/component/application-registry/src/main/java/org/exoplatform/application/registry/impl.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-06-28 03:44:48 -0400 (Mon, 28 Jun 2010)
New Revision: 3492
Modified:
portal/branches/wsrp2-integration/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java
Log:
- Fix for GTNPORTAL-1331, however a definitive solution is needed.
Modified: portal/branches/wsrp2-integration/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java
===================================================================
--- portal/branches/wsrp2-integration/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2010-06-28 07:12:15 UTC (rev 3491)
+++ portal/branches/wsrp2-integration/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2010-06-28 07:44:48 UTC (rev 3492)
@@ -418,7 +418,7 @@
{
PortletInfo info = portlet.getInfo();
String portletApplicationName = info.getApplicationName();
- String portletName = info.getName();
+ String portletName = portlet.getContext().getId();
// Need to sanitize portlet and application names in case they contain characters that would
// cause an improper Application name
14 years, 6 months
gatein SVN: r3491 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-06-28 03:12:15 -0400 (Mon, 28 Jun 2010)
New Revision: 3491
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_008_CreateNewNodeAsChildOfExistingNodeWhenDoRightClick.html
Log:
TESTVN-356: Clean and improve
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_008_CreateNewNodeAsChildOfExistingNodeWhenDoRightClick.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_008_CreateNewNodeAsChildOfExistingNodeWhenDoRightClick.html 2010-06-28 06:43:52 UTC (rev 3490)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_008_CreateNewNodeAsChildOfExistingNodeWhenDoRightClick.html 2010-06-28 07:12:15 UTC (rev 3491)
@@ -17,12 +17,17 @@
<td></td>
</tr>
<tr>
+ <td>windowMaximize</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>link=Sign in</td>
<td></td>
</tr>
<tr>
- <td>verifyElementPresent</td>
+ <td>waitForElementPresent</td>
<td>username</td>
<td></td>
</tr>
@@ -52,7 +57,7 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>clickAndWait</td>
<td>link=Site</td>
<td></td>
</tr>
@@ -62,42 +67,27 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>link=Edit Navigation</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//a[@title='Home']</td>
+ <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Home']</td>
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>//a[@title='Home']</td>
+ <td>mouseDownRight</td>
+ <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Home']</td>
<td></td>
</tr>
<tr>
- <td>componentExoContextMenu</td>
- <td>//a[@title='Home']</td>
+ <td>click</td>
+ <td>//div[@id='NavigationNodePopupMenu']/div/div[2]/div/div/div[1]/a</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UINavigationManagement']/div[2]/div[3]/div/div/div/div/div/div/div/div[2]/div/div/div//a</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>//div[@id='UINavigationManagement']/div[2]/div[3]/div/div/div/div/div/div/div/div[2]/div/div/div//a</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Page Node Setting--</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
<td>name</td>
<td></td>
</tr>
@@ -113,51 +103,51 @@
</tr>
<tr>
<td>echo</td>
- <td>--Go to Page Selector--</td>
+ <td>-- Page Selector--</td>
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[@class='UIFormTabPane']//div[@class='TabsContainer']/div[2]/div/div/div/div</td>
+ <td>click</td>
+ <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>//div[@class='UIFormTabPane']//div[@class='TabsContainer']/div[2]/div/div/div/div</td>
+ <td>click</td>
+ <td>link=Search and Select Page</td>
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>link=Search and Select Page</td>
+ <td>click</td>
+ <td>//img[@title='Select Page']</td>
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>link=Search and Select Page</td>
+ <td>echo</td>
+ <td>-- Icon tab--</td>
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>xpath=//img[@title='Select Page']</td>
+ <td>click</td>
+ <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>xpath=//img[@title='Select Page']</td>
+ <td>echo</td>
+ <td>-- Save to finsh create new node--</td>
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
+ <td>click</td>
<td>link=Save</td>
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>link=Save</td>
+ <td>echo</td>
+ <td>-- Save to close Navigation Management form--</td>
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>link=Save</td>
<td></td>
</tr>
@@ -187,7 +177,7 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>link=Site</td>
<td></td>
</tr>
@@ -197,60 +187,40 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>click</td>
<td>link=Edit Navigation</td>
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>xpath=//a[@title='Test_POR_14_01_008']</td>
+ <td>waitForElementPresent</td>
+ <td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_POR_14_01_008']</td>
<td></td>
</tr>
<tr>
- <td>componentExoContextMenu</td>
- <td>xpath=//a[@title='Test_POR_14_01_008']</td>
+ <td>mouseDownRight</td>
+ <td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_POR_14_01_008']</td>
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td>
+ <td>click</td>
+ <td>link=Delete Node</td>
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForConfirmation</td>
+ <td>assertConfirmation</td>
<td>Are you sure you want to delete this node?</td>
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>link=Save</td>
+ <td>click</td>
+ <td>//td[2]/div/div/div/div</td>
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>link=Save</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Sign out--</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
+ <td>click</td>
<td>link=Sign out</td>
<td></td>
</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Sign out</td>
- <td></td>
-</tr>
</tbody></table>
</body>
14 years, 6 months
gatein SVN: r3490 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-06-28 02:43:52 -0400 (Mon, 28 Jun 2010)
New Revision: 3490
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_04_005_CutPasteNodeInToTheSameThisSource.html
Log:
TESTVN-356: Clean and improve
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_04_005_CutPasteNodeInToTheSameThisSource.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_04_005_CutPasteNodeInToTheSameThisSource.html 2010-06-28 06:40:44 UTC (rev 3489)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_04_005_CutPasteNodeInToTheSameThisSource.html 2010-06-28 06:43:52 UTC (rev 3490)
@@ -22,6 +22,11 @@
<td></td>
</tr>
<tr>
+ <td>windowMaximize</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Sign in</td>
<td></td>
@@ -77,11 +82,16 @@
<td></td>
</tr>
<tr>
- <td>componentExoContextMenu</td>
- <td>//a[@title='Home']</td>
+ <td>waitForElementPresent</td>
+ <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected'and @title='Home']</td>
<td></td>
</tr>
<tr>
+ <td>mouseDownRight</td>
+ <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected'and @title='Home']</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Cut Node</td>
<td></td>
@@ -118,12 +128,12 @@
</tr>
<tr>
<td>waitForTextPresent</td>
- <td>The source and the destination must be different. </td>
+ <td>The source and the destination must be different.</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
- <td>The source and the destination must be different. </td>
+ <td>The source and the destination must be different.</td>
<td></td>
</tr>
<tr>
14 years, 6 months
gatein SVN: r3489 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-06-28 02:40:44 -0400 (Mon, 28 Jun 2010)
New Revision: 3489
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_04_001_CutPasteNodeToTheSamePlace.html
Log:
TESTVN-356: Clean and improve
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_04_001_CutPasteNodeToTheSamePlace.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_04_001_CutPasteNodeToTheSamePlace.html 2010-06-28 04:31:49 UTC (rev 3488)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_04_001_CutPasteNodeToTheSamePlace.html 2010-06-28 06:40:44 UTC (rev 3489)
@@ -22,6 +22,11 @@
<td></td>
</tr>
<tr>
+ <td>windowMaximize</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Sign in</td>
<td></td>
@@ -32,6 +37,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
<td>type</td>
<td>username</td>
<td>root</td>
@@ -77,11 +87,16 @@
<td></td>
</tr>
<tr>
- <td>componentExoContextMenu</td>
- <td>//a[@title='Home']</td>
+ <td>waitForElementPresent</td>
+ <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Home']</td>
<td></td>
</tr>
<tr>
+ <td>mouseDownRight</td>
+ <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Home']</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Cut Node</td>
<td></td>
14 years, 6 months
gatein SVN: r3488 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-06-28 00:31:49 -0400 (Mon, 28 Jun 2010)
New Revision: 3488
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_16_001_ShowApplicationPortletWhenCheckOrUnCheckShowImport.html
Log:
TESTVN-356: Clean and improve
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_16_001_ShowApplicationPortletWhenCheckOrUnCheckShowImport.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_16_001_ShowApplicationPortletWhenCheckOrUnCheckShowImport.html 2010-06-28 04:22:19 UTC (rev 3487)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_16_001_ShowApplicationPortletWhenCheckOrUnCheckShowImport.html 2010-06-28 04:31:49 UTC (rev 3488)
@@ -82,13 +82,8 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='UIPortlet-ec2e728a-389e-4580-941e-a332d2423d3d']/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[1]</td>
- <td></td>
-</tr>
-<tr>
<td>click</td>
- <td>//div[@id='UIPortlet-ec2e728a-389e-4580-941e-a332d2423d3d']/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[1]</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
<td></td>
</tr>
<tr>
@@ -112,6 +107,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td>
<td></td>
@@ -137,13 +137,8 @@
<td>Application Registry</td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='UIPortlet-ec2e728a-389e-4580-941e-a332d2423d3d']/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[1]</td>
- <td></td>
-</tr>
-<tr>
<td>click</td>
- <td>//div[@id='UIPortlet-ec2e728a-389e-4580-941e-a332d2423d3d']/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[1]</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
<td></td>
</tr>
<tr>
@@ -167,6 +162,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td>
<td></td>
14 years, 6 months
gatein SVN: r3487 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-06-28 00:22:19 -0400 (Mon, 28 Jun 2010)
New Revision: 3487
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_05_06_003_LimitAccessRightForApplicationInNotPublicCategoryWhenUserWhoHasRightToAccessApplicationAlsoHasRightToAccessItsCategory.html
Log:
TESTVN-356: Clean and improve
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_05_06_003_LimitAccessRightForApplicationInNotPublicCategoryWhenUserWhoHasRightToAccessApplicationAlsoHasRightToAccessItsCategory.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_05_06_003_LimitAccessRightForApplicationInNotPublicCategoryWhenUserWhoHasRightToAccessApplicationAlsoHasRightToAccessItsCategory.html 2010-06-28 03:53:02 UTC (rev 3486)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_PRL_05_06_003_LimitAccessRightForApplicationInNotPublicCategoryWhenUserWhoHasRightToAccessApplicationAlsoHasRightToAccessItsCategory.html 2010-06-28 04:22:19 UTC (rev 3487)
@@ -343,12 +343,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Add New Page</td>
+ <td>//a[contains(text(),'Add New Page')]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>link=Add New Page</td>
+ <td>//a[contains(text(),'Add New Page')]</td>
<td></td>
</tr>
<tr>
@@ -367,16 +367,41 @@
<td>Test_PRL_05_06_003</td>
</tr>
<tr>
+ <td>echo</td>
+ <td>-- Go to Step 2--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
<td></td>
</tr>
<tr>
+ <td>echo</td>
+ <td>-- Go to step 3--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Test_PRL_05_06_003</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>link=Test_PRL_05_06_003</td>
<td></td>
@@ -412,6 +437,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIApplicationOrganizer']/div[2]/div[1]/div/div/div[2]/div/div[4]/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>//div[@id='UIApplicationOrganizer']/div[2]/div[1]/div/div/div[2]/div/div[4]/div/div/div/div/a</td>
<td></td>
@@ -442,6 +472,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[2]/div[1]/div/a</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[2]/div[1]/div/a</td>
<td></td>
@@ -477,6 +512,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[2]/div[1]/div/a</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[2]/div[1]/div/a</td>
<td></td>
14 years, 6 months