From c7adb5530d3c92fcb39b900f3d0d31f5faef0737 Mon Sep 17 00:00:00 2001 From: Menaka Madushanka Date: Fri, 12 Feb 2016 10:39:25 +0530 Subject: [PATCH] Added comments and code cleanup --- .../ui/pages/uesr/UserListingPage.java | 19 +- .../src/main/resources/mapper.properties | 966 +++++++++--------- .../web/ui/test/user/TestAdminFunctions.java | 3 +- 3 files changed, 502 insertions(+), 486 deletions(-) diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java index 7adc3088..fe8c35bc 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.wso2.iot.integration.ui.pages.uesr; import org.apache.commons.logging.Log; @@ -19,7 +36,7 @@ public class UserListingPage { this.driver = driver; this.uiElementMapper = UIElementMapper.getInstance(); - if (!driver.findElement(By.xpath(uiElementMapper.getElement("iot.admin.user.added.page.subtitle.xpath"))) + if (!driver.findElement(By.xpath(uiElementMapper.getElement("iot.admin.user.listing.page.subtitle.xpath"))) .getText().contains("USERS")){ throw new IllegalStateException("This is not the User Listing page"); } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/resources/mapper.properties b/modules/integration/tests-common/web-ui-pages/src/main/resources/mapper.properties index d2af86d6..b1f530e6 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/resources/mapper.properties +++ b/modules/integration/tests-common/web-ui-pages/src/main/resources/mapper.properties @@ -102,7 +102,7 @@ iot.admin.user.addButton.xpath=/html/body/div[3]/div[2]/div[1]/div[3]/div/div/di iot.admin.user.viewButton.xpath=/html/body/div[3]/div[2]/div[1]/div[3]/div/div/div[2]/div[2]/span[2]/a[1]/span/i[2] iot.admin.user.added.page.subtitle.xpath="//p[@class='page-sub-title']" -#="//span[@class='page-sub-title']" +iot.admin.user.listing.page.subtitle.xpath="//span[@class='page-sub-title']" iot.admin.addUser.username.id=username iot.admin.addUser.firstName.id=firstname @@ -130,485 +130,485 @@ iot.admin.editUser.btn.xpath=//*[@id="userEditBtn"] iot.admin.editUser.edit.btn.xpath=//*[@id="add-user-btn"] #----------------------------------------------------------------------------------------------------------------------- -iot.user.delete.button=//*[@id="inosh"]/td[5]/a[3] -iot.user.delete.button.confirm=remove-user-yes-link -iot.user.delete.button.success=remove-user-success-link -iot.roles.add.button=appbar-btn- -iot.roles.add.rolename.input=rolename -iot.roles.add.role.button=add-role-btn -iot.roles.add.role.created.msg.div=role-created-msg -iot.roles.update.rolename.input=rolename -iot.roles.update.role.button=add-role-btn -iot.roles.update.role.created.msg.div=role-created-msg -iot.roles.update.role.created.success.msg=ROLE WAS UPDATED SUCCESSFULLY -iot.configuration.android.tab.identifier=id('androidConfigLink') -iot.configuration.widows.tab.identifier=id('windowsConfigLink') -iot.configuration.ios.tab.identifier=id('iosConfigLink') -iot.configuration.general.tab.identifier=id('generalConfigLink') -iot.configuration.general.input.monitoringFr.identifier=id('monitoring-config-frequency') -iot.configuration.general.button.save.identifier=id('monitoring-config-frequency') -iot.configuration.saved.lable.identifier=id('record-created-msg') -iot.configuration.saved.lable.val=Please click "Go back to configurations", if you wish to save another configuration or click "Exit" to complete the process and go back to the dashboard. -iot.configuration.saved.button.back.identifier=id('btnBack') -iot.configuration.saved.button.back.val=Go back to configurations -iot.configuration.saved.button.exit.identifier=id('btnExit') -iot.configuration.saved.button.exit.val=Exit -iot.configuration.android.select.identifier=id('android-config-notifier') -iot.configuration.android.input.identifier=id('android-config-notifier-frequency') -iot.configuration.android.button.save.identifier=id('save-android-btn') -iot.configuration.windows.input.identifier=id('windows-config-notifier-frequency') -iot.configuration.windows.button.save.identifier=id('save-windows-btn') -iot.notification.bubble.identifier=notification-bubble -iot.notification.unread.identifier=unReadNotifications -iot.notification.all.identifier=allNotifications - - - - -app.sign.in.button=button.btn -app.redMine.login.button.name=login -app.redMine.issue.button=New issue -app.redMine.issue.subject=issue_subject -app.redMine.issue.description=issue_description -app.redMine.issue.submit=commit -app.AddNew.App.link=Add New Application -new.app.add.app.name=applicationName -new.app.add.app.key=applicationKey -new.app.add.app.icon=icon -new.app.add.app.Description=applicationDescription -new.app.add.app.edit.Description=appDescriptionEdit_textarea -new.app.add.app.type=applicationType -app.issue.version.id=issue_fixed_version_id -app.database.db.environment.id=rssInstances -app.database.db.environment.user=js_db_user -app.database.db.environment.template=js_db_template -new.app.add.repository.type=repositoryType -create.new.app.button=appcreation -app.homepage.search.textBox=search -app.first.element.of.home.page=/html/body/div/div/article/section/ul/li[2]/div/h2/a/b -app.overview.page.app.type.id=apptype -app.overview.page.app.description.id=description -app.overview.page.repository.type.id=repotype -app.overview.page.app.owner.id=appOwner -app.overview.page.app.key.xpath=/html/body/div/div/article/section[2]/div/div/div/p -app.add.member.link=Add Members -app.add.member.name=allUsersList -app.invite.users= btn_nvite_users -app.add.add.to.list.button=addToListBtn -app.add.branch.link=Create Branch -app.add.second.branch.xpath=(//a[contains(text(),'Branch')])[2] -app.add.branch.version=create_branchtrunk -app.add.branch.button.xpath=//input[@value='Create Branch'] -app.add.branch.two.button.xpath=(//input[@value='Create Branch'])[2] -app.navigate.Link=Repos & Builds -app.navigate.Governance.page.link=menu_governance -app.navigate.isue.page.link.id=menu_trackIssues -app.trunk.overview.xpath=/html/body/div/div/article/section[3]/div/ul/li/p/strong -app.trunk.build.status.xpath=/html/body/div/div/article/section[3]/div/ul/li[2]/p/span/strong -governance.page.firstElement.xpath=/html/body/div/div[2]/article/section/div[2]/ul/li/ul/li/div/strong -governance.page.firstElement.date.xpath=/html/body/div/div[2]/article/section/div[2]/ul/li/ul/li[2]/div[2]/form/div/input -governance.page.date.save.xpath=/html/body/div/div[2]/article/section/div[2]/ul/li/ul/li[2]/div[2]/form/div/button -governance.page.promote.key.xpath=/html/body/div/div[2]/article/section/div[2]/ul/li/ul/li[3]/div/ul/li[2]/a/span -code.completed.status=(//input[@id='registry.custom_lifecycle.checklist.option.0.item'])[last()] -code.review.status=(//input[@id='registry.custom_lifecycle.checklist.option.1.item'])[last()] -design.review.status=(//input[@id='registry.custom_lifecycle.checklist.option.2.item'])[last()] -app.application.overview.page=Overview -app.overview.page.team.details.id=userCountList -app.team.page.id=menu_userAdmin -app.add.member.page.id=btnAddMembers -app.issue.redMine.tab.link=Track Issues -app.testing.first.element.xpath=/html/body/div/div[2]/article/section/div[2]/ul[2]/li/ul/li/div/strong -app.testing.date.save.xpath=/html/body/div/div[2]/article/section/div[2]/ul[2]/li/ul/li[2]/div/form/div/button -app.testing.first.element.arrow.xpath=/html/body/div/div[2]/article/section/div[2]/ul[2]/li/ul/li[3]/div/ul/li[2]/a -app.factory.issue.total.count.xpath=/html/body/div/div[2]/article/section/section/div/ul/li[2] -app.factory.issue.item.header.id=item_list -app.factory.database.configure.page.link=Database Configurations -app.factory.new.database.link=Database -app.factory.database.name.id=databaseName -app.factory.database.password=databaseUserPassword -app.factory.database.confirm.password=confirmDatabaseUserPassword -app.factory.database.submit.button=div.buttonrow > input[name="Submit"] -app.factory.database.advance.Checkbox=advancecheckbox -app.factory.database.user.CheckBox=Username -app.factory.database.user.password=Password -app.factory.database.user.Repeat.password=repeatPassword -app.factory.database.environment.id=rssInstances -app.factory.database.user.submit.name=Submit -app.factory.database.template.name=templateName -app.factory.database.template.submit.name=Submit -app.factory.db.admin.id=menu_dbAdmin -app.factory.db.dbUser.link=DB User -app.factory.db.template.link=DB Template -app.factory.db.resources.id=dbSection -app.db.link=Db -app.db.user=wso2usr -app.db.template=wso2Temp@Development -app.factory.delete.user=Delete User -app.factory.del.template=Delete Template -app.factory.delete.Ok=Ok -app.factory.delete.db=Delete DB -app.data.source.name=datasource_name -app.data.source.description=datasource_description -app.data.source.password=datasource_password_dev -app.data.source.username=datasource_username_text_dev -app.data.source.add.button=Submit -app.property.name=property_name -app.property.type=property_type -app.property.description=property_description -app.property.value=property_value -app.factory.registry.page.link=Endpoints & Registry -app.factory.data.source.page.link=Datasources -app.db.details.id=dbSection -app.db.user.id=dbUsrSection -app.db.template.id=dbTempSection -app.factory.new.data.source.page.button=//button[@type='button'] -app.factory.api.panel.text=/html/body/div/div/article/section[3] -app.factory.sign.out.email=span.icon-chevron-down -app.factory.sing.out.text=Sign Out -app.factory.subscribe=Subscribe to APIs -app.factory.subscribe.api.element=li > div.thumbnail > a > img -app.api.select.app.name=application-list -app.api.subscribe.button=subscribe-button -app.api.api.manager.button=gotoApiManagerbtn -app.go.to.subscriptions.text=Go to My Subscriptions -app.api.manager.class.name.text=title-section -app.api.key.generate.text=Show Keys -app.api.sandbox.details.id=sandTable0 -app.api.production.details.id=prodTable0 -app.api.page.link.text=APIs -app.api.page.resource.list.id=keySection -app.factory.subscription.page=My Subscriptions -app.factory.list.view=a.icon-th-list.table_view -app.overview.link.css=/html/body/div/div[2]/article/nav/ul/li/a - - - - -login.username=username -login.password=password -login.sign.in.button=button -login.header.div=header-div - -home.dashboard.middle.text.xpath=/html/body/div[3]/div[1]/div/span -home.greg.sign.out.xpath=//*[@id="header-div"]/div[4]/div/ul/li[3]/a -home.logged.user.dev=logged-user - -jaggery.Main.tab=menu-panel-button1 -jaggery.Region1.tab=region1_manage_menu -jaggery.dashboard.middle.text=middle -add.jaggery.href=Jaggery -jaggery.war.file.upload.name=warFileName -jaggery.upload.button.name=upload -jaggery.upload.successful.message=messagebox-info -jaggery.upload.successful.button=ui-dialog-titlebar-close - - -carbon.Main.tab=menu-panel-button1 -carbon.Region1.tab=region1_manage_menu -carbon.add.href=Add -carbon.dashboard.middle.text=middle -carbon.file.upload.field=filename -carbon.upload.button=upload -carbon.upload.successful.message=messagebox-info -carbon.upload.successful.button=ui-dialog-titlebar-close - - -resource.Main.tab=menu-panel-button1 -resource.Region3.tab=region3_registry_menu -resource.browse.link=Browse -resource.dashboard.middle.text=middle -resource.detailed.view=stdView -resource.add.resource.link=Add Resource -resource.add.collection.link=Add Collection -resource.add.resource.input.field=uResourceFile -resource.add.Collection.input.field=collectionName -resource.add.Url.input.id=irFetchURL -resource.add.collection.description=colDesc -resource.add.resource.name=uResourceName -Resource.add.resource.description=description -resource.add.button=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/table/tbody/tr/td/div[2]/div[3]/div[3]/div[5]/table/tbody/tr[2]/td/form/table/tbody/tr[6]/td/input -resource.add.Url.button.xpath=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/table/tbody/tr/td/div[2]/div[3]/div[3]/div[5]/table/tbody/tr[3]/td/form/table/tbody/tr[6]/td/input -resource.collection.add.button=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/table/tbody/tr/td/div[2]/div[3]/div[3]/div[7]/form/table/tbody/tr[5]/td/input -resource.upload.successful.message=messagebox-info -resource.upload.successful.collection.message=messagebox-info -resource.upload.successful.button=ui-dialog-titlebar-close -resource.upload.collection.successful.close.button=/html/body/div[5]/div/div/a -resource.add.Url.Successful.close=/html/body/div[4]/div/div/a - - - -service.add.link=Service -service.dashboard.middle.text=middle -service.list.dashboard.middle.text=middle -service.add.name.id=id_Overview_Name -service.add.namespace.id=id_Overview_Namespace -service.check.save.service=Services - - -wsdl.dashboard.middle.text=middle -wsdl.list.dashboard.middle.text=middle -wsdl.add.link=WSDL -wsdl.add.url=irFetchURL -wsdl.add.name=irResourceName -wsdl.add.file.id=uResourceFile -wsdl.add.file.name.id=uResourceName - - -schema.add.link=Schema -schema.dashboard.middle.text=middle -schema.list.dashboard.middle.text=middle -schema.add.url=irFetchURL -schema.add.name=irResourceName -schema.add.schema.name.id=uResourceName - - -wsPolicy.add.link=Policy -wsPolicy.dashboard.middle.text=middle -ws.policy.list.dashboard.middle.text=middle -wsPolicy.add.url=irFetchURL -wsPolicy.add.name=irResourceName -wsPolicy.add.file.id=uResourceFile -wsPolicy.add.schema.name.id=uResourceName - - -api.add.link=API -api.dashboard.middle.text=middle -api.provider.id=id_Overview_Provider -api.name.id=id_Overview_Name -api.context.id=id_Overview_Context -api.version.id=id_Overview_Version -api.list.link=APIs - - -uri.add.link=URI -uri.add.list.id=URIs -uri.dashboard.middle.text=middle -uri.add.uri=id_Overview_URI -uri.add.uri.name=id_Overview_Name -uri.list.link=URIs - - -my.profile.region.tab.id=region5_my_identity_menu -my.profile.add.page.link=My Profiles -my.profile.dashboard.middle.text=middle -my.profile.new.profile.add.link=Add New Profile -my.profile.name.id=profile -my.profile.first.name.id=http://wso2.org/claims/givenname -my.profile.last.name.id=http://wso2.org/claims/lastname -my.profile.email.id=http://wso2.org/claims/emailaddress -my.profile.successful.save.pane=/html/body/div[3]/div/div/a - - -search.activity.link=Activities -search.activity.id=user -search.activity.name.id=path -search.activity.exists.id=activityList - - -search.page.link=Search -search.resource.name=resourcePath -search.results.id=1 -filter.search.button=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/form[3]/table/tbody/tr/td[8]/table/tbody/tr/td/a - -users.add.new.user.link.id=Add New User -users.and.roles.link.text=Users and Roles -users.adn.roles.add.page.middle.text=middle -users.add.link.id=Users -users.add.new.user.name.id=username -users.add.new.user.password.name=password -users.add.new.user.password.retype.name=retype -users.admin.tick.name=userRoles -users.save=//input[contains(@value,'Finish')] -users.page.next.id=2 - - - - -roles.add.link.id=Roles -role.add.new.user.link.id=Add New Role -role.add.new.user.name.id=roleName -role.permission.id=ygtvspacer -role.add.user.to.role.name=org.wso2.carbon.role.assign.filter -role.search.button=td.buttonRow > input.button -role.add.ok.button.css=button[type="button"] -role.add.user.to.role.name.tick=selectedUsers -role.add.user.finish.button=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/form[2]/table/tbody/tr[2]/td/input[2] - - -pass.word.change.link=Change My Password -pass.word.current.name=currentPassword -pass.word.new.name=newPassword -pass.word.check.name=checkPassword -pass.word.change.save.xpath=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/form/table/tbody/tr[2]/td/input -password.change.dialog.xpath=/html/body/div[3]/div/div/a - - - -features.add.link=Features -repository.add.tab.text=Repository Management -repositories.table.id=_table_manage_repositories -repository.add.link.text=Add Repository -repository.url.name=_txt_repository_location_url -repository.save.id=_btn_add_repository -repository.name.id=_txt_repository_name -installed.features.tab.linkText=Installed Features -repositories.dashboard.text=middle -features.filter.id=_txt_IF_filterString -feature.checkbox.click.name=chkSelectFeaturesToUninstall -feature.uninstall.next.button.id=_btn_next_review_uninstall_features -feature.uninstall.finish.button.id=_btn_uc_finish - - - -server.shutdown.link.text=Shutdown/Restart -feature.revert.tab=Installation History -feature.find.feature.text=Available Features -feature.install.name.id=_txt_AF_filterString -feature.find.id=_btn_next_filter_repositories -feature.install.click=chkSelectFeaturesToInstall -feature.install.accept.button=_radio_af_accept_licenses - - -key.store.add.link=KeyStores -key.store.dashboard.middle.text=middle -key.store.add.new.link.text=Add New KeyStore -key.store.file.path.id=keystoreFile -key.store.password.name=ksPassword -key.store.provider.name=provider -key.store.next.button=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/form/table/tbody/tr[2]/td/input -key.store.pass.key=keyPass -key.store.successful.xpath=/html/body/div[3]/div/div/a - - -logging.add.link=Logging -logging.dashboard.middle.text=middle -logging.update.button.id=globalLog4jUpdate -log4j.appender.update.id=appenderUpdate -log4j.global.success.xpath=/html/body/div[3]/div[2]/button -log4j.appender.sucess.xpath=/html/body/div[4]/div[2]/button - - -log4j.logger.search.id=filterText -log4j.logger.successful.button.xpath=/html/body/div[3]/div/div/a - - -notification.adding.link=Notifications -notification.dashboard.middle.text=middle -notification.add.edit.link.text=Add Subscription to Resource/Collection -notification.add.email.id=subscriptionInput - -registry.subscription.middle.text=middle -registry.subscription.path.id=subscriptionPath -registry.subscription.event.id=eventList -registry.subscription.notification.id=notificationMethodList -registry.subscription.email.id=subscriptionInput -registry.subscription.digest.id=subscriptionDigestTypeInput -registry.subscription.hsmethod.id=hierarchicalSubscriptionList -registry.subscription.subscribe.button.id=subscribeButton - - -uri.configure.add.link=URIs -uri.configure.dashboard.middle.text=middle - - - -api.configure.add.link=APIs -api.configure.dashboard.middle.text=middle - -service.configure.add.link=Services -service.configure.dashboard.middle.text=middle - -server.role.add.link=Server Roles -server.role.dashboard.middle.text=middle -server.role.add.link.text=Add New Server Role -server.role.name.id=_serverRoleName - - -add.new.tenant.link.text=Add New Tenant -tenant.role.dashboard.middle.text=middle -tenant.domain=domain -tenant.first.name=admin-firstname -tenant.last.name=admin-lastname -tenant.admin.user.name=admin -tenant.admin.password=admin-password -tenant.admin.password.repeat=admin-password-repeat -tenant.admin.email.id=admin-email -add.new.tenant.success.button=/html/body/div[3]/div/div/a -view.tenant.link=View Tenants - - - -add.new.extension.dashboard.middle.text=middle -extension.tab.id=menu-panel-button5 -extension.list.page.dashboard.middle.text=middle -extensions.add.link=Add -extension.add.text.box=uResourceFile - -life.cycle.tab.id=menu-panel-button5 -life.cycle.add.link=Lifecycles -add.new.lifecycle.dashboard.middle.text=middle -add.new.lifecycle.link.text=Add New Lifecycle -add.new.lifecycle.text.area=//*[@id="textarea"] -add.new.lifecycle.save.css=input.button.registryWriteOperation -resource.lifecycle.minimized=//*[@id="lifecycleIconMinimized"] -resource.lifecycle.add=//*[@id="lifecycleExpanded"]/div[2]/a -resource.lifecycle.add.select=//*[@id="aspect"] -resource.lifecycle.add.select.id=aspect -resource.lifecycle.add.button.add=//*[@id="add-lifecycle-div"]/form/table/tbody/tr[2]/td/input[1] -resource.lifecycle.add.button.cancel=//*[@id="add-lifecycle-div"]/form/table/tbody/tr[2]/td/input[2] - - - -artifact.add.tab.id=menu-panel-button5 -artifacts.add.link=Artifact Types -add.new.artifact.dashboard.middle.text=middle -add.new.artifact.type.link=Add new Artifact -add.new.artifact.text.area=textarea -add.new.artifact.save.xpath=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/form/table/tbody/tr[2]/td/input - -add.new.artifact.dialog.box=button[type="button"] - - - -handler.add.tab.id=menu-panel-button5 -handler.add.link=Handlers -add.new.handler.dashboard.middle.text=middle -add.new.handler.link.text=Add New Handler -add.new.handler.text.area=textarea -add.new.handler.save.xpath=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/form/table/tbody/tr[2]/td/input -add.new.handler.dialog.box=button[type="button"] -configure.tab.id=menu-panel-button3 - - - -manage.report.page.link=Reports -manage.report.list.dashboard.middle.text=middle -add.report.list.dashboard.middle.text=middle -add.report.name=reportName -add.report.template=reportTemplate -add.report.type=reportType -add.report.class=reportClass -report.add.link=Add Report - -life.cycle.expand.id=lifecycleIconMinimized -life.cycle.add=Add Lifecycle -life.cycle.add.option=option0 -life.cycle.add.option1=option1 -life.cycle.add.option2=option2 -life.cycle.promote=Promote -life.cycle.publish=Publish -life.cycle.stage=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/table/tbody/tr/td[4]/div[14]/div[3]/div[2]/table/tbody/tr/td/div[2]/table/tbody/tr[2]/td -life.cycle.promote.ok.button=button[type="\button\"] - -webapp.list.xpath=.//*[@id='menu']/ul/li[7]/ul/li[2]/ul/li[1]/a - -webapp.list.page.middle=middle -webapp.add.xpath=//*[@id="menu"]/ul/li[5]/ul/li[2]/ul/li[3]/ul/li[1]/a -webapp.add.page.middle=middle - -endpoints.tab.id=//*[@id="menu"]/ul/li[5]/ul/li[4]/ul/li[4]/a -endpoints.page.middle=middle - - -bam.dashboard.tab.id=//*[@id="menu"]/ul/li[3]/ul/li/a -bam.dashboard.signin.xpath=//*[@id="wrap"]/div[2]/div/div/h1 +#iot.user.delete.button=//*[@id="inosh"]/td[5]/a[3] +#iot.user.delete.button.confirm=remove-user-yes-link +#iot.user.delete.button.success=remove-user-success-link +#iot.roles.add.button=appbar-btn- +#iot.roles.add.rolename.input=rolename +#iot.roles.add.role.button=add-role-btn +#iot.roles.add.role.created.msg.div=role-created-msg +#iot.roles.update.rolename.input=rolename +#iot.roles.update.role.button=add-role-btn +#iot.roles.update.role.created.msg.div=role-created-msg +#iot.roles.update.role.created.success.msg=ROLE WAS UPDATED SUCCESSFULLY +#iot.configuration.android.tab.identifier=id('androidConfigLink') +#iot.configuration.widows.tab.identifier=id('windowsConfigLink') +#iot.configuration.ios.tab.identifier=id('iosConfigLink') +#iot.configuration.general.tab.identifier=id('generalConfigLink') +#iot.configuration.general.input.monitoringFr.identifier=id('monitoring-config-frequency') +#iot.configuration.general.button.save.identifier=id('monitoring-config-frequency') +#iot.configuration.saved.lable.identifier=id('record-created-msg') +#iot.configuration.saved.lable.val=Please click "Go back to configurations", if you wish to save another configuration or click "Exit" to complete the process and go back to the dashboard. +#iot.configuration.saved.button.back.identifier=id('btnBack') +#iot.configuration.saved.button.back.val=Go back to configurations +#iot.configuration.saved.button.exit.identifier=id('btnExit') +#iot.configuration.saved.button.exit.val=Exit +#iot.configuration.android.select.identifier=id('android-config-notifier') +#iot.configuration.android.input.identifier=id('android-config-notifier-frequency') +#iot.configuration.android.button.save.identifier=id('save-android-btn') +#iot.configuration.windows.input.identifier=id('windows-config-notifier-frequency') +#iot.configuration.windows.button.save.identifier=id('save-windows-btn') +#iot.notification.bubble.identifier=notification-bubble +#iot.notification.unread.identifier=unReadNotifications +#iot.notification.all.identifier=allNotifications +# +# +# +# +#app.sign.in.button=button.btn +#app.redMine.login.button.name=login +#app.redMine.issue.button=New issue +#app.redMine.issue.subject=issue_subject +#app.redMine.issue.description=issue_description +#app.redMine.issue.submit=commit +#app.AddNew.App.link=Add New Application +#new.app.add.app.name=applicationName +#new.app.add.app.key=applicationKey +#new.app.add.app.icon=icon +#new.app.add.app.Description=applicationDescription +#new.app.add.app.edit.Description=appDescriptionEdit_textarea +#new.app.add.app.type=applicationType +#app.issue.version.id=issue_fixed_version_id +#app.database.db.environment.id=rssInstances +#app.database.db.environment.user=js_db_user +#app.database.db.environment.template=js_db_template +#new.app.add.repository.type=repositoryType +#create.new.app.button=appcreation +#app.homepage.search.textBox=search +#app.first.element.of.home.page=/html/body/div/div/article/section/ul/li[2]/div/h2/a/b +#app.overview.page.app.type.id=apptype +#app.overview.page.app.description.id=description +#app.overview.page.repository.type.id=repotype +#app.overview.page.app.owner.id=appOwner +#app.overview.page.app.key.xpath=/html/body/div/div/article/section[2]/div/div/div/p +#app.add.member.link=Add Members +#app.add.member.name=allUsersList +#app.invite.users= btn_nvite_users +#app.add.add.to.list.button=addToListBtn +#app.add.branch.link=Create Branch +#app.add.second.branch.xpath=(//a[contains(text(),'Branch')])[2] +#app.add.branch.version=create_branchtrunk +#app.add.branch.button.xpath=//input[@value='Create Branch'] +#app.add.branch.two.button.xpath=(//input[@value='Create Branch'])[2] +#app.navigate.Link=Repos & Builds +#app.navigate.Governance.page.link=menu_governance +#app.navigate.isue.page.link.id=menu_trackIssues +#app.trunk.overview.xpath=/html/body/div/div/article/section[3]/div/ul/li/p/strong +#app.trunk.build.status.xpath=/html/body/div/div/article/section[3]/div/ul/li[2]/p/span/strong +#governance.page.firstElement.xpath=/html/body/div/div[2]/article/section/div[2]/ul/li/ul/li/div/strong +#governance.page.firstElement.date.xpath=/html/body/div/div[2]/article/section/div[2]/ul/li/ul/li[2]/div[2]/form/div/input +#governance.page.date.save.xpath=/html/body/div/div[2]/article/section/div[2]/ul/li/ul/li[2]/div[2]/form/div/button +#governance.page.promote.key.xpath=/html/body/div/div[2]/article/section/div[2]/ul/li/ul/li[3]/div/ul/li[2]/a/span +#code.completed.status=(//input[@id='registry.custom_lifecycle.checklist.option.0.item'])[last()] +#code.review.status=(//input[@id='registry.custom_lifecycle.checklist.option.1.item'])[last()] +#design.review.status=(//input[@id='registry.custom_lifecycle.checklist.option.2.item'])[last()] +#app.application.overview.page=Overview +#app.overview.page.team.details.id=userCountList +#app.team.page.id=menu_userAdmin +#app.add.member.page.id=btnAddMembers +#app.issue.redMine.tab.link=Track Issues +#app.testing.first.element.xpath=/html/body/div/div[2]/article/section/div[2]/ul[2]/li/ul/li/div/strong +#app.testing.date.save.xpath=/html/body/div/div[2]/article/section/div[2]/ul[2]/li/ul/li[2]/div/form/div/button +#app.testing.first.element.arrow.xpath=/html/body/div/div[2]/article/section/div[2]/ul[2]/li/ul/li[3]/div/ul/li[2]/a +#app.factory.issue.total.count.xpath=/html/body/div/div[2]/article/section/section/div/ul/li[2] +#app.factory.issue.item.header.id=item_list +#app.factory.database.configure.page.link=Database Configurations +#app.factory.new.database.link=Database +#app.factory.database.name.id=databaseName +#app.factory.database.password=databaseUserPassword +#app.factory.database.confirm.password=confirmDatabaseUserPassword +#app.factory.database.submit.button=div.buttonrow > input[name="Submit"] +#app.factory.database.advance.Checkbox=advancecheckbox +#app.factory.database.user.CheckBox=Username +#app.factory.database.user.password=Password +#app.factory.database.user.Repeat.password=repeatPassword +#app.factory.database.environment.id=rssInstances +#app.factory.database.user.submit.name=Submit +#app.factory.database.template.name=templateName +#app.factory.database.template.submit.name=Submit +#app.factory.db.admin.id=menu_dbAdmin +#app.factory.db.dbUser.link=DB User +#app.factory.db.template.link=DB Template +#app.factory.db.resources.id=dbSection +#app.db.link=Db +#app.db.user=wso2usr +#app.db.template=wso2Temp@Development +#app.factory.delete.user=Delete User +#app.factory.del.template=Delete Template +#app.factory.delete.Ok=Ok +#app.factory.delete.db=Delete DB +#app.data.source.name=datasource_name +#app.data.source.description=datasource_description +#app.data.source.password=datasource_password_dev +#app.data.source.username=datasource_username_text_dev +#app.data.source.add.button=Submit +#app.property.name=property_name +#app.property.type=property_type +#app.property.description=property_description +#app.property.value=property_value +#app.factory.registry.page.link=Endpoints & Registry +#app.factory.data.source.page.link=Datasources +#app.db.details.id=dbSection +#app.db.user.id=dbUsrSection +#app.db.template.id=dbTempSection +#app.factory.new.data.source.page.button=//button[@type='button'] +#app.factory.api.panel.text=/html/body/div/div/article/section[3] +#app.factory.sign.out.email=span.icon-chevron-down +#app.factory.sing.out.text=Sign Out +#app.factory.subscribe=Subscribe to APIs +#app.factory.subscribe.api.element=li > div.thumbnail > a > img +#app.api.select.app.name=application-list +#app.api.subscribe.button=subscribe-button +#app.api.api.manager.button=gotoApiManagerbtn +#app.go.to.subscriptions.text=Go to My Subscriptions +#app.api.manager.class.name.text=title-section +#app.api.key.generate.text=Show Keys +#app.api.sandbox.details.id=sandTable0 +#app.api.production.details.id=prodTable0 +#app.api.page.link.text=APIs +#app.api.page.resource.list.id=keySection +#app.factory.subscription.page=My Subscriptions +#app.factory.list.view=a.icon-th-list.table_view +#app.overview.link.css=/html/body/div/div[2]/article/nav/ul/li/a +# +# +# +# +#login.username=username +#login.password=password +#login.sign.in.button=button +#login.header.div=header-div +# +#home.dashboard.middle.text.xpath=/html/body/div[3]/div[1]/div/span +#home.greg.sign.out.xpath=//*[@id="header-div"]/div[4]/div/ul/li[3]/a +#home.logged.user.dev=logged-user +# +#jaggery.Main.tab=menu-panel-button1 +#jaggery.Region1.tab=region1_manage_menu +#jaggery.dashboard.middle.text=middle +#add.jaggery.href=Jaggery +#jaggery.war.file.upload.name=warFileName +#jaggery.upload.button.name=upload +#jaggery.upload.successful.message=messagebox-info +#jaggery.upload.successful.button=ui-dialog-titlebar-close +# +# +#carbon.Main.tab=menu-panel-button1 +#carbon.Region1.tab=region1_manage_menu +#carbon.add.href=Add +#carbon.dashboard.middle.text=middle +#carbon.file.upload.field=filename +#carbon.upload.button=upload +#carbon.upload.successful.message=messagebox-info +#carbon.upload.successful.button=ui-dialog-titlebar-close +# +# +#resource.Main.tab=menu-panel-button1 +#resource.Region3.tab=region3_registry_menu +#resource.browse.link=Browse +#resource.dashboard.middle.text=middle +#resource.detailed.view=stdView +#resource.add.resource.link=Add Resource +#resource.add.collection.link=Add Collection +#resource.add.resource.input.field=uResourceFile +#resource.add.Collection.input.field=collectionName +#resource.add.Url.input.id=irFetchURL +#resource.add.collection.description=colDesc +#resource.add.resource.name=uResourceName +#Resource.add.resource.description=description +#resource.add.button=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/table/tbody/tr/td/div[2]/div[3]/div[3]/div[5]/table/tbody/tr[2]/td/form/table/tbody/tr[6]/td/input +#resource.add.Url.button.xpath=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/table/tbody/tr/td/div[2]/div[3]/div[3]/div[5]/table/tbody/tr[3]/td/form/table/tbody/tr[6]/td/input +#resource.collection.add.button=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/table/tbody/tr/td/div[2]/div[3]/div[3]/div[7]/form/table/tbody/tr[5]/td/input +#resource.upload.successful.message=messagebox-info +#resource.upload.successful.collection.message=messagebox-info +#resource.upload.successful.button=ui-dialog-titlebar-close +#resource.upload.collection.successful.close.button=/html/body/div[5]/div/div/a +#resource.add.Url.Successful.close=/html/body/div[4]/div/div/a +# +# +# +#service.add.link=Service +#service.dashboard.middle.text=middle +#service.list.dashboard.middle.text=middle +#service.add.name.id=id_Overview_Name +#service.add.namespace.id=id_Overview_Namespace +#service.check.save.service=Services +# +# +#wsdl.dashboard.middle.text=middle +#wsdl.list.dashboard.middle.text=middle +#wsdl.add.link=WSDL +#wsdl.add.url=irFetchURL +#wsdl.add.name=irResourceName +#wsdl.add.file.id=uResourceFile +#wsdl.add.file.name.id=uResourceName +# +# +#schema.add.link=Schema +#schema.dashboard.middle.text=middle +#schema.list.dashboard.middle.text=middle +#schema.add.url=irFetchURL +#schema.add.name=irResourceName +#schema.add.schema.name.id=uResourceName +# +# +#wsPolicy.add.link=Policy +#wsPolicy.dashboard.middle.text=middle +#ws.policy.list.dashboard.middle.text=middle +#wsPolicy.add.url=irFetchURL +#wsPolicy.add.name=irResourceName +#wsPolicy.add.file.id=uResourceFile +#wsPolicy.add.schema.name.id=uResourceName +# +# +#api.add.link=API +#api.dashboard.middle.text=middle +#api.provider.id=id_Overview_Provider +#api.name.id=id_Overview_Name +#api.context.id=id_Overview_Context +#api.version.id=id_Overview_Version +#api.list.link=APIs +# +# +#uri.add.link=URI +#uri.add.list.id=URIs +#uri.dashboard.middle.text=middle +#uri.add.uri=id_Overview_URI +#uri.add.uri.name=id_Overview_Name +#uri.list.link=URIs +# +# +#my.profile.region.tab.id=region5_my_identity_menu +#my.profile.add.page.link=My Profiles +#my.profile.dashboard.middle.text=middle +#my.profile.new.profile.add.link=Add New Profile +#my.profile.name.id=profile +#my.profile.first.name.id=http://wso2.org/claims/givenname +#my.profile.last.name.id=http://wso2.org/claims/lastname +#my.profile.email.id=http://wso2.org/claims/emailaddress +#my.profile.successful.save.pane=/html/body/div[3]/div/div/a +# +# +#search.activity.link=Activities +#search.activity.id=user +#search.activity.name.id=path +#search.activity.exists.id=activityList +# +# +#search.page.link=Search +#search.resource.name=resourcePath +#search.results.id=1 +#filter.search.button=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/form[3]/table/tbody/tr/td[8]/table/tbody/tr/td/a +# +#users.add.new.user.link.id=Add New User +#users.and.roles.link.text=Users and Roles +#users.adn.roles.add.page.middle.text=middle +#users.add.link.id=Users +#users.add.new.user.name.id=username +#users.add.new.user.password.name=password +#users.add.new.user.password.retype.name=retype +#users.admin.tick.name=userRoles +#users.save=//input[contains(@value,'Finish')] +#users.page.next.id=2 +# +# +# +# +#roles.add.link.id=Roles +#role.add.new.user.link.id=Add New Role +#role.add.new.user.name.id=roleName +#role.permission.id=ygtvspacer +#role.add.user.to.role.name=org.wso2.carbon.role.assign.filter +#role.search.button=td.buttonRow > input.button +#role.add.ok.button.css=button[type="button"] +#role.add.user.to.role.name.tick=selectedUsers +#role.add.user.finish.button=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/form[2]/table/tbody/tr[2]/td/input[2] +# +# +#pass.word.change.link=Change My Password +#pass.word.current.name=currentPassword +#pass.word.new.name=newPassword +#pass.word.check.name=checkPassword +#pass.word.change.save.xpath=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/form/table/tbody/tr[2]/td/input +#password.change.dialog.xpath=/html/body/div[3]/div/div/a +# +# +# +#features.add.link=Features +#repository.add.tab.text=Repository Management +#repositories.table.id=_table_manage_repositories +#repository.add.link.text=Add Repository +#repository.url.name=_txt_repository_location_url +#repository.save.id=_btn_add_repository +#repository.name.id=_txt_repository_name +#installed.features.tab.linkText=Installed Features +#repositories.dashboard.text=middle +#features.filter.id=_txt_IF_filterString +#feature.checkbox.click.name=chkSelectFeaturesToUninstall +#feature.uninstall.next.button.id=_btn_next_review_uninstall_features +#feature.uninstall.finish.button.id=_btn_uc_finish +# +# +# +#server.shutdown.link.text=Shutdown/Restart +#feature.revert.tab=Installation History +#feature.find.feature.text=Available Features +#feature.install.name.id=_txt_AF_filterString +#feature.find.id=_btn_next_filter_repositories +#feature.install.click=chkSelectFeaturesToInstall +#feature.install.accept.button=_radio_af_accept_licenses +# +# +#key.store.add.link=KeyStores +#key.store.dashboard.middle.text=middle +#key.store.add.new.link.text=Add New KeyStore +#key.store.file.path.id=keystoreFile +#key.store.password.name=ksPassword +#key.store.provider.name=provider +#key.store.next.button=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/form/table/tbody/tr[2]/td/input +#key.store.pass.key=keyPass +#key.store.successful.xpath=/html/body/div[3]/div/div/a +# +# +#logging.add.link=Logging +#logging.dashboard.middle.text=middle +#logging.update.button.id=globalLog4jUpdate +#log4j.appender.update.id=appenderUpdate +#log4j.global.success.xpath=/html/body/div[3]/div[2]/button +#log4j.appender.sucess.xpath=/html/body/div[4]/div[2]/button +# +# +#log4j.logger.search.id=filterText +#log4j.logger.successful.button.xpath=/html/body/div[3]/div/div/a +# +# +#notification.adding.link=Notifications +#notification.dashboard.middle.text=middle +#notification.add.edit.link.text=Add Subscription to Resource/Collection +#notification.add.email.id=subscriptionInput +# +#registry.subscription.middle.text=middle +#registry.subscription.path.id=subscriptionPath +#registry.subscription.event.id=eventList +#registry.subscription.notification.id=notificationMethodList +#registry.subscription.email.id=subscriptionInput +#registry.subscription.digest.id=subscriptionDigestTypeInput +#registry.subscription.hsmethod.id=hierarchicalSubscriptionList +#registry.subscription.subscribe.button.id=subscribeButton +# +# +#uri.configure.add.link=URIs +#uri.configure.dashboard.middle.text=middle +# +# +# +#api.configure.add.link=APIs +#api.configure.dashboard.middle.text=middle +# +#service.configure.add.link=Services +#service.configure.dashboard.middle.text=middle +# +#server.role.add.link=Server Roles +#server.role.dashboard.middle.text=middle +#server.role.add.link.text=Add New Server Role +#server.role.name.id=_serverRoleName +# +# +#add.new.tenant.link.text=Add New Tenant +#tenant.role.dashboard.middle.text=middle +#tenant.domain=domain +#tenant.first.name=admin-firstname +#tenant.last.name=admin-lastname +#tenant.admin.user.name=admin +#tenant.admin.password=admin-password +#tenant.admin.password.repeat=admin-password-repeat +#tenant.admin.email.id=admin-email +#add.new.tenant.success.button=/html/body/div[3]/div/div/a +#view.tenant.link=View Tenants +# +# +# +#add.new.extension.dashboard.middle.text=middle +#extension.tab.id=menu-panel-button5 +#extension.list.page.dashboard.middle.text=middle +#extensions.add.link=Add +#extension.add.text.box=uResourceFile +# +#life.cycle.tab.id=menu-panel-button5 +#life.cycle.add.link=Lifecycles +#add.new.lifecycle.dashboard.middle.text=middle +#add.new.lifecycle.link.text=Add New Lifecycle +#add.new.lifecycle.text.area=//*[@id="textarea"] +#add.new.lifecycle.save.css=input.button.registryWriteOperation +#resource.lifecycle.minimized=//*[@id="lifecycleIconMinimized"] +#resource.lifecycle.add=//*[@id="lifecycleExpanded"]/div[2]/a +#resource.lifecycle.add.select=//*[@id="aspect"] +#resource.lifecycle.add.select.id=aspect +#resource.lifecycle.add.button.add=//*[@id="add-lifecycle-div"]/form/table/tbody/tr[2]/td/input[1] +#resource.lifecycle.add.button.cancel=//*[@id="add-lifecycle-div"]/form/table/tbody/tr[2]/td/input[2] +# +# +# +#artifact.add.tab.id=menu-panel-button5 +#artifacts.add.link=Artifact Types +#add.new.artifact.dashboard.middle.text=middle +#add.new.artifact.type.link=Add new Artifact +#add.new.artifact.text.area=textarea +#add.new.artifact.save.xpath=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/form/table/tbody/tr[2]/td/input +# +#add.new.artifact.dialog.box=button[type="button"] +# +# +# +#handler.add.tab.id=menu-panel-button5 +#handler.add.link=Handlers +#add.new.handler.dashboard.middle.text=middle +#add.new.handler.link.text=Add New Handler +#add.new.handler.text.area=textarea +#add.new.handler.save.xpath=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/form/table/tbody/tr[2]/td/input +#add.new.handler.dialog.box=button[type="button"] +#configure.tab.id=menu-panel-button3 +# +# +# +#manage.report.page.link=Reports +#manage.report.list.dashboard.middle.text=middle +#add.report.list.dashboard.middle.text=middle +#add.report.name=reportName +#add.report.template=reportTemplate +#add.report.type=reportType +#add.report.class=reportClass +#report.add.link=Add Report +# +#life.cycle.expand.id=lifecycleIconMinimized +#life.cycle.add=Add Lifecycle +#life.cycle.add.option=option0 +#life.cycle.add.option1=option1 +#life.cycle.add.option2=option2 +#life.cycle.promote=Promote +#life.cycle.publish=Publish +#life.cycle.stage=/html/body/table/tbody/tr[2]/td[3]/table/tbody/tr[2]/td/div/div/table/tbody/tr/td[4]/div[14]/div[3]/div[2]/table/tbody/tr/td/div[2]/table/tbody/tr[2]/td +#life.cycle.promote.ok.button=button[type="\button\"] +# +#webapp.list.xpath=.//*[@id='menu']/ul/li[7]/ul/li[2]/ul/li[1]/a +# +#webapp.list.page.middle=middle +#webapp.add.xpath=//*[@id="menu"]/ul/li[5]/ul/li[2]/ul/li[3]/ul/li[1]/a +#webapp.add.page.middle=middle +# +#endpoints.tab.id=//*[@id="menu"]/ul/li[5]/ul/li[4]/ul/li[4]/a +#endpoints.page.middle=middle +# +# +#bam.dashboard.tab.id=//*[@id="menu"]/ul/li[3]/ul/li/a +#bam.dashboard.signin.xpath=//*[@id="wrap"]/div[2]/div/div/h1 diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/TestAdminFunctions.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/TestAdminFunctions.java index 599936de..95c0c301 100644 --- a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/TestAdminFunctions.java +++ b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/TestAdminFunctions.java @@ -30,10 +30,9 @@ import org.wso2.iot.integration.ui.pages.uesr.AddUserPage; import org.wso2.iot.integration.ui.pages.uesr.UserListingPage; /** - * Test for checking admin capabilities. + * Test for check following admin capabilities. * - Create a new User * - Delete a user - * -- and more */ public class TestAdminFunctions extends IOTIntegrationUIBaseTestCase {