fixed tests on kepler/windows + search feature included in update site
diff --git a/development/org.eclipse.wst.sse.sieditor.repository/site.xml b/development/org.eclipse.wst.sse.sieditor.repository/site.xml
index 1d87894..68d9fde 100644
--- a/development/org.eclipse.wst.sse.sieditor.repository/site.xml
+++ b/development/org.eclipse.wst.sse.sieditor.repository/site.xml
@@ -3,5 +3,9 @@
<feature url="features/org.eclipse.wst.sse.sieditor.feature_1.0.0.qualifier.jar" id="org.eclipse.wst.sse.sieditor.feature" version="1.0.0.qualifier">
<category name="sieditor_feature_required"/>
</feature>
+ <feature url="features/org.eclipse.wst.sse.sieditor.search.feature_1.0.0.qualifier.jar" id="org.eclipse.wst.sse.sieditor.search.feature" version="1.0.0.qualifier">
+ <category name="sieditor_additional_features"/>
+ </feature>
<category-def name="sieditor_feature_required" label="Service Interface and Data Types Editors (Incbuator)"/>
+ <category-def name="sieditor_additional_features" label="Service Interface and Data Types Editors Additional Features (Incbuator)"/>
</site>
diff --git a/plugins/org.eclipse.wst.sse.sieditor.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.sse.sieditor.test/META-INF/MANIFEST.MF
index a21fee4..3192419 100644
--- a/plugins/org.eclipse.wst.sse.sieditor.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.sse.sieditor.test/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@
org.eclipse.wst.sse.sieditor.ui;bundle-version="1.0.0",
org.eclipse.ui;bundle-version="3.4.1",
org.eclipse.wst.wsdl,
- org.junit4,
+ org.junit,
org.eclipse.ui.views.properties.tabbed,
org.eclipse.ui.ide;bundle-version="3.5.0",
org.eclipse.emf.workspace;bundle-version="1.3.0",
diff --git a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/all/UITestsSuite.java b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/all/UITestsSuite.java
index c41dd54..c7fcdf2 100644
--- a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/all/UITestsSuite.java
+++ b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/all/UITestsSuite.java
@@ -18,7 +18,6 @@
import org.eclipse.wst.sse.sieditor.test.model.commands.TestUndoRedoInSourceAndEMF;
import org.eclipse.wst.sse.sieditor.test.ui.PageChangedListenersManagerTest;
import org.eclipse.wst.sse.sieditor.test.ui.TestAbstractDetailsPage;
-import org.eclipse.wst.sse.sieditor.test.ui.TestServiceInterfaceEditor;
import org.eclipse.wst.sse.sieditor.test.ui.preferences.TestServiceInterfaceEditorPreferencePage;
import org.eclipse.wst.sse.sieditor.test.ui.readonly.CommonDocumentationSectionReadOnlyTest;
import org.eclipse.wst.sse.sieditor.test.ui.readonly.ElementNodeDetailsControllerReadOnlyTest;
@@ -31,6 +30,7 @@
import org.eclipse.wst.sse.sieditor.test.ui.v2.common.TestSetSelectionInSIPageFromSourcePageWithSIE;
import org.eclipse.wst.sse.sieditor.test.ui.v2.common.TestSetSelectionInSourceWithDataTypesEditor;
import org.eclipse.wst.sse.sieditor.test.ui.v2.common.TestSetSelectionInSourceWithSIEditor;
+import org.eclipse.wst.sse.sieditor.test.ui.v2.common.TestSetSelectionInSourceWithSIEditorDatatypesPage;
import org.eclipse.wst.sse.sieditor.test.ui.v2.common.TestTypePropertyEditorHyperLinkSelection;
import org.eclipse.wst.sse.sieditor.test.ui.v2.common.TestTypeSearchDialog;
import org.eclipse.wst.sse.sieditor.test.ui.v2.common.propertyEditor.ElementTypeEditorTest;
@@ -61,7 +61,6 @@
import org.eclipse.wst.sse.sieditor.test.ui.v2.dt.TestTypeNullNameAttribute;
import org.eclipse.wst.sse.sieditor.test.ui.v2.dt.clipboard.ClipboardServiceTest;
import org.eclipse.wst.sse.sieditor.test.ui.v2.dt.dnd.SiEditorTransferTest;
-import org.eclipse.wst.sse.sieditor.test.ui.v2.dt.dnd.TreeViewerDropAdapterTest;
import org.eclipse.wst.sse.sieditor.test.ui.v2.dt.extract.ExtractNamespaceWizardTest;
import org.eclipse.wst.sse.sieditor.test.ui.v2.dt.extract.ExtractSchemaTextFieldModifyListenerTest;
import org.eclipse.wst.sse.sieditor.test.ui.v2.dt.nodes.impl.ElementNodeTest;
@@ -271,12 +270,12 @@
TestIsEditorActivationInTreeViewerEditorActivationStrategy.class,
ElementDetailsSectionRefreshFromRefToNonRefReLayoutTest.class,
TestSIEActionEnablementForSelectionManager.class,
- TestServiceInterfaceEditor.class,
EditorTitleMessagesManagerTest.class,
TestIsSetEditValidatorWhenCreateModel.class,
TestDisposableInstances.class,
TestSetSelectionInSourceWithDataTypesEditor.class,
TestSetSelectionInSourceWithSIEditor.class,
+ TestSetSelectionInSourceWithSIEditorDatatypesPage.class,
ExtractNamespaceWizardTest.class,
ExtractSchemaTextFieldModifyListenerTest.class,
TestSetSelectionInDTPageFromSourcePageWithDTE.class,
@@ -284,7 +283,6 @@
TestTypePropertyEditorHyperLinkSelection.class,
PageChangedListenersManagerTest.class,
SiEditorTransferTest.class,
- TreeViewerDropAdapterTest.class,
ClipboardServiceTest.class,
})
public class UITestsSuite {
diff --git a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/model/ReferencedDocumentsTest.java b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/model/ReferencedDocumentsTest.java
index 8d58317..bf26b76 100644
--- a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/model/ReferencedDocumentsTest.java
+++ b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/model/ReferencedDocumentsTest.java
@@ -18,17 +18,16 @@
import java.util.List;
import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.sse.sieditor.test.util.ResourceUtils;
-import org.eclipse.wst.sse.sieditor.test.util.SIEditorBaseTest;
-import org.junit.Test;
-
import org.eclipse.wst.sse.sieditor.model.wsdl.api.IDescription;
import org.eclipse.wst.sse.sieditor.model.wsdl.api.IOperation;
import org.eclipse.wst.sse.sieditor.model.wsdl.api.IParameter;
import org.eclipse.wst.sse.sieditor.model.wsdl.api.IServiceInterface;
-import org.eclipse.wst.sse.sieditor.model.wsdl.impl.OperationParameter;
import org.eclipse.wst.sse.sieditor.model.xsd.api.ISchema;
import org.eclipse.wst.sse.sieditor.model.xsd.api.IType;
+import org.eclipse.wst.sse.sieditor.test.util.ResourceUtils;
+import org.eclipse.wst.sse.sieditor.test.util.SIEditorBaseTest;
+import org.junit.Before;
+import org.junit.Test;
@SuppressWarnings("nls")
public class ReferencedDocumentsTest extends SIEditorBaseTest {
@@ -37,13 +36,14 @@
return "ReferencedDocumentsTest";
}
- @Test
- public void testGetReferencedDocuments() throws Exception {
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
IFile file = ResourceUtils.copyFileIntoTestProject(Constants.DATA_PUBLIC_SELF_KESHAV + "Imported.wsdl",
Document_FOLDER_NAME, this.getProject(), "Imported.wsdl");
assertTrue(null != file && file.exists());
- file = ResourceUtils.copyFileIntoTestProject(Constants.DATA_PUBLIC_SELF_KESHAV + "po.xsd", Document_FOLDER_NAME, this
- .getProject(), "po.xsd");
+ file = ResourceUtils.copyFileIntoTestProject(Constants.DATA_PUBLIC_SELF_KESHAV + "po.xsd", Document_FOLDER_NAME,
+ this.getProject(), "po.xsd");
assertTrue(null != file && file.exists());
file = ResourceUtils.copyFileIntoTestProject(Constants.DATA_PUBLIC_SELF_KESHAV + "example.xsd", Document_FOLDER_NAME,
this.getProject(), "example.xsd");
@@ -51,6 +51,12 @@
file = ResourceUtils.copyFileIntoTestProject(Constants.DATA_PUBLIC_SELF_KESHAV + "Importing.wsdl", Document_FOLDER_NAME,
this.getProject(), "Importing.wsdl");
assertTrue(null != file && file.exists());
+
+ setDeleteProjectOnTearDown();
+ }
+
+ @Test
+ public void testGetReferencedDocuments() throws Exception {
// check for referenced documents
final IDescription description = getModelRoot("Importing.wsdl");
assertNotNull(description);
@@ -106,10 +112,10 @@
@Test
public void testImportedMessage() throws Exception {
- //copy files used in the test:
- ResourceUtils.copyFileIntoTestProject(Constants.DATA_PUBLIC_SELF_KESHAV+"example.xsd", this.getProject());
+ // copy files used in the test:
+ ResourceUtils.copyFileIntoTestProject(Constants.DATA_PUBLIC_SELF_KESHAV + "example.xsd", this.getProject());
getModelRoot("Imported.wsdl");
-
+
final IDescription description = getModelRoot("Importing.wsdl");
List<IServiceInterface> sIs = description.getInterface("PortTypeWithImportedMessageRef");
assertFalse(sIs.isEmpty());
diff --git a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/model/XSDReferencedDocumentsTest.java b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/model/XSDReferencedDocumentsTest.java
index 268da4b..5b3ade3 100644
--- a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/model/XSDReferencedDocumentsTest.java
+++ b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/model/XSDReferencedDocumentsTest.java
@@ -20,8 +20,8 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.wst.sse.sieditor.test.util.ResourceUtils;
import org.eclipse.wst.sse.sieditor.test.util.SIEditorBaseTest;
+import org.junit.Before;
import org.junit.Test;
-
import org.eclipse.wst.sse.sieditor.model.api.IWsdlModelRoot;
import org.eclipse.wst.sse.sieditor.model.wsdl.api.IDescription;
import org.eclipse.wst.sse.sieditor.model.xsd.api.IElement;
@@ -35,15 +35,10 @@
protected String getProjectName() {
return "XSDReferencedDocumentsTest";
}
-
- @Test
- public void testExternalImportedDocuments() throws Exception {
- /*
- * Check cases for below Schema - Referred schemas SimpleType - baseType
- * - both for global and anonymous types in element and attribute
- * ComplextType - baseType - restriction, extension , Simple Content
- * Element - ref, type Attribute - ref, type
- */
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
IFile file = ResourceUtils.copyFileIntoTestProject(Constants.DATA_PUBLIC_SELF_KESHAV + "po.xsd", Document_FOLDER_NAME,
this.getProject(), "po.xsd");
@@ -55,6 +50,18 @@
this.getProject(), "Included.xsd");
assertTrue(null != file && file.exists());
+ setDeleteProjectOnTearDown();
+ }
+
+ @Test
+ public void testExternalImportedDocuments() throws Exception {
+ /*
+ * Check cases for below Schema - Referred schemas SimpleType - baseType
+ * - both for global and anonymous types in element and attribute
+ * ComplextType - baseType - restriction, extension , Simple Content
+ * Element - ref, type Attribute - ref, type
+ */
+
// check for referenced documents
final IWsdlModelRoot modelRoot = getModelRoot("TypesExternalImporting.wsdl");
final IDescription description = modelRoot.getDescription();
diff --git a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/TestServiceInterfaceEditor.java b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/TestServiceInterfaceEditor.java
deleted file mode 100644
index 09d85d8..0000000
--- a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/TestServiceInterfaceEditor.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 SAP AG.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Emil Simeonov - initial API and implementation.
- * Dimitar Donchev - initial API and implementation.
- * Dimitar Tenev - initial API and implementation.
- * Nevena Manova - initial API and implementation.
- * Georgi Konstantinov - initial API and implementation.
- *******************************************************************************/
-package org.eclipse.wst.sse.sieditor.test.ui;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import org.eclipse.wst.sse.sieditor.ui.ServiceInterfaceEditor;
-
-public class TestServiceInterfaceEditor {
-
- @Test
- public void testSIE_DisposesWithoutException() {
- ServiceInterfaceEditor sie = new ServiceInterfaceEditor();
- try {
- sie.dispose();
- } catch (NullPointerException npe) {
- fail("ServiceInterfaceEditor should not throw NPE in dispose() method. " +
- "Note that ESR editor does not use createModelRoot() method.");
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/common/AbstractEditorWithSourcePageUndoHandlersDisposeTest.java b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/common/AbstractEditorWithSourcePageUndoHandlersDisposeTest.java
index a23b56c..30312b8 100644
--- a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/common/AbstractEditorWithSourcePageUndoHandlersDisposeTest.java
+++ b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/common/AbstractEditorWithSourcePageUndoHandlersDisposeTest.java
@@ -14,23 +14,12 @@
*******************************************************************************/
package org.eclipse.wst.sse.sieditor.test.ui.v2.common;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.isA;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.handlers.IHandlerService;
-import org.eclipse.ui.internal.part.NullEditorInput;
import org.eclipse.wst.sse.sieditor.model.XMLModelNotifierWrapper;
import org.eclipse.wst.sse.sieditor.model.api.IModelRoot;
import org.eclipse.wst.sse.sieditor.model.factory.IModelRootFactory;
@@ -77,50 +66,6 @@
}
@Test
- public final void testDispose() throws PartInitException {
- final IEditorSite editorSiteMock = createMock(IEditorSite.class);
- editorSiteMock.setSelectionProvider(isA(ISelectionProvider.class));
- // do not expect any calls of setGlobalActionHandler (called when the
- // undo and redo action handlers are not creadet => they are null
- replay(editorSiteMock);
-
- final AbstractEditorWithSourcePageInheritor page = new AbstractEditorWithSourcePageInheritor();
-
- page.init(editorSiteMock, new NullEditorInput());
-
- try {
- page.dispose();
- } catch (final NullPointerException e) {
- fail();
- }
- verify(editorSiteMock);
- }
-
- @Test
- public final void testDisposeWitHandlersSet() throws PartInitException {
- final IEditorSite editorSiteMock = createMock(IEditorSite.class);
- editorSiteMock.setSelectionProvider(isA(ISelectionProvider.class));
- final IActionBars actionBarsMock = createNiceMock(IActionBars.class);
- expect(editorSiteMock.getPage()).andReturn(createNiceMock(IWorkbenchPage.class)).anyTimes();
- expect(editorSiteMock.getActionBars()).andReturn(actionBarsMock);
- // calls for setting the action bars' action handlers are made => they
- // are created and not null
- replay(editorSiteMock, actionBarsMock);
-
- final AbstractEditorWithSourcePageInheritor page = new AbstractEditorWithSourcePageInheritor();
- page.init(editorSiteMock, new NullEditorInput());
-
- page.setGlobalActionHandlers();
- try {
- page.dispose();
- } catch (final NullPointerException e) {
- fail();
- }
- verify(editorSiteMock, actionBarsMock);
-
- }
-
- @Test
public void testDefaultNullImplementationExists() {
final AbstractEditorWithSourcePageInheritor editor = new AbstractEditorWithSourcePageInheritor();
final XMLModelNotifierWrapper defaultModelNotifier = editor.getModelNotifier();
diff --git a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/common/TestSetSelectionInSourceWithSIEditor.java b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/common/TestSetSelectionInSourceWithSIEditor.java
index d0912e7..673f6af 100644
--- a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/common/TestSetSelectionInSourceWithSIEditor.java
+++ b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/common/TestSetSelectionInSourceWithSIEditor.java
@@ -19,31 +19,35 @@
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.wst.sse.sieditor.ui.v2.nodes.ITreeNode;
-import org.eclipse.wst.sse.sieditor.ui.v2.wsdltree.nodes.ServiceInterfaceNode;
+import org.eclipse.wst.sse.sieditor.model.api.IWsdlModelRoot;
import org.eclipse.wst.sse.sieditor.test.util.SIEditorBaseTest;
+import org.eclipse.wst.sse.sieditor.ui.AbstractEditorPage;
+import org.eclipse.wst.sse.sieditor.ui.ServiceInterfaceEditor;
+import org.eclipse.wst.sse.sieditor.ui.v2.wsdltree.nodes.ServiceInterfaceNode;
import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
import org.junit.Before;
import org.junit.Test;
-import org.eclipse.wst.sse.sieditor.model.api.IWsdlModelRoot;
-import org.eclipse.wst.sse.sieditor.ui.AbstractEditorPage;
-import org.eclipse.wst.sse.sieditor.ui.ServiceInterfaceEditor;
-
public class TestSetSelectionInSourceWithSIEditor extends SIEditorBaseTest {
- private static final int Expected_Cursor_Position_After_Switch_From_DTPage_402 = 402;
private static final String EXPECTED_TEXT_TO_BE_REVEALED = "<wsdl:portType name=\"Service\">"; //$NON-NLS-1$
@Override
+ protected String getProjectName() {
+ return "TestSetSelectionInSourceWithSIEditor";
+ }
+
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
final IWsdlModelRoot modelRoot = (IWsdlModelRoot) getModelRoot("validation/WSDLWithRPCandDOcumentStyleBindings.wsdl", //$NON-NLS-1$
"WSDLWithRPCandDOcumentStyleBindings.wsdl", ServiceInterfaceEditor.EDITOR_ID); //$NON-NLS-1$
+
+ setDeleteProjectOnTearDown();
}
@Test
- public void testPageChnageFromServiceInterfacePageToSource() throws Exception {
+ public void testPageChangeFromServiceInterfacePageToSource() throws Exception {
List pages = editor.getPages();
@@ -70,30 +74,4 @@
EXPECTED_TEXT_TO_BE_REVEALED, result);
}
-
- @Test
- public void testPageChnageFromDataTypesPageToSource() throws Exception {
-
- // explicit switch to "DataTypes" page
- editor.pageChange(1);
-
- List pages = editor.getPages();
-
- AbstractEditorPage dataTypesPage = (AbstractEditorPage) pages.get(1);
-
- TreeViewer treeViewer = dataTypesPage.getTreeViewer();
-
- final TreeItem[] node = { (TreeItem) treeViewer.getTree().getItem(0) };
-
- StructuredSelection selection = new StructuredSelection((ITreeNode) node[0].getData());
-
- treeViewer.setSelection(selection);
-
- editor.pageChange(2);
-
- assertEquals("Expected curesor position after switch from DTPage " //$NON-NLS-1$
- + Expected_Cursor_Position_After_Switch_From_DTPage_402, Expected_Cursor_Position_After_Switch_From_DTPage_402,
- ((org.eclipse.jface.text.TextSelection) editor.getSourcePage().getTextViewer().getSelection()).getOffset());
-
- }
}
diff --git a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/common/TestSetSelectionInSourceWithSIEditorDatatypesPage.java b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/common/TestSetSelectionInSourceWithSIEditorDatatypesPage.java
new file mode 100644
index 0000000..ed4695b
--- /dev/null
+++ b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/common/TestSetSelectionInSourceWithSIEditorDatatypesPage.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2010 SAP AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Emil Simeonov - initial API and implementation.
+ * Dimitar Donchev - initial API and implementation.
+ * Dimitar Tenev - initial API and implementation.
+ * Nevena Manova - initial API and implementation.
+ * Georgi Konstantinov - initial API and implementation.
+ *******************************************************************************/
+package org.eclipse.wst.sse.sieditor.test.ui.v2.common;
+
+import java.util.List;
+
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.swt.widgets.TreeItem;
+import org.eclipse.wst.sse.sieditor.model.api.IWsdlModelRoot;
+import org.eclipse.wst.sse.sieditor.test.util.SIEditorBaseTest;
+import org.eclipse.wst.sse.sieditor.ui.AbstractEditorPage;
+import org.eclipse.wst.sse.sieditor.ui.ServiceInterfaceEditor;
+import org.eclipse.wst.sse.sieditor.ui.v2.nodes.ITreeNode;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestSetSelectionInSourceWithSIEditorDatatypesPage extends SIEditorBaseTest {
+ private static final int Expected_Cursor_Position_After_Switch_From_DTPage_402 = 402;
+
+ @Override
+ protected String getProjectName() {
+ return "TestSetSelectionInSourceWithSIEditorDatatypesPage";
+ }
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ final IWsdlModelRoot modelRoot = (IWsdlModelRoot) getModelRoot("validation/WSDLWithRPCandDOcumentStyleBindings.wsdl", //$NON-NLS-1$
+ "WSDLWithRPCandDOcumentStyleBindings.wsdl", ServiceInterfaceEditor.EDITOR_ID); //$NON-NLS-1$
+
+ setDeleteProjectOnTearDown();
+ }
+
+ @Test
+ public void testPageChangeFromDataTypesPageToSource() throws Exception {
+
+ // explicit switch to "DataTypes" page
+ editor.pageChange(1);
+
+ List pages = editor.getPages();
+
+ AbstractEditorPage dataTypesPage = (AbstractEditorPage) pages.get(1);
+
+ TreeViewer treeViewer = dataTypesPage.getTreeViewer();
+
+ final TreeItem[] node = { (TreeItem) treeViewer.getTree().getItem(0) };
+
+ StructuredSelection selection = new StructuredSelection((ITreeNode) node[0].getData());
+
+ treeViewer.setSelection(selection);
+
+ editor.pageChange(2);
+
+ assertEquals("Expected curesor position after switch from DTPage " //$NON-NLS-1$
+ + Expected_Cursor_Position_After_Switch_From_DTPage_402, Expected_Cursor_Position_After_Switch_From_DTPage_402,
+ ((org.eclipse.jface.text.TextSelection) editor.getSourcePage().getTextViewer().getSelection()).getOffset());
+
+ }
+}
diff --git a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/common/TestTypePropertyEditorHyperLinkSelection.java b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/common/TestTypePropertyEditorHyperLinkSelection.java
index 4b4f584..7c3eb7d 100644
--- a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/common/TestTypePropertyEditorHyperLinkSelection.java
+++ b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/common/TestTypePropertyEditorHyperLinkSelection.java
@@ -168,6 +168,8 @@
serviceInterfaceEditorPage = (AbstractEditorPage) editor.getPages().get(0);
siController = (SIFormPageController) serviceInterfaceEditorPage.getController();
dtController = (DataTypesFormPageController) ((AbstractEditorPage) editor.getPages().get(1)).getController();
+
+ setDeleteProjectOnTearDown();
}
@Test
diff --git a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/dt/dnd/SiEditorTransferTest.java b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/dt/dnd/SiEditorTransferTest.java
index 29bcba3..7814f1b 100644
--- a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/dt/dnd/SiEditorTransferTest.java
+++ b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/dt/dnd/SiEditorTransferTest.java
@@ -1,6 +1,5 @@
package org.eclipse.wst.sse.sieditor.test.ui.v2.dt.dnd;
-import org.eclipse.swt.dnd.TransferData;
import org.eclipse.wst.sse.sieditor.ui.v2.dt.dnd.SiEditorTransfer;
import org.junit.Assert;
import org.junit.Test;
@@ -15,26 +14,6 @@
}
@Test
- public void testIsSupportedType() {
- TransferData transferData = new TransferData();
- transferData.type = SiEditorTransfer.TYPEID;
-
- Assert.assertTrue(SiEditorTransfer.getInstance().isSupportedType(transferData));
-
- transferData.type = Integer.MAX_VALUE;
- Assert.assertFalse(SiEditorTransfer.getInstance().isSupportedType(transferData));
- }
-
- @Test
- public void testObjectCarrying() {
- Object[] objectArray = new Object[0];
- TransferData transferData = new TransferData();
- transferData.type = SiEditorTransfer.TYPEID;
- SiEditorTransfer.getInstance().javaToNative(objectArray, transferData);
- Assert.assertSame(objectArray, SiEditorTransfer.getInstance().nativeToJava(transferData));
- }
-
- @Test
public void testGetTypeIds() {
SiEditorTransferExposer siEditorTransfer = new SiEditorTransferExposer();
int[] typeIds = siEditorTransfer.getTypeIds();
diff --git a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/dt/dnd/TreeViewerDropAdapterTest.java b/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/dt/dnd/TreeViewerDropAdapterTest.java
deleted file mode 100644
index ffc2aa4..0000000
--- a/plugins/org.eclipse.wst.sse.sieditor.test/api/org/eclipse/wst/sse/sieditor/test/ui/v2/dt/dnd/TreeViewerDropAdapterTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.sse.sieditor.test.ui.v2.dt.dnd;
-
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.wst.sse.sieditor.ui.v2.dt.dnd.SiEditorTransfer;
-import org.eclipse.wst.sse.sieditor.ui.v2.dt.dnd.TreeViewerDropAdapter;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class TreeViewerDropAdapterTest {
-
- @Test
- public void testValidateDrop() {
- TreeViewerDropAdapter treeViewerDropAdapter = new TreeViewerDropAdapter(null, null);
- TransferData transferData = new TransferData();
- transferData.type = SiEditorTransfer.TYPEID;
-
- Assert.assertTrue(treeViewerDropAdapter.validateDrop(null, 0, transferData));
-
- transferData.type = Integer.MAX_VALUE;
- Assert.assertFalse(treeViewerDropAdapter.validateDrop(null, 0, transferData));
- }
-}
diff --git a/plugins/org.eclipse.wst.sse.sieditor.ui/api/org/eclipse/wst/sse/sieditor/ui/v2/dt/dnd/SiEditorTransfer.java b/plugins/org.eclipse.wst.sse.sieditor.ui/api/org/eclipse/wst/sse/sieditor/ui/v2/dt/dnd/SiEditorTransfer.java
index 0f6eff3..3e2dbc3 100644
--- a/plugins/org.eclipse.wst.sse.sieditor.ui/api/org/eclipse/wst/sse/sieditor/ui/v2/dt/dnd/SiEditorTransfer.java
+++ b/plugins/org.eclipse.wst.sse.sieditor.ui/api/org/eclipse/wst/sse/sieditor/ui/v2/dt/dnd/SiEditorTransfer.java
@@ -32,11 +32,6 @@
return new String[] { TYPE_NAME };
}
- @Override
- public boolean isSupportedType(TransferData transferData) {
- return transferData.type == TYPEID;
- }
-
private boolean isInvalidNativeType(Object result) {
return !(result instanceof byte[]) || !TYPE_NAME.equals(new String((byte[]) result, Charset.forName("UTF-8"))); //$NON-NLS-1$
}
