diff options
author | gkonstantinov | 2013-08-21 19:23:02 +0000 |
---|---|---|
committer | gkonstantinov | 2013-08-22 20:30:15 +0000 |
commit | 0f68da76d7eec96efa7c9712cabe0cf8369d30a6 (patch) | |
tree | cbca2bcdaa4fcf7a397b7fdbf4e8a8d19ec14ec5 | |
parent | 2cf0fd81147c0b620625261dafe69d4e52c9e86e (diff) | |
download | org.eclipse.webtools.incubator.sieditor-0f68da76d7eec96efa7c9712cabe0cf8369d30a6.tar.gz org.eclipse.webtools.incubator.sieditor-0f68da76d7eec96efa7c9712cabe0cf8369d30a6.tar.xz org.eclipse.webtools.incubator.sieditor-0f68da76d7eec96efa7c9712cabe0cf8369d30a6.zip |
test coverage improvements
6 files changed, 60 insertions, 17 deletions
diff --git a/plugins/org.eclipse.wst.sse.sieditor.search.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.sse.sieditor.search.test/META-INF/MANIFEST.MF index 8fdb419..0bd0b00 100644 --- a/plugins/org.eclipse.wst.sse.sieditor.search.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.wst.sse.sieditor.search.test/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.wst.sse.sieditor.search;bundle-version="1.0.0", org.eclipse.core.resources;bundle-version="3.7.100", org.eclipse.equinox.common;bundle-version="3.6.0", org.eclipse.platform.discovery.util;bundle-version="0.11.0", - org.eclipse.ui.forms;bundle-version="3.5.200", + org.eclipse.ui.forms, org.eclipse.wst.sse.sieditor.test;bundle-version="1.0.0" Export-Package: org.eclipse.wst.sse.sieditor.search.destinations, org.eclipse.wst.sse.sieditor.search.destinations.wsdl, diff --git a/plugins/org.eclipse.wst.sse.sieditor.search.test/src/org/eclipse/wst/sse/sieditor/search/suites/SearchConsoleIntegrationAllTestSuite.java b/plugins/org.eclipse.wst.sse.sieditor.search.test/src/org/eclipse/wst/sse/sieditor/search/suites/SearchConsoleIntegrationAllTestSuite.java index 3b73e85..700c542 100644 --- a/plugins/org.eclipse.wst.sse.sieditor.search.test/src/org/eclipse/wst/sse/sieditor/search/suites/SearchConsoleIntegrationAllTestSuite.java +++ b/plugins/org.eclipse.wst.sse.sieditor.search.test/src/org/eclipse/wst/sse/sieditor/search/suites/SearchConsoleIntegrationAllTestSuite.java @@ -14,6 +14,7 @@ import org.eclipse.wst.sse.sieditor.search.provider.xsd.XsdSearchQueryOperationT import org.eclipse.wst.sse.sieditor.search.ui.BasicSearchResultCustomUiCreatorTest; import org.eclipse.wst.sse.sieditor.search.ui.SearchResultContentProviderTest; import org.eclipse.wst.sse.sieditor.search.ui.SearchResultLableProviderTest; +import org.eclipse.wst.sse.sieditor.search.ui.actions.CopyActionTest; import org.eclipse.wst.sse.sieditor.search.ui.actions.OpenInEditorActionTest; import org.eclipse.wst.sse.sieditor.search.ui.tree.FileNodeTest; import org.eclipse.wst.sse.sieditor.search.ui.tree.NameSpaceNodeTest; @@ -40,7 +41,8 @@ import org.junit.runners.Suite.SuiteClasses; AbstractLocalDefinitionsSearchProviderTest.class, WildcardStringMatcherTest.class, WsdlSearchQueryOperationTest.class, - XsdSearchQueryOperationTest.class + XsdSearchQueryOperationTest.class, + CopyActionTest.class }) public class SearchConsoleIntegrationAllTestSuite { diff --git a/plugins/org.eclipse.wst.sse.sieditor.search.test/src/org/eclipse/wst/sse/sieditor/search/ui/actions/CopyActionTest.java b/plugins/org.eclipse.wst.sse.sieditor.search.test/src/org/eclipse/wst/sse/sieditor/search/ui/actions/CopyActionTest.java new file mode 100644 index 0000000..8b90bb7 --- /dev/null +++ b/plugins/org.eclipse.wst.sse.sieditor.search.test/src/org/eclipse/wst/sse/sieditor/search/ui/actions/CopyActionTest.java @@ -0,0 +1,37 @@ +package org.eclipse.wst.sse.sieditor.search.ui.actions; + +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.junit.Assert; +import org.junit.Test; +import org.mockito.Mockito; + +public class CopyActionTest { + + @Test + public void testGetText() { + String text = new CopyAction(Mockito.mock(ISelection.class)).getText(); + Assert.assertNotNull(text); + Assert.assertFalse(text.isEmpty()); + } + + @Test + public void testIsEnabled() { + boolean enabled = new CopyAction(Mockito.mock(ISelection.class)).isEnabled(); + Assert.assertFalse(enabled); + + CopyAction copyAction = new CopyAction(Mockito.mock(IStructuredSelection.class)) { + protected boolean isCopyEnabled() { + return true; + } + }; + Assert.assertTrue(copyAction.isEnabled()); + + copyAction = new CopyAction(Mockito.mock(IStructuredSelection.class)) { + protected boolean isCopyEnabled() { + return false; + } + }; + Assert.assertFalse(copyAction.isEnabled()); + } +} diff --git a/plugins/org.eclipse.wst.sse.sieditor.search.test/src/org/eclipse/wst/sse/sieditor/search/ui/actions/OpenInEditorActionTest.java b/plugins/org.eclipse.wst.sse.sieditor.search.test/src/org/eclipse/wst/sse/sieditor/search/ui/actions/OpenInEditorActionTest.java index b791006..8b5632e 100644 --- a/plugins/org.eclipse.wst.sse.sieditor.search.test/src/org/eclipse/wst/sse/sieditor/search/ui/actions/OpenInEditorActionTest.java +++ b/plugins/org.eclipse.wst.sse.sieditor.search.test/src/org/eclipse/wst/sse/sieditor/search/ui/actions/OpenInEditorActionTest.java @@ -1,26 +1,27 @@ package org.eclipse.wst.sse.sieditor.search.ui.actions; import org.eclipse.jface.viewers.ISelection; +import org.eclipse.wst.sse.sieditor.ui.DataTypesEditor; +import org.eclipse.wst.sse.sieditor.ui.ServiceInterfaceEditor; +import org.eclipse.wst.sse.sieditor.ui.v2.dt.nodes.INamespaceNode; import org.eclipse.wst.sse.sieditor.ui.v2.nodes.ITreeNode; -import org.junit.Ignore; +import org.junit.Assert; import org.junit.Test; +import org.mockito.Mockito; public class OpenInEditorActionTest { @Test - @Ignore public void testGetEditorId() { - // OpenInEditorActionMock openInEditorActionMock = new - // OpenInEditorActionMock(); - // - // IDescription descriptionRoot = Mockito.mock(IDescription.class); - // // String editorId = - // openInEditorActionMock.getEditorId(descriptionRoot); - // Assert.assertEquals(ServiceInterfaceEditor.EDITOR_ID, editorId); - // - // ISchema schemanRoot = Mockito.mock(ISchema.class); - // // editorId = openInEditorActionMock.getEditorId(schemanRoot); - // Assert.assertEquals(DataTypesEditor.EDITOR_ID, editorId); + OpenInEditorActionMock openInEditorActionMock = new OpenInEditorActionMock(Mockito.mock(ISelection.class)); + + ITreeNode treeNode = Mockito.mock(ITreeNode.class); + String editorId = openInEditorActionMock.getEditorId(treeNode); + Assert.assertEquals(ServiceInterfaceEditor.EDITOR_ID, editorId); + + INamespaceNode schemanRoot = Mockito.mock(INamespaceNode.class); + editorId = openInEditorActionMock.getEditorId(schemanRoot); + Assert.assertEquals(DataTypesEditor.EDITOR_ID, editorId); } private class OpenInEditorActionMock extends OpenInEditorAction { diff --git a/plugins/org.eclipse.wst.sse.sieditor.search/src/org/eclipse/wst/sse/sieditor/search/ui/actions/CopyAction.java b/plugins/org.eclipse.wst.sse.sieditor.search/src/org/eclipse/wst/sse/sieditor/search/ui/actions/CopyAction.java index 2c35568..5ba5951 100644 --- a/plugins/org.eclipse.wst.sse.sieditor.search/src/org/eclipse/wst/sse/sieditor/search/ui/actions/CopyAction.java +++ b/plugins/org.eclipse.wst.sse.sieditor.search/src/org/eclipse/wst/sse/sieditor/search/ui/actions/CopyAction.java @@ -39,6 +39,10 @@ public class CopyAction extends Action { return false; } + return isCopyEnabled(); + } + + protected boolean isCopyEnabled() { return ClipboardService.isCopyEnabled(((IStructuredSelection) selection).toArray()); } 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 9e64a98..a21fee4 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 @@ -34,8 +34,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.wst.sse.sieditor.model;bundle-version="1.0.0",
org.eclipse.wst.sse.sieditor.ui;bundle-version="1.0.0",
org.easymock3;bundle-version="3.0.0",
- org.mockito.mockito-all;bundle-version="1.9.0",
- org.eclipse.e4.ui.model.workbench;bundle-version="0.10.1"
+ org.mockito.mockito-all;bundle-version="1.9.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.wst.sse.sieditor.test;uses:="org.osgi.framework",
|