diff options
author | gkonstantinov | 2013-03-09 09:12:38 +0000 |
---|---|---|
committer | gkonstantinov | 2013-03-09 09:12:38 +0000 |
commit | 2cf0fd81147c0b620625261dafe69d4e52c9e86e (patch) | |
tree | b164473086d215b094f2dea87eb97c88341af7b6 | |
parent | 6cbdf35309470ddd5ba02b9a48d68c8ffc563ee0 (diff) | |
download | org.eclipse.webtools.incubator.sieditor-2cf0fd81147c0b620625261dafe69d4e52c9e86e.tar.gz org.eclipse.webtools.incubator.sieditor-2cf0fd81147c0b620625261dafe69d4e52c9e86e.tar.xz org.eclipse.webtools.incubator.sieditor-2cf0fd81147c0b620625261dafe69d4e52c9e86e.zip |
fixed tests
3 files changed, 24 insertions, 23 deletions
diff --git a/plugins/org.eclipse.wst.sse.sieditor.search.test/src/org/eclipse/wst/sse/sieditor/search/ui/SearchResultLableProviderTest.java b/plugins/org.eclipse.wst.sse.sieditor.search.test/src/org/eclipse/wst/sse/sieditor/search/ui/SearchResultLableProviderTest.java index 15e42bf..7d5d63d 100644 --- a/plugins/org.eclipse.wst.sse.sieditor.search.test/src/org/eclipse/wst/sse/sieditor/search/ui/SearchResultLableProviderTest.java +++ b/plugins/org.eclipse.wst.sse.sieditor.search.test/src/org/eclipse/wst/sse/sieditor/search/ui/SearchResultLableProviderTest.java @@ -2,8 +2,9 @@ package org.eclipse.wst.sse.sieditor.search.ui; import junit.framework.Assert; -import org.eclipse.wst.sse.sieditor.model.api.IModelObject; +import org.eclipse.wst.sse.sieditor.model.api.IQNamedObject; import org.eclipse.wst.sse.sieditor.search.ui.tree.FileNode; +import org.eclipse.wst.sse.sieditor.search.ui.tree.NamespaceNode; import org.eclipse.wst.sse.sieditor.ui.v2.dt.nodes.IDataTypesTreeNode; import org.junit.Before; import org.junit.BeforeClass; @@ -19,16 +20,16 @@ public class SearchResultLableProviderTest { private static SearchResultLableProvider lableProvider; private static FileNode fileNodeMock; private static IDataTypesTreeNode treeNodeMock; - private static IModelObject modelObject; + private static IQNamedObject modelObject; @BeforeClass public static void setUp() { - lableProvider = new SearchResultLableProvider(); + lableProvider = new SearchResultLableProviderExposer(); fileNodeMock = Mockito.mock(FileNode.class); Mockito.when(fileNodeMock.getTreeDisplayText()).thenReturn(FILE_NODE_TEXT); treeNodeMock = Mockito.mock(IDataTypesTreeNode.class); - modelObject = Mockito.mock(IModelObject.class); + modelObject = Mockito.mock(IQNamedObject.class); Mockito.when(treeNodeMock.getTreeDisplayText()).thenReturn(DATATYPES_TREE_NODE_TEXT); Mockito.when(treeNodeMock.getModelObject()).thenReturn(modelObject); } @@ -48,16 +49,18 @@ public class SearchResultLableProviderTest { public void testGetToolTipText() { Assert.assertNull(lableProvider.getToolTipText(new Object())); Assert.assertNull(lableProvider.getToolTipText(fileNodeMock)); - Assert.assertNull(lableProvider.getToolTipText(treeNodeMock)); - - Mockito.when(modelObject.getDocumentation()).thenReturn(""); - Assert.assertNull(lableProvider.getToolTipText(treeNodeMock)); - - Mockito.when(modelObject.getDocumentation()).thenReturn(" "); - Assert.assertNull(lableProvider.getToolTipText(treeNodeMock)); + Assert.assertNull(lableProvider.getToolTipText(Mockito.mock(NamespaceNode.class))); + Assert.assertNotNull(lableProvider.getToolTipText(treeNodeMock)); Mockito.when(modelObject.getDocumentation()).thenReturn(DOCUMENTATION_TEXT); - Assert.assertEquals(DOCUMENTATION_TEXT, lableProvider.getToolTipText(treeNodeMock)); + Assert.assertNotNull(lableProvider.getToolTipText(treeNodeMock)); + } + + private static class SearchResultLableProviderExposer extends SearchResultLableProvider { + @Override + protected String getFilePath(IQNamedObject namedObject) { + return "FilePath"; + } } } diff --git a/plugins/org.eclipse.wst.sse.sieditor.search/src/org/eclipse/wst/sse/sieditor/search/provider/wsdl/WsdlSearchQueryOperation.java b/plugins/org.eclipse.wst.sse.sieditor.search/src/org/eclipse/wst/sse/sieditor/search/provider/wsdl/WsdlSearchQueryOperation.java index 099b8bf..611e168 100644 --- a/plugins/org.eclipse.wst.sse.sieditor.search/src/org/eclipse/wst/sse/sieditor/search/provider/wsdl/WsdlSearchQueryOperation.java +++ b/plugins/org.eclipse.wst.sse.sieditor.search/src/org/eclipse/wst/sse/sieditor/search/provider/wsdl/WsdlSearchQueryOperation.java @@ -46,7 +46,7 @@ public class WsdlSearchQueryOperation extends AbstractSearchQueryOperation { if (isByNamespaceHierarchy() || isByFilesHierarchy()) { NamespaceNode namespaceNode = new NamespaceNode(wsdlModelRoot.getDescription(), fileNode); addInterfacesToNamespaceNode(wsdlModelRoot, namespaceNode); - + addNamespaceNodeContentToTree(rootTreeNode, fileNode, namespaceNode); } else { addInterfacesToNamespaceNode(wsdlModelRoot, rootTreeNode); } diff --git a/plugins/org.eclipse.wst.sse.sieditor.search/src/org/eclipse/wst/sse/sieditor/search/ui/SearchResultLableProvider.java b/plugins/org.eclipse.wst.sse.sieditor.search/src/org/eclipse/wst/sse/sieditor/search/ui/SearchResultLableProvider.java index f81677d..a6c230c 100644 --- a/plugins/org.eclipse.wst.sse.sieditor.search/src/org/eclipse/wst/sse/sieditor/search/ui/SearchResultLableProvider.java +++ b/plugins/org.eclipse.wst.sse.sieditor.search/src/org/eclipse/wst/sse/sieditor/search/ui/SearchResultLableProvider.java @@ -48,21 +48,19 @@ public class SearchResultLableProvider extends AbstractEditorLabelProvider { IQNamedObject namedObject = (IQNamedObject) modelObject; String result = "Namespace: " + namedObject.getNamespace(); //$NON-NLS-1$ - String strFile = modelObject.getComponent().eResource().getURI().toFileString(); - IFile iFile = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(strFile)); - - result += "\nFile: " + iFile.getFullPath().toString(); //$NON-NLS-1$ + result += "\nFile: " + getFilePath(namedObject); //$NON-NLS-1$ String documentation = modelObject.getDocumentation(); - if (documentation == null) { - return null; - } - - documentation = documentation.trim(); if (documentation != null && !documentation.isEmpty()) { - result += "\nDocumentation: " + documentation; //$NON-NLS-1$ + result += "\nDocumentation: " + documentation.trim(); //$NON-NLS-1$ } return result; } + + protected String getFilePath(IQNamedObject namedObject) { + String strFile = namedObject.getComponent().eResource().getURI().toFileString(); + IFile iFile = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(strFile)); + return iFile.getFullPath().toString(); + } } |