Author: mposolda(a)redhat.com
Date: 2009-06-23 10:48:15 -0400 (Tue, 23 Jun 2009)
New Revision: 13489
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/assert.properties
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/tools/extract.pl
Log:
Refactor extract.pl and adding help. Added properties from PortalBookstoreSampleTestCase
and SSO test cases to properties files.
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/assert.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/assert.properties 2009-06-23
14:48:03 UTC (rev 13488)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/assert.properties 2009-06-23
14:48:15 UTC (rev 13489)
@@ -36,4 +36,51 @@
ajax.p1.l3=Sale Price: $314.96
ajax.p1.l2=B BY BURTON ALPHA
-ajax.p1.l1=Product ID: 1
\ No newline at end of file
+ajax.p1.l1=Product ID: 1
+
+samples.bookstore.pmode.normal=portlet-mode-normal
+samples.bookstore.pmode.minimized=portlet-mode-minimized
+samples.bookstore.book.1000.title=Foundation Flash Cartoon Animation
+samples.bookstore.book.1000.author=Tim Jones
+samples.bookstore.book.1000.img=animation.jpg
+samples.bookstore.book.1001.title=Head First Design Patterns
+samples.bookstore.book.1001.author=Elisabeth Freeman
+samples.bookstore.book.1001.img=patterns.jpg
+samples.bookstore.book.1004.title=Java Servlet and JSP Cookbook
+samples.bookstore.book.1004.author=Bruce Perry
+samples.bookstore.book.1004.img=servlets.jpg
+samples.bookstore.book.1005.title=Mommywood
+samples.bookstore.book.1005.author=Tori Spelling
+samples.bookstore.book.1005.img=mommywood.jpg
+samples.bookstore.book.1007.title=The Picture of Dorian Gray
+samples.bookstore.book.1007.author=Oscar Wilde
+samples.bookstore.book.1007.img=dorian.jpg
+samples.bookstore.catalog.title=Book Catalog Portlet
+samples.bookstore.catalog.choose=Please choose from our selections:
+samples.bookstore.showcart.header.card.empty=Your cart is empty.
+samples.bookstore.showcart.header.card.pref=Your shopping cart contains
+samples.bookstore.showcart.header.card.suf=\ items.
+samples.bookstore.receipt.success=Thank you for purchasing your books from us
+samples.bookstore.receipt.failure=Your order could not be completed due to insufficient
inventory.
+samples.bookstore.receipt.failure.mess=Not enough books with title: Foundation Flash
Cartoon Animation in inventory.
+
+sso.cas.cas.invalid.auth=The credentials you provided cannot be determined to be
authentic.
+sso.cas.cas.login.mess=Enter your JA-SIG NetID and Password.
+sso.cas.cas.logout.succ=Logout successful
+sso.cas.logged.in.mess=Logged in as:
+sso.cas.forbidden.mess=HTTP Status 403 -
+
+sso.josso.josso.invalid.auth=Invalid Authentication Information
+sso.josso.logged.in.mess=Logged in as:
+sso.josso.forbidden.mess=HTTP Status 403 -
+sso.josso.samples.ses.no=No session
+sso.josso.samples.ses.id=Session id
+
+sso.tomcatvalve.example.login.form=Login form
+sso.tomcatvalve.example.title.output=Tomcat SSO valve example servlet
+sso.tomcatvalve.logged.in.mess=Logged in as:
+sso.tomcatvalve.jmx.agnview=JMX Agent View
+sso.tomcatvalve.forbidden.mess=HTTP Status 403 -
+
+
+
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-06-23
14:48:03 UTC (rev 13488)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-06-23
14:48:15 UTC (rev 13489)
@@ -684,4 +684,86 @@
samples.ajax.url.div2=//html/body/div[2]/div/div/div[2]/div[2]/div/div[2]/div/div/table/tbody/tr[2]/td[2]/div/div/table
samples.ajax.url.lnk2.blue=
samples.ajax.url.lnk2.red=//div[contains(@id,'expander')]/div[2]/div[2]/div/div[2]/div/div/table/tbody/tr[2]/td[2]/div/div/a[2]
-samples.ajax.url.lnk2.white=
\ No newline at end of file
+samples.ajax.url.lnk2.white=
+
+samples.bookstore.adr=/portal/portal/default/Bookstore+sample
+samples.bookstore.bookstore.lnk.start=link=Start Shopping
+samples.bookstore.bookstore.lnk.detail=link=Java Servlet and JSP Cookbook
+samples.bookstore.catalog.icon=//div[@id='regionA']/div[2]/table/tbody/tr[1]/td[2]/div[2]/span[1]/a@class
+samples.bookstore.catalog.tr.pref=//tr[@id='BookCatalogPortlet_
+samples.bookstore.catalog.tr.suf.detail=']/td[1]/a/strong
+samples.bookstore.catalog.tr.suf.add=']/td[4]/p/strong/a
+samples.bookstore.catalog.tr.suf.count=']/td[3]
+samples.bookstore.detail.image.pref=//img[@alt='
+samples.bookstore.detail.image.suf=']
+samples.bookstore.detail.bktitle=bookDetailPortlet_title
+samples.bookstore.detail.bkauthor=bookDetailPortlet_author
+samples.bookstore.detail.lnk.add=BookDetailPortlet_AddBookLink
+samples.bookstore.showcart.lnk.clear=link=Clear Cart
+samples.bookstore.showcart.header=BookShowCartPortlet_header
+samples.bookstore.showcart.table=BookShowCartPortlet_cardTable
+samples.bookstore.showcart.table.tr.pref=//tr[@id='BookShowCartPortlet_cardTable_
+samples.bookstore.showcart.table.tr.count.suf=']/td[1]
+samples.bookstore.showcart.table.tr.title.suf=']/td[2]/strong/a
+samples.bookstore.showcart.table.tr.remove.suf=']/td[4]/strong/a
+samples.bookstore.cashier.amount=BookCashierPortlet_amount
+samples.bookstore.cashier.inp.name=cardname
+samples.bookstore.cashier.inp.num=cardnum
+samples.bookstore.cashier.submit=cashierSubmit
+samples.bookstore.receipt.header=BookReceiptPortlet_header
+
+sso.cas.adr.portal=/portal
+sso.cas.adr.portal.admin=/portal/auth/portal/admin
+sso.cas.adr.portal.default=/portal/auth/portal/default
+sso.cas.lnk.login=link=Login
+sso.cas.lnk.admin=link=Admin
+sso.cas.lnk.weather=link=Weather
+sso.cas.lnk.cp.dashboard=link=Copy to my dashboard
+sso.cas.lnk.conf.dashboard=link=Configure dashboard
+sso.cas.lnk.dashboard=link=Dashboard
+sso.cas.lnk.logout=link=Logout
+sso.cas.forbidden.element=//h1
+sso.cas.cas.input.username=username
+sso.cas.cas.input.password=password
+sso.cas.cas.submit.login=//input[@value='LOGIN']
+sso.cas.cas.image=//img[@alt='Central Authentication Service']
+
+sso.josso.adr.portal=/portal
+sso.josso.adr.portal.admin=/portal/auth/portal/admin
+sso.josso.adr.portal.default=/portal/auth/portal/default
+sso.josso.adr.portal.test.session=/portal/auth/portal/default/Test/Session+test
+sso.josso.lnk.login=link=Login
+sso.josso.lnk.admin=link=Admin
+sso.josso.lnk.weather=link=Weather
+sso.josso.lnk.cp.dashboard=link=Copy to my dashboard
+sso.josso.lnk.conf.dashboard=link=Configure dashboard
+sso.josso.lnk.dashboard=link=Dashboard
+sso.josso.lnk.logout=link=Logout
+sso.josso.forbidden.element=//h1
+sso.josso.josso.input.username=josso_username
+sso.josso.josso.input.password=josso_password
+sso.josso.josso.submit.login=//input[@value='Login']
+sso.josso.josso.image=//img[@alt='Java Open Single SignOn']
+sso.josso.cms.file.tbl.cms.file=//div[@id='center']/div/div/div[3]/table
+sso.josso.samples.ses.sub.pscope=portlet
+sso.josso.samples.ses.inp.val=value
+sso.josso.samples.ses.inp.nam=name
+
+sso.tomcatvalve.adr.portal=/portal
+sso.tomcatvalve.adr.example=/TomcatSSOValveExampleApp
+sso.tomcatvalve.adr.jmx=/jmx-console/
+sso.tomcatvalve.ex.title=//h1
+sso.tomcatvalve.ex.inp.username=j_username
+sso.tomcatvalve.ex.inp.password=j_password
+sso.tomcatvalve.ex.login=//input[@value='Login']
+sso.tomcatvalve.ex.logout=//input[@value='Logout']
+sso.tomcatvalve.ex.logged.user.label=//tr[1]/td[2]/b
+sso.tomcatvalve.ex.logged.user.label=//tr[4]/td[2]/b
+sso.tomcatvalve.jmx.title.element=//h1
+sso.tomcatvalve.jmx.image=//img[@alt='JBoss']
+sso.tomcatvalve.lnk.login=link=Login
+sso.tomcatvalve.lnk.logout=link=Logout
+sso.tomcatvalve.lnk.default=link=default
+sso.tomcatvalve.lnk.admin=link=Admin
+sso.tomcatvalve.lnk.wsrp=link=WSRP
+sso.tomcatvalve.lnk.default=link=Dashboard
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/tools/extract.pl
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/tools/extract.pl 2009-06-23
14:48:03 UTC (rev 13488)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/tools/extract.pl 2009-06-23
14:48:15 UTC (rev 13489)
@@ -1,5 +1,21 @@
#!/usr/bin/perl -w
+if ($#ARGV != 1 ) {
+ print "\n\nUsage: extract.pl OPTION FILE.\n\nScript is used to extract properties
from Java source files. Example of one input and output line: \n";
+ print "INPUT: private final String SHOWCART_PORTLET_TABLE_TR_PREFIX =
getLoc(casePfx+\"showcart.table.tr.pref\",
\"//tr[\@id='BookShowCartPortlet_cardTable_\");\n";
+ print "OUTPUT:
samples.bookstore.showcart.table.tr.pref=//tr[\@id='BookShowCartPortlet_cardTable_\n";
+ print "\n\n";
+ print "OPTION - one of these:\n";
+ print " l - Extract properties from calling of method getLoc\n";
+ print " m - Extract properties from calling of method getMess\n";
+ print "\n";
+ print "FILE - path to file. Something like:
../src/org/jboss/portal/test/selenium/PortalBookstoreSampleTestCase.java\n\n";
+ print "EXAMPLE OF USAGE (from directory ui-tests): \n";
+ print "tools/extract.pl l
src/org/jboss/portal/test/selenium/PortalBookstoreSampleTestCase.java\n";
+ print "tools/extract.pl m
src/org/jboss/portal/test/selenium/PortalBookstoreSampleTestCase.java\n\n";
+ exit;
+}
+
$mode = shift;
$file = shift;
@@ -23,9 +39,9 @@
$pfx = $1;
}
- if ( $_ =~ /^.*String\W*(\w+)\W=\W$fun*.*\"(.*)\"\W*\)\W*;\W*$/ ) {
- $value= $2;
- $name =lc($1);
+ if ( $_ =~
/^.*String\W*(.*)\W=\W$fun*.*\"(.*)\".*\"(.*)\"\W*\)\W*;\W*$/ ) {
+ $value= $3;
+ $name =lc($2);
$name =~ s/_/./g;
print $pfx.$name."=".$value."\n";
Show replies by date