Updated expected plantuml after fixing ecore links

hallvard · Apr 5, 2021 · f9fe62a · f9fe62a
1 parent aff43fb
commit f9fe62a
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 8 deletions.
diff --git a/tests/net.sourceforge.plantuml.ecore.tests/model/sample.ecore.plantuml b/tests/net.sourceforge.plantuml.ecore.tests/model/sample.ecore.plantuml
@@ -1,15 +1,15 @@
 @startuml
-class Library [[marker:/org.eclipse.emf.ecore.diagnostic/net.sourceforge.plantuml.ecore.tests/model/sample.ecore?uri=platform:/resource/net.sourceforge.plantuml.ecore.tests/model/sample.ecore%23//Library]] {
+class Library [[marker:/org.eclipse.emf.ecore.diagnostic/ecoreeditortest/model/sample.ecore?uri=platform:/resource/ecoreeditortest/model/sample.ecore%23//Library]] {
 }
-class Book [[marker:/org.eclipse.emf.ecore.diagnostic/net.sourceforge.plantuml.ecore.tests/model/sample.ecore?uri=platform:/resource/net.sourceforge.plantuml.ecore.tests/model/sample.ecore%23//Book]] {
+class Book [[marker:/org.eclipse.emf.ecore.diagnostic/ecoreeditortest/model/sample.ecore?uri=platform:/resource/ecoreeditortest/model/sample.ecore%23//Book]] {
 	kind: BookKind
 }
-class Author [[marker:/org.eclipse.emf.ecore.diagnostic/net.sourceforge.plantuml.ecore.tests/model/sample.ecore?uri=platform:/resource/net.sourceforge.plantuml.ecore.tests/model/sample.ecore%23//Author]] {
+class Author [[marker:/org.eclipse.emf.ecore.diagnostic/ecoreeditortest/model/sample.ecore?uri=platform:/resource/ecoreeditortest/model/sample.ecore%23//Author]] {
 }
-class Named [[marker:/org.eclipse.emf.ecore.diagnostic/net.sourceforge.plantuml.ecore.tests/model/sample.ecore?uri=platform:/resource/net.sourceforge.plantuml.ecore.tests/model/sample.ecore%23//Named]] {
+class Named [[marker:/org.eclipse.emf.ecore.diagnostic/ecoreeditortest/model/sample.ecore?uri=platform:/resource/ecoreeditortest/model/sample.ecore%23//Named]] {
 	name: String
 }
-enum BookKind {
+enum BookKind [[marker:/org.eclipse.emf.ecore.diagnostic/ecoreeditortest/model/sample.ecore?uri=platform:/resource/ecoreeditortest/model/sample.ecore%23//BookKind]] {
 	Novel: Novel
 	Non-fiction: Non-fiction
 }

diff --git a/tests/net.sourceforge.plantuml.ecore.tests/model/sample.xmi.plantuml b/tests/net.sourceforge.plantuml.ecore.tests/model/sample.xmi.plantuml
@@ -1,16 +1,16 @@
 @startuml
 object "~#1: Library" as o1 {
 }
-url of o1 is  [[marker:/org.eclipse.emf.ecore.diagnostic/net.sourceforge.plantuml.ecore.tests/model/sample.xmi?uri=platform:/resource/net.sourceforge.plantuml.ecore.tests/model/sample.xmi%23/]]
+url of o1 is  [[marker:/org.eclipse.emf.ecore.diagnostic/ecoreeditortest/model/sample.xmi?uri=platform:/resource/ecoreeditortest/model/sample.xmi%23/]]
 object "~#2: Book" as o2 {
 	name = "Sult"
 	kind = Novel
 }
-url of o2 is  [[marker:/org.eclipse.emf.ecore.diagnostic/net.sourceforge.plantuml.ecore.tests/model/sample.xmi?uri=platform:/resource/net.sourceforge.plantuml.ecore.tests/model/sample.xmi%23//@books.0]]
+url of o2 is  [[marker:/org.eclipse.emf.ecore.diagnostic/ecoreeditortest/model/sample.xmi?uri=platform:/resource/ecoreeditortest/model/sample.xmi%23//@books.0]]
 object "~#3: Author" as o3 {
 	name = "Knut Hamsun"
 }
-url of o3 is  [[marker:/org.eclipse.emf.ecore.diagnostic/net.sourceforge.plantuml.ecore.tests/model/sample.xmi?uri=platform:/resource/net.sourceforge.plantuml.ecore.tests/model/sample.xmi%23//@authors.0]]
+url of o3 is  [[marker:/org.eclipse.emf.ecore.diagnostic/ecoreeditortest/model/sample.xmi?uri=platform:/resource/ecoreeditortest/model/sample.xmi%23//@authors.0]]
 o1 *-- "books" o2
 o1 *-- "authors" o3
 o2 --> "author" o3

diff --git a/tests/net.sourceforge.plantuml.text.tests/testFiles/multi.plantuml b/tests/net.sourceforge.plantuml.text.tests/testFiles/multi.plantuml
@@ -25,3 +25,51 @@ class "Bar"
 @startuml
 class "Foo"
 @enduml
+
+@startjson
+{
+  "firstName": "John",
+  "lastName": "Smith",
+  "isAlive": true,
+  "age": 27,
+  "address": {
+    "streetAddress": "21 2nd Street",
+    "city": "New York",
+    "state": "NY",
+    "postalCode": "10021-3100"
+  },
+  "phoneNumbers": [
+    {
+      "type": "home",
+      "number": "212 555-1234"
+    },
+    {
+      "type": "office",
+      "number": "646 555-4567"
+    }
+  ],
+  "children": [],
+  "spouse": null
+}
+@endjson
+
+@startyaml
+doe: "a deer, a female deer"
+ray: "a drop of golden sun"
+pi: 3.14159
+xmas: true
+french-hens: 3
+calling-birds: 
+	- huey
+	- dewey
+	- louie
+	- fred
+xmas-fifth-day: 
+	calling-birds: four
+	french-hens: 3
+	golden-rings: 5
+	partridges: 
+		count: 1
+		location: "a pear tree"
+	turtle-doves: two
+@endyaml