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 2018/12/07 04:30:09 UTC

incubator-taverna-language git commit: text/plain fun

Repository: incubator-taverna-language
Updated Branches:
  refs/heads/no-ontologies cf5413258 -> c7b1638b3


text/plain fun


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/c7b1638b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/c7b1638b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/c7b1638b

Branch: refs/heads/no-ontologies
Commit: c7b1638b313669545532cf1ce7c5626357552c1d
Parents: cf54132
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Dec 7 04:29:57 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Dec 7 04:29:57 2018 +0000

----------------------------------------------------------------------
 .../java/org/apache/taverna/robundle/manifest/TestManifest.java  | 2 +-
 .../org/apache/taverna/robundle/manifest/TestManifestJSON.java   | 4 ++--
 .../org/apache/taverna/robundle/manifest/TestRDFToManifest.java  | 2 +-
 taverna-robundle/src/test/resources/manifest.json                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/c7b1638b/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestManifest.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestManifest.java b/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestManifest.java
index 53c871c..59f7f62 100644
--- a/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestManifest.java
+++ b/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestManifest.java
@@ -231,7 +231,7 @@ public class TestManifest {
 		assertEquals("Bob Builder",
 				manifest.getAggregation(r.resolve("/README.txt"))
 						.getCreatedBy().getName());
-		assertEquals("text/plain",
+		assertEquals("text/plain; charset=\"utf-8\"",
 				manifest.getAggregation(r.resolve("/README.txt"))
 						.getMediatype());
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/c7b1638b/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestManifestJSON.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestManifestJSON.java b/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestManifestJSON.java
index f80baea..9754cda 100644
--- a/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestManifestJSON.java
+++ b/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestManifestJSON.java
@@ -144,7 +144,7 @@ public class TestManifestJSON {
 			Files.createFile(readme);
 			PathMetadata readmeMeta = bundle.getManifest().getAggregation(
 					readme);
-			readmeMeta.setMediatype("text/plain");
+			readmeMeta.setMediatype("text/plain; charset=\"utf-8\"");
 			Agent readmeCreatedby = new Agent("Bob Builder");
 			readmeCreatedby.setUri(URI.create("http://example.com/foaf#bob"));
 			readmeMeta.setCreatedBy(readmeCreatedby);
@@ -273,7 +273,7 @@ public class TestManifestJSON {
 
 		JsonNode readme = aggregates.get(2);
 		assertEquals("/README.txt", readme.get("uri").asText());
-		assertEquals("text/plain", readme.get("mediatype").asText());
+		assertEquals("text/plain; charset=\"utf-8\"", readme.get("mediatype").asText());
 		assertEquals("2013-02-12T19:37:32.939Z", readme.get("createdOn")
 				.asText());
 		JsonNode readmeCreatedBy = readme.get("createdBy");

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/c7b1638b/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestRDFToManifest.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestRDFToManifest.java b/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestRDFToManifest.java
index bd70333..fdb1943 100644
--- a/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestRDFToManifest.java
+++ b/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestRDFToManifest.java
@@ -136,7 +136,7 @@ public class TestRDFToManifest {
 			assertNull(blog.getBundledAs());
 
 			PathMetadata readme = manifest.getAggregation(ro.getPath("/README.txt"));
-			assertEquals("text/plain", readme.getMediatype());
+			assertEquals("text/plain; charset=\"utf-8\"", readme.getMediatype());
 			assertEquals("Bob Builder", readme.getCreatedBy().getName());
 			assertEquals(URI.create("http://example.com/foaf#bob"), readme.getCreatedBy().getUri());
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/c7b1638b/taverna-robundle/src/test/resources/manifest.json
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/test/resources/manifest.json b/taverna-robundle/src/test/resources/manifest.json
index e4a8526..158a603 100644
--- a/taverna-robundle/src/test/resources/manifest.json
+++ b/taverna-robundle/src/test/resources/manifest.json
@@ -29,7 +29,7 @@
        },
        { "uri":  "http://example.com/blog/" },
        { "uri":      "/README.txt",
-         "mediatype": "text/plain",
+         "mediatype": "text/plain; charset=\"utf-8\"",
          "createdBy": {
              "uri":     "http://example.com/foaf#bob",
              "name":    "Bob Builder" },