You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/08/21 12:59:42 UTC
[25/50] [abbrv] incubator-taverna-common-activities git commit:
removed contextualview test
removed contextualview test
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/f3df1afe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/f3df1afe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/f3df1afe
Branch: refs/heads/cwl-browse
Commit: f3df1afe8937e921f514516b0b802cf90c4a4de7
Parents: dbadfb2
Author: ThilinaManamgoda <ma...@gmail.com>
Authored: Mon Aug 1 14:26:07 2016 +0530
Committer: ThilinaManamgoda <ma...@gmail.com>
Committed: Mon Aug 1 14:26:07 2016 +0530
----------------------------------------------------------------------
.../ui/serviceprovider/CwlServiceProvider.java | 5 +-
.../serviceprovider/CwlServiceProviderTest.java | 55 +++++++++++++++++++-
.../cwl/ui/view/CwlActivityContextViewTest.java | 29 -----------
3 files changed, 56 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/f3df1afe/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProvider.java
----------------------------------------------------------------------
diff --git a/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProvider.java b/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProvider.java
index 64b2f11..49f9ee6 100644
--- a/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProvider.java
+++ b/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProvider.java
@@ -78,7 +78,9 @@ public class CwlServiceProvider extends AbstractConfigurableServiceProvider impl
try {
stream = Files.newDirectoryStream(normalizedPath, "*.cwl");
} catch (IOException e) {
+
logger.warn("Path is not correct !");
+ callBack.finished();
return;
}
// create stream with parallel capabilities
@@ -103,7 +105,6 @@ public class CwlServiceProvider extends AbstractConfigurableServiceProvider impl
}
});
-
callBack.finished();
}
@@ -225,7 +226,7 @@ public class CwlServiceProvider extends AbstractConfigurableServiceProvider impl
* Set the Configuration such that when service provider is created user is asked for the PATH
* @return
*/
- private static Configuration getDefaultConfiguration() {
+ public static Configuration getDefaultConfiguration() {
Configuration c = new Configuration();
ObjectNode conf = c.getJsonAsObjectNode();
conf.put("path", "");
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/f3df1afe/taverna-cwl-activity-ui/src/test/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProviderTest.java
----------------------------------------------------------------------
diff --git a/taverna-cwl-activity-ui/src/test/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProviderTest.java b/taverna-cwl-activity-ui/src/test/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProviderTest.java
index 654b084..b8ebfb9 100644
--- a/taverna-cwl-activity-ui/src/test/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProviderTest.java
+++ b/taverna-cwl-activity-ui/src/test/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProviderTest.java
@@ -2,18 +2,69 @@ package org.apache.taverna.cwl.ui.serviceprovider;
import static org.junit.Assert.*;
+import java.util.Collection;
+
+import org.apache.taverna.scufl2.api.configurations.Configuration;
+import org.apache.taverna.servicedescriptions.ServiceDescription;
+import org.apache.taverna.servicedescriptions.ServiceDescriptionProvider;
import org.junit.Before;
import org.junit.Test;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
public class CwlServiceProviderTest {
+ private static final String FINISHED="Finished";
+ class Results implements ServiceDescriptionProvider.FindServiceDescriptionsCallBack {
+ String result;
+ @Override
+ public void partialResults(Collection<? extends ServiceDescription> serviceDescriptions) {
+
+ }
+
+ @Override
+ public void status(String message) {
+
+ }
+
+ @Override
+ public void warning(String message) {
+
+ }
+
+ @Override
+ public void finished() {
+ result=FINISHED;
+
+ }
+
+ @Override
+ public void fail(String message, Throwable ex) {
+
+ }
+
+ }
+
+ Results results;
+ static CwlServiceProvider cwlServiceProvider;
@Before
public void setUp() throws Exception {
+ cwlServiceProvider = new CwlServiceProvider();
+ results=new Results();
}
+ @SuppressWarnings("static-access")
+ @Test
+ public void defaultConfigurationtest() {
+ Configuration c = new Configuration();
+ ObjectNode conf = c.getJsonAsObjectNode();
+ conf.put("path", "");
+ assertEquals(c.getJson(),cwlServiceProvider.getDefaultConfiguration().getJson() );
+ }
@Test
- public void test() {
- //fail("Not yet implemented");
+ public void findServiceDescriptionsAsynctest(){
+ cwlServiceProvider.findServiceDescriptionsAsync(results);
+ assertEquals(FINISHED,results.result );
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/f3df1afe/taverna-cwl-activity-ui/src/test/java/org/apache/taverna/cwl/ui/view/CwlActivityContextViewTest.java
----------------------------------------------------------------------
diff --git a/taverna-cwl-activity-ui/src/test/java/org/apache/taverna/cwl/ui/view/CwlActivityContextViewTest.java b/taverna-cwl-activity-ui/src/test/java/org/apache/taverna/cwl/ui/view/CwlActivityContextViewTest.java
deleted file mode 100644
index d543b39..0000000
--- a/taverna-cwl-activity-ui/src/test/java/org/apache/taverna/cwl/ui/view/CwlActivityContextViewTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.apache.taverna.cwl.ui.view;
-
-
-import java.net.URI;
-
-import org.apache.taverna.scufl2.api.activity.Activity;
-import org.apache.taverna.scufl2.api.profiles.Profile;
-import org.apache.taverna.workbench.configuration.colour.ColourManager;
-import org.junit.Before;
-import org.junit.Test;
-
-public class CwlActivityContextViewTest {
- CwlContextualView contextualView;
- @Before
- public void setUp() throws Exception {
-// ColourManager colourManager=null;
-// Activity activity =new Activity();
-// activity.setParent(new Profile());
-// activity.createConfiguration(new URI("https://taverna.apache.org/ns/2016/activity/cwl"));
-// contextualView = new CwlContextualView(activity,colourManager);
-
- }
-
- @Test
- public void test() {
- //sassertEquals("customtool1", contextualView.getViewTitle());
- }
-
-}