SWE-2 / SP-263: Property type creation, page objects packaging more fine-grained.

SVN: 26528

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TopMenu.java

@@ -51,6 +51,7 @@ public class TopMenu extends LayoutContainer
     {
         ADMINISTRATION_MENU_MANAGE_GROUPS,
         ADMINISTRATION_MENU_MANAGE_TYPES,
+        ADMINISTRATION_MENU_MANAGE_PROPERTY_TYPES,
         ADMINISTRATION_MENU_MANAGE_AUTHORIZATION,
 
         AUTHORIZATION_MENU_USERS, AUTHORIZATION_MENU_ROLES,

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/PropertyTypesMenu.java

@@ -36,6 +36,7 @@ public class PropertyTypesMenu extends MenuItem
     public PropertyTypesMenu(IMessageProvider messageProvider, ComponentProvider componentProvider)
     {
         super(messageProvider.getMessage(Dict.MENU_PROPERTY_TYPES));
+        setId(TopMenu.ActionMenuKind.ADMINISTRATION_MENU_MANAGE_PROPERTY_TYPES.toString());
 
         Menu menu = new Menu();
         menu.add(new ActionMenu(TopMenu.ActionMenuKind.PROPERTY_TYPES_MENU_BROWSE_PROPERTY_TYPES,

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/AuthorizationTest.java

@@ -7,9 +7,9 @@ import org.testng.annotations.Test;
 import ch.systemsx.cisd.openbis.uitest.infra.SeleniumTest;
 import ch.systemsx.cisd.openbis.uitest.infra.User;
 import ch.systemsx.cisd.openbis.uitest.page.HomePage;
-import ch.systemsx.cisd.openbis.uitest.page.InvalidPasswordDialog;
 import ch.systemsx.cisd.openbis.uitest.page.LoginPage;
-import ch.systemsx.cisd.openbis.uitest.page.RoleAssignmentBrowser;
+import ch.systemsx.cisd.openbis.uitest.page.dialog.InvalidPasswordDialog;
+import ch.systemsx.cisd.openbis.uitest.page.tab.RoleAssignmentBrowser;
 
 @Test(groups =
     { "no-login" })

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/PropertyTypeTest.java

+/*
+ * 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.uitest;
+
+import org.testng.annotations.Test;
+
+import ch.systemsx.cisd.openbis.uitest.infra.SeleniumTest;
+import ch.systemsx.cisd.openbis.uitest.type.PropertyType;
+
+/**
+ * @author anttil
+ */
+@Test(groups =
+    { "login-admin" })
+public class PropertyTypeTest extends SeleniumTest
+{
+    @Test
+    public void newPropertyTypeIsListedInPropertyTypeBrowser() throws Exception
+    {
+
+        PropertyType propertyType = new PropertyType();
+
+        openbis.create(propertyType);
+
+        /*
+        assertThat(PropertyTypeBrowser.class, listsPropertyType(propertyType));
+        */
+    }
+}

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/SampleTypeTest.java

@@ -20,11 +20,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.testng.annotations.Test;
 
-import ch.systemsx.cisd.openbis.uitest.infra.SampleType;
 import ch.systemsx.cisd.openbis.uitest.infra.SeleniumTest;
-import ch.systemsx.cisd.openbis.uitest.page.AddSampleTypeDialog;
-import ch.systemsx.cisd.openbis.uitest.page.SampleBrowser;
-import ch.systemsx.cisd.openbis.uitest.page.SampleTypeBrowser;
+import ch.systemsx.cisd.openbis.uitest.page.dialog.AddSampleTypeDialog;
+import ch.systemsx.cisd.openbis.uitest.page.tab.SampleBrowser;
+import ch.systemsx.cisd.openbis.uitest.page.tab.SampleTypeBrowser;
+import ch.systemsx.cisd.openbis.uitest.type.SampleType;
 
 /**
  * @author anttil

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/SpaceTest.java

@@ -5,8 +5,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.openbis.uitest.infra.SeleniumTest;
-import ch.systemsx.cisd.openbis.uitest.infra.Space;
-import ch.systemsx.cisd.openbis.uitest.page.SpaceBrowser;
+import ch.systemsx.cisd.openbis.uitest.page.tab.SpaceBrowser;
+import ch.systemsx.cisd.openbis.uitest.type.Space;
 
 @Test(groups =
     { "login-admin" })

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/VocabularyTest.java

@@ -5,8 +5,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.openbis.uitest.infra.SeleniumTest;
-import ch.systemsx.cisd.openbis.uitest.infra.Vocabulary;
-import ch.systemsx.cisd.openbis.uitest.page.VocabularyBrowser;
+import ch.systemsx.cisd.openbis.uitest.page.tab.VocabularyBrowser;
+import ch.systemsx.cisd.openbis.uitest.type.Vocabulary;
 
 @Test(groups =
     { "login-admin" })

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/infra/ApplicationRunner.java

@@ -16,17 +16,22 @@
 
 package ch.systemsx.cisd.openbis.uitest.infra;
 
-import ch.systemsx.cisd.openbis.uitest.page.AddSampleTypeDialog;
-import ch.systemsx.cisd.openbis.uitest.page.AddSpaceDialog;
-import ch.systemsx.cisd.openbis.uitest.page.AddVocabularyDialog;
-import ch.systemsx.cisd.openbis.uitest.page.EditSampleTypeDialog;
 import ch.systemsx.cisd.openbis.uitest.page.LoginPage;
 import ch.systemsx.cisd.openbis.uitest.page.PrivatePage;
-import ch.systemsx.cisd.openbis.uitest.page.RoleAssignmentBrowser;
-import ch.systemsx.cisd.openbis.uitest.page.SampleBrowser;
-import ch.systemsx.cisd.openbis.uitest.page.SampleTypeBrowser;
-import ch.systemsx.cisd.openbis.uitest.page.SpaceBrowser;
-import ch.systemsx.cisd.openbis.uitest.page.VocabularyBrowser;
+import ch.systemsx.cisd.openbis.uitest.page.dialog.AddSampleTypeDialog;
+import ch.systemsx.cisd.openbis.uitest.page.dialog.AddSpaceDialog;
+import ch.systemsx.cisd.openbis.uitest.page.dialog.AddVocabularyDialog;
+import ch.systemsx.cisd.openbis.uitest.page.dialog.EditSampleTypeDialog;
+import ch.systemsx.cisd.openbis.uitest.page.tab.AddPropertyType;
+import ch.systemsx.cisd.openbis.uitest.page.tab.RoleAssignmentBrowser;
+import ch.systemsx.cisd.openbis.uitest.page.tab.SampleBrowser;
+import ch.systemsx.cisd.openbis.uitest.page.tab.SampleTypeBrowser;
+import ch.systemsx.cisd.openbis.uitest.page.tab.SpaceBrowser;
+import ch.systemsx.cisd.openbis.uitest.page.tab.VocabularyBrowser;
+import ch.systemsx.cisd.openbis.uitest.type.PropertyType;
+import ch.systemsx.cisd.openbis.uitest.type.SampleType;
+import ch.systemsx.cisd.openbis.uitest.type.Space;
+import ch.systemsx.cisd.openbis.uitest.type.Vocabulary;
 
 /**
  * @author anttil
@@ -62,6 +67,13 @@ public class ApplicationRunner
         dialog.save();
     }
 
+    public void create(PropertyType propertyType)
+    {
+        AddPropertyType dialog = browseToAddPropertyType();
+        dialog.fillWith(propertyType);
+        dialog.save();
+    }
+
     public void update(SampleType sampleType)
     {
         SampleTypeBrowser sampleTypeBrowser = browseToSampleTypeBrowser();
@@ -127,6 +139,11 @@ public class ApplicationRunner
         return browseToVocabularyBrowser().add();
     }
 
+    public AddPropertyType browseToAddPropertyType()
+    {
+        return getMenus().admin().metadata().newPropertyType();
+    }
+
     public void closeAllTabs()
     {
         getMenus().closeTabs();

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/infra/SeleniumTest.java

@@ -43,7 +43,8 @@ import org.testng.annotations.BeforeSuite;
 
 import ch.systemsx.cisd.openbis.uitest.page.BrowserPage;
 import ch.systemsx.cisd.openbis.uitest.page.Page;
-import ch.systemsx.cisd.openbis.uitest.page.SampleBrowser;
+import ch.systemsx.cisd.openbis.uitest.page.tab.SampleBrowser;
+import ch.systemsx.cisd.openbis.uitest.type.SampleType;
 
 public abstract class SeleniumTest
 {
@@ -58,12 +59,12 @@ public abstract class SeleniumTest
     @BeforeSuite
     public void initWebDriver()
     {
-        /*
+
         System.setProperty("webdriver.firefox.bin",
                 "/Users/anttil/Desktop/Firefox 10.app/Contents/MacOS/firefox");
 
         System.setProperty("webdriver.firefox.profile", "default");
-        */
+
         driver = new FirefoxDriver();
         driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
         delete(new File("targets/dist"));

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/Page.java

@@ -22,6 +22,7 @@ import static org.hamcrest.Matchers.notNullValue;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 
 import org.openqa.selenium.By;
@@ -103,4 +104,20 @@ public abstract class Page
 
         new WebDriverWait(SeleniumTest.driver, 10).until(condition);
     }
+
+    protected void select(Collection<? extends WebElement> choices, String text)
+    {
+        Collection<String> found = new HashSet<String>();
+        for (WebElement choice : choices)
+        {
+            if (choice.getText().equals(text))
+            {
+                choice.click();
+                return;
+            }
+            found.add(choice.getText());
+        }
+        throw new IllegalArgumentException("Selection " + text + " not found");
+
+    }
 }

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/PrivatePage.java

@@ -21,6 +21,10 @@ import java.util.List;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
+import ch.systemsx.cisd.openbis.uitest.page.menu.AdminMenu;
+import ch.systemsx.cisd.openbis.uitest.page.menu.BrowseMenu;
+import ch.systemsx.cisd.openbis.uitest.page.menu.UserMenu;
+
 /**
  * @author anttil
  */

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/AddSampleDialog.java → ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/dialog/AddSampleDialog.java

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.uitest.page;
+package ch.systemsx.cisd.openbis.uitest.page.dialog;
+
+import ch.systemsx.cisd.openbis.uitest.page.Page;
 
 
 public class AddSampleDialog extends Page

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/AddSampleTypeDialog.java → ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/dialog/AddSampleTypeDialog.java

@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.uitest.page;
+package ch.systemsx.cisd.openbis.uitest.page.dialog;
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.FindBys;
 
-import ch.systemsx.cisd.openbis.uitest.infra.SampleType;
+import ch.systemsx.cisd.openbis.uitest.page.Page;
+import ch.systemsx.cisd.openbis.uitest.page.tab.SampleTypeBrowser;
+import ch.systemsx.cisd.openbis.uitest.type.SampleType;
 
 public class AddSampleTypeDialog extends Page
 {

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/AddSpaceDialog.java → ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/dialog/AddSpaceDialog.java

@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.uitest.page;
+package ch.systemsx.cisd.openbis.uitest.page.dialog;
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
-import ch.systemsx.cisd.openbis.uitest.infra.Space;
+import ch.systemsx.cisd.openbis.uitest.page.Page;
+import ch.systemsx.cisd.openbis.uitest.page.tab.SpaceBrowser;
+import ch.systemsx.cisd.openbis.uitest.type.Space;
 
 public class AddSpaceDialog extends Page
 {

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/AddVocabularyDialog.java → ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/dialog/AddVocabularyDialog.java

@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.uitest.page;
+package ch.systemsx.cisd.openbis.uitest.page.dialog;
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
-import ch.systemsx.cisd.openbis.uitest.infra.Vocabulary;
+import ch.systemsx.cisd.openbis.uitest.page.Page;
+import ch.systemsx.cisd.openbis.uitest.page.tab.VocabularyBrowser;
+import ch.systemsx.cisd.openbis.uitest.type.Vocabulary;
 
 public class AddVocabularyDialog extends Page
 {

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/EditSampleTypeDialog.java → ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/dialog/EditSampleTypeDialog.java

@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.uitest.page;
+package ch.systemsx.cisd.openbis.uitest.page.dialog;
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.FindBys;
 
-import ch.systemsx.cisd.openbis.uitest.infra.SampleType;
+import ch.systemsx.cisd.openbis.uitest.page.Page;
+import ch.systemsx.cisd.openbis.uitest.page.tab.SampleTypeBrowser;
+import ch.systemsx.cisd.openbis.uitest.type.SampleType;
 
 public class EditSampleTypeDialog extends Page
 {

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/InvalidPasswordDialog.java → ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/dialog/InvalidPasswordDialog.java

@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.uitest.page;
+package ch.systemsx.cisd.openbis.uitest.page.dialog;
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
+import ch.systemsx.cisd.openbis.uitest.page.LoginPage;
+import ch.systemsx.cisd.openbis.uitest.page.Page;
+
 public class InvalidPasswordDialog extends Page
 {
 

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/AdminMenu.java → ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/menu/AdminMenu.java

@@ -14,13 +14,17 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.uitest.page;
+package ch.systemsx.cisd.openbis.uitest.page.menu;
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.support.FindBy;
 
 import ch.systemsx.cisd.openbis.uitest.infra.SeleniumTest;
+import ch.systemsx.cisd.openbis.uitest.page.PrivatePage;
+import ch.systemsx.cisd.openbis.uitest.page.tab.SampleTypeBrowser;
+import ch.systemsx.cisd.openbis.uitest.page.tab.SpaceBrowser;
+import ch.systemsx.cisd.openbis.uitest.page.tab.VocabularyBrowser;
 
 public class AdminMenu extends PrivatePage
 {
@@ -34,6 +38,9 @@ public class AdminMenu extends PrivatePage
     @FindBy(id = "ADMINISTRATION_MENU_MANAGE_TYPES")
     private WebElement types;
 
+    @FindBy(id = "ADMINISTRATION_MENU_MANAGE_PROPERTY_TYPES")
+    private WebElement metadata;
+
     @FindBy(id = "openbis_top-menu_SAMPLE_MENU_TYPES")
     private WebElement sampleTypes;
 
@@ -59,6 +66,13 @@ public class AdminMenu extends PrivatePage
         return get(AdminMenu.class);
     }
 
+    public MetadataMenu metadata()
+    {
+        Actions builder = new Actions(SeleniumTest.driver);
+        builder.moveToElement(metadata).build().perform();
+        return get(MetadataMenu.class);
+    }
+
     public SampleTypeBrowser sampleTypes()
     {
         sampleTypes.click();

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/AuthorizationMenu.java → ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/menu/AuthorizationMenu.java

@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.uitest.page;
+package ch.systemsx.cisd.openbis.uitest.page.menu;
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
+import ch.systemsx.cisd.openbis.uitest.page.PrivatePage;
+import ch.systemsx.cisd.openbis.uitest.page.tab.RoleAssignmentBrowser;
+
 public class AuthorizationMenu extends PrivatePage
 {
 

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/BrowseMenu.java → ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/menu/BrowseMenu.java

@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.uitest.page;
+package ch.systemsx.cisd.openbis.uitest.page.menu;
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
+import ch.systemsx.cisd.openbis.uitest.page.PrivatePage;
+import ch.systemsx.cisd.openbis.uitest.page.tab.SampleBrowser;
+
 public class BrowseMenu extends PrivatePage
 {