[GSOC 2018 apache taverna mobile] Weekly progress mail 9

[Hitesh Gautam]

Greetings,

In my ninth week of google summer of code, I am currently working on
writing the test for ImageZoom, MyWorkflows and login activity with minor
bugs resolves.

Please feel free to give any suggestions. I will be grateful for your
valuable insights.

Thank You

-- 
Regards,
*Hitesh Gautam *
B.Tech (Information Technology and Mathematical Innovation)
Cluster Innovation Centre
New Delhi | India
Ph :- +91 8383848780

[GitHub] incubator-taverna-language pull request #39: Support nested workflows by par...

[stain]

Github user stain commented on a diff in the pull request:


https://github.com/apache/incubator-taverna-language/pull/39#discussion_r204713920
  
--- Diff: taverna-scufl2-cwl/taverna-scufl2-cwl.iml ---
@@ -0,0 +1,11 @@
+
--- End diff --

What is this file needed for? Probably should be in .gitignore


---

[GitHub] incubator-taverna-language pull request #39: Support nested workflows by par...

[stain]

Github user stain commented on a diff in the pull request:


https://github.com/apache/incubator-taverna-language/pull/39#discussion_r204713856
  
--- Diff: taverna-scufl2-cwl/workflow.wfbundle ---
@@ -0,0 +1,10 @@
+WorkflowBundle 'bundle1'
--- End diff --

This file has extension .wfbundle but is in text format. Also can we move 
these to src/test/resources or whatever the files are for?


The file /workflow.vnd.taverna.scufl2.structure.txt` has a weird filename 
and is not even a text file. Remove.


---

[GitHub] incubator-taverna-language pull request #39: Support nested workflows by par...

[stain]

Github user stain commented on a diff in the pull request:


https://github.com/apache/incubator-taverna-language/pull/39#discussion_r204713406
  
--- Diff: taverna-scufl2-cwl/workflow.t2flow.txt ---
@@ -0,0 +1,10 @@
+WorkflowBundle 'bundle1'
--- End diff --

I don't know if the workflow bundle structure format supports `#` comments 
for Apache license headers, but if not we will need to add an apache-rat 
exclude of this file to pom.xml  (there should be some already)


---

[GitHub] incubator-taverna-language pull request #39: Support nested workflows by par...

[stain]

Github user stain commented on a diff in the pull request:


https://github.com/apache/incubator-taverna-language/pull/39#discussion_r204712907
  
--- Diff: 
taverna-scufl2-cwl/src/test/java/org/apache/taverna/scufl2/cwl/TestWorkflowProcess.java
 ---
@@ -0,0 +1,135 @@
+/*
+ * 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.taverna.scufl2.cwl;
+
+<<< HEAD
+
+===
+import java.io.File;
+import java.io.IOException;
+>>> 87fa1c18d2b7aa210db3d238905234bf4f52b491
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.HashMap;
+
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+import org.yaml.snakeyaml.Yaml;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+
+import org.apache.taverna.scufl2.api.core.Workflow;
+import org.apache.taverna.scufl2.api.core.Processor;
+import org.apache.taverna.scufl2.api.core.DataLink;
+
+import org.apache.taverna.scufl2.api.common.NamedSet;
+
+import org.apache.taverna.scufl2.api.port.InputWorkflowPort;
+import org.apache.taverna.scufl2.api.port.OutputWorkflowPort;
+import org.apache.taverna.scufl2.api.port.InputProcessorPort;
+
+<<< HEAD
+===
+import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
+import org.apache.taverna.scufl2.api.io.WriterException;
+
+import org.apache.taverna.scufl2.api.container.WorkflowBundle;
+
+>>> 87fa1c18d2b7aa210db3d238905234bf4f52b491
--- End diff --

This is trying to submit an unmerged merge conflict. Please revert and try 
again.


---