diff --git a/js-test/source/java/ch/systemsx/cisd/openbis/jstest/layout/OpenbisScreeningJsWebappLocation.java b/js-test/source/java/ch/systemsx/cisd/openbis/jstest/layout/OpenbisScreeningJsWebappLocation.java deleted file mode 100644 index 54a0114cc77b3572890a962378143114758441e7..0000000000000000000000000000000000000000 --- a/js-test/source/java/ch/systemsx/cisd/openbis/jstest/layout/OpenbisScreeningJsWebappLocation.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2012 ETH Zuerich, CISD - * - * Licensed 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 ch.systemsx.cisd.openbis.jstest.layout; - -import org.openqa.selenium.By; -import org.openqa.selenium.WebElement; - -import ch.systemsx.cisd.openbis.jstest.page.OpenbisJsCommonWebapp; -import ch.systemsx.cisd.openbis.uitest.dsl.SeleniumTest; -import ch.systemsx.cisd.openbis.uitest.layout.Location; -import ch.systemsx.cisd.openbis.uitest.menu.TopBar; -import ch.systemsx.cisd.openbis.uitest.menu.UtilitiesMenu; -import ch.systemsx.cisd.openbis.uitest.webdriver.Pages; - -/** - * @author pkupczyk - */ -public class OpenbisScreeningJsWebappLocation implements Location<OpenbisJsCommonWebapp> -{ - - @Override - public void moveTo(Pages pages) - { - pages.load(TopBar.class).utilitiesMenu(); - pages.load(UtilitiesMenu.class).openbisScreeningJsWebapp(); - } - - @Override - public String getTabName() - { - return "openbis-screening-test.js"; - } - - @Override - public Class<OpenbisJsCommonWebapp> getPage() - { - WebElement tabElement = SeleniumTest.driver.findElement(By.id("openbis_webapp_openbis-screening-test_tab")); - WebElement iframeElement = tabElement.findElement(By.tagName("iframe")); - SeleniumTest.driver.switchTo().frame(iframeElement); - return OpenbisJsCommonWebapp.class; - } -} \ No newline at end of file diff --git a/js-test/source/java/ch/systemsx/cisd/openbis/jstest/suite/common/JsTestCommonSelenium.java b/js-test/source/java/ch/systemsx/cisd/openbis/jstest/suite/common/JsTestCommonSelenium.java index 66feea888d3fc1944a8092e9e3554265ea4c5bd5..2d8e6cdbce455d04f29df000e752cf8bf756adf5 100644 --- a/js-test/source/java/ch/systemsx/cisd/openbis/jstest/suite/common/JsTestCommonSelenium.java +++ b/js-test/source/java/ch/systemsx/cisd/openbis/jstest/suite/common/JsTestCommonSelenium.java @@ -18,8 +18,6 @@ package ch.systemsx.cisd.openbis.jstest.suite.common; import java.io.File; -import junit.framework.Assert; - import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; @@ -27,11 +25,11 @@ import org.testng.annotations.Test; import ch.systemsx.cisd.base.unix.Unix; import ch.systemsx.cisd.common.filesystem.FileUtilities; import ch.systemsx.cisd.openbis.jstest.layout.OpenbisJsWebappLocation; -import ch.systemsx.cisd.openbis.jstest.layout.OpenbisScreeningJsWebappLocation; import ch.systemsx.cisd.openbis.jstest.layout.OpenbisV3JsWebappLocation; import ch.systemsx.cisd.openbis.jstest.page.OpenbisJsCommonWebapp; import ch.systemsx.cisd.openbis.uitest.dsl.SeleniumTest; import ch.systemsx.cisd.openbis.uitest.layout.Location; +import junit.framework.Assert; /** * @author pkupczyk @@ -118,12 +116,6 @@ public class JsTestCommonSelenium extends SeleniumTest runTests("runOpenbisJsTests", new OpenbisJsWebappLocation()); } - @Test - public void runOpenbisScreeningJsTests() - { - runTests("runOpenbisScreeningJsTests", new OpenbisScreeningJsWebappLocation()); - } - @Test public void runOpenbisV3JsTests() {