You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2016/06/11 21:12:36 UTC
svn commit: r1747934 - in
/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui:
./ bots/
Author: seelmann
Date: Sat Jun 11 21:12:36 2016
New Revision: 1747934
URL: http://svn.apache.org/viewvc?rev=1747934&view=rev
Log:
Add test for DIRSTUDIO-1026
Added:
directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SchemaEditorSearchTest.java (with props)
directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewSchemaProjectWizardBot.java (with props)
directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SchemaProjectsViewBot.java (with props)
directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SchemaSearchViewBot.java (with props)
Modified:
directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/StudioBot.java
Added: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SchemaEditorSearchTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SchemaEditorSearchTest.java?rev=1747934&view=auto
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SchemaEditorSearchTest.java (added)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SchemaEditorSearchTest.java Sat Jun 11 21:12:36 2016
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF 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.apache.directory.studio.test.integration.ui;
+
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.util.List;
+
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.studio.test.integration.ui.bots.NewSchemaProjectWizardBot;
+import org.apache.directory.studio.test.integration.ui.bots.SchemaProjectsViewBot;
+import org.apache.directory.studio.test.integration.ui.bots.SchemaSearchViewBot;
+import org.apache.directory.studio.test.integration.ui.bots.StudioBot;
+import org.apache.directory.studio.test.integration.ui.bots.utils.FrameworkRunnerWithScreenshotCaptureListener;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+/**
+ * Tests search in the schema editor.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+@RunWith(FrameworkRunnerWithScreenshotCaptureListener.class)
+public class SchemaEditorSearchTest extends AbstractLdapTestUnit
+{
+ private StudioBot studioBot;
+
+
+ @Before
+ public void setUp() throws Exception
+ {
+ studioBot = new StudioBot();
+ studioBot.resetSchemaPerspective();
+ }
+
+
+ /**
+ * DIRSTUDIO-1026: Searching for an AT or an OC using an alternate name does not find it
+ */
+ @Test
+ public void testSearchForAliases() throws Exception
+ {
+ studioBot.resetSchemaPerspective();
+
+ SchemaProjectsViewBot projectsView = studioBot.getSchemaProjectsView();
+ NewSchemaProjectWizardBot wizard = projectsView.openNewSchemaProjectWizard();
+ wizard.typeProjectName( "Project A" );
+ wizard.clickNextButton();
+ wizard.selectAllSchemas();
+ wizard.clickFinishButton();
+
+ SchemaSearchViewBot searchView = studioBot.getSchemaSearchView();
+
+ searchView.search( "cn" );
+ List<String> results = searchView.getResults();
+ assertThat( results.size(), equalTo( 1 ) );
+ assertThat( results.get( 0 ), containsString( "cn, commonName [2.5.4.3]" ) );
+
+ searchView.search( "doest not exist" );
+ results = searchView.getResults();
+ assertThat( results.size(), equalTo( 0 ) );
+
+ searchView.search( "cOmmOnnAmE" );
+ results = searchView.getResults();
+ assertThat( results.size(), equalTo( 1 ) );
+ assertThat( results.get( 0 ), containsString( "cn, commonName [2.5.4.3]" ) );
+
+ searchView.search( "doest not exist" );
+ results = searchView.getResults();
+ assertThat( results.size(), equalTo( 0 ) );
+
+ searchView.search( "2.5.4.3" );
+ results = searchView.getResults();
+ assertThat( results.size(), equalTo( 1 ) );
+ assertThat( results.get( 0 ), containsString( "cn, commonName [2.5.4.3]" ) );
+ }
+
+}
Propchange: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SchemaEditorSearchTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewSchemaProjectWizardBot.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewSchemaProjectWizardBot.java?rev=1747934&view=auto
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewSchemaProjectWizardBot.java (added)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewSchemaProjectWizardBot.java Sat Jun 11 21:12:36 2016
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF 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.apache.directory.studio.test.integration.ui.bots;
+
+
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
+
+
+public class NewSchemaProjectWizardBot extends WizardBot
+{
+
+ public NewSchemaProjectWizardBot()
+ {
+ super( "" );
+ }
+
+
+ public void typeProjectName( String projectName )
+ {
+ SWTBotText text = bot.textWithLabel( "Project name:" );
+ text.setText( projectName );
+ }
+
+
+ public void selectAllSchemas()
+ {
+ clickButton( "Select All" );
+ }
+
+}
Propchange: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewSchemaProjectWizardBot.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SchemaProjectsViewBot.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SchemaProjectsViewBot.java?rev=1747934&view=auto
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SchemaProjectsViewBot.java (added)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SchemaProjectsViewBot.java Sat Jun 11 21:12:36 2016
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF 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.apache.directory.studio.test.integration.ui.bots;
+
+
+import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
+
+
+public class SchemaProjectsViewBot
+{
+ private SWTWorkbenchBot bot = new SWTWorkbenchBot();
+
+
+ public NewSchemaProjectWizardBot openNewSchemaProjectWizard()
+ {
+ SWTBotView view = bot.viewByTitle( "Projects" );
+ view.toolbarButton( "New Schema Project" ).click();
+ return new NewSchemaProjectWizardBot();
+ }
+
+}
Propchange: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SchemaProjectsViewBot.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SchemaSearchViewBot.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SchemaSearchViewBot.java?rev=1747934&view=auto
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SchemaSearchViewBot.java (added)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SchemaSearchViewBot.java Sat Jun 11 21:12:36 2016
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF 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.apache.directory.studio.test.integration.ui.bots;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
+import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarToggleButton;
+
+
+public class SchemaSearchViewBot
+{
+ private SWTBotView view;
+
+
+ public SchemaSearchViewBot()
+ {
+ view = new SWTWorkbenchBot().viewByTitle( "Search" );
+ }
+
+
+ public void search( String text )
+ {
+ view.show();
+ SWTBotToolbarToggleButton button = view.toolbarToggleButton( "Show Search Field" );
+ button.select();
+ view.bot().text().setText( text );
+ view.bot().text().pressShortcut( Keystrokes.LF );
+ }
+
+
+ public List<String> getResults()
+ {
+ List<String> results = new ArrayList<String>();
+ SWTBotTable table = view.bot().table();
+ for ( int i = 0; i < table.rowCount(); i++ )
+ {
+ String text = table.getTableItem( i ).getText();
+ results.add( text );
+ }
+ return results;
+ }
+
+}
Propchange: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SchemaSearchViewBot.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/StudioBot.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/StudioBot.java?rev=1747934&r1=1747933&r2=1747934&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/StudioBot.java (original)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/StudioBot.java Sat Jun 11 21:12:36 2016
@@ -94,6 +94,18 @@ public class StudioBot
}
+ public SchemaProjectsViewBot getSchemaProjectsView()
+ {
+ return new SchemaProjectsViewBot();
+ }
+
+
+ public SchemaSearchViewBot getSchemaSearchView()
+ {
+ return new SchemaSearchViewBot();
+ }
+
+
public void resetLdapPerspective()
{
resetPerspective( "org.apache.directory.studio.ldapbrowser.ui.perspective.BrowserPerspective" );