Update normalization tests, clarify compact test name.
authorDave Longley <dlongley@digitalbazaar.com>
Mon, 09 Apr 2012 14:08:59 -0400
changeset 476 95cf53e4b075
parent 475 f024b8ab9163
child 477 6d3e3dab4c29
Update normalization tests, clarify compact test name.
test-suite/tests/compact-manifest.jsonld
test-suite/tests/normalize-0020-out.jsonld
test-suite/tests/normalize-0023-out.jsonld
test-suite/tests/normalize-0024-out.jsonld
test-suite/tests/normalize-0025-out.jsonld
test-suite/tests/normalize-0026-out.jsonld
test-suite/tests/normalize-0027-out.jsonld
test-suite/tests/normalize-0028-out.jsonld
test-suite/tests/normalize-0029-out.jsonld
test-suite/tests/normalize-0038-out.jsonld
test-suite/tests/normalize-0039-out.jsonld
test-suite/tests/normalize-0040-out.jsonld
test-suite/tests/normalize-0041-out.jsonld
test-suite/tests/normalize-0042-out.jsonld
test-suite/tests/normalize-0044-out.jsonld
test-suite/tests/normalize-0045-out.jsonld
test-suite/tests/normalize-0046-out.jsonld
test-suite/tests/normalize-0047-out.jsonld
test-suite/tests/normalize-0048-out.jsonld
test-suite/tests/normalize-0050-out.jsonld
test-suite/tests/normalize-0053-out.jsonld
test-suite/tests/normalize-0054-in.jsonld
test-suite/tests/normalize-0054-out.jsonld
test-suite/tests/normalize-0055-in.jsonld
test-suite/tests/normalize-0055-out.jsonld
test-suite/tests/normalize-0056-in.jsonld
test-suite/tests/normalize-0056-out.jsonld
test-suite/tests/normalize-manifest.jsonld
--- a/test-suite/tests/compact-manifest.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/compact-manifest.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -36,7 +36,7 @@
     "expect": "compact-0005-out.jsonld"
   }, {
     "@type": ["test:TestCase", "jld:CompactTest"],
-    "name": "keep expanded object notion if @type doesn't not match",
+    "name": "keep expanded object format if @type doesn't match",
     "input": "compact-0006-in.jsonld",
     "context": "compact-0006-context.jsonld",
     "expect": "compact-0006-out.jsonld",
--- a/test-suite/tests/normalize-0020-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0020-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -1,33 +1,33 @@
 [
   {
-    "@id": "_:c14n0"
+    "@id": "_:c14n0",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n2"
+      }
+    ]
   },
   {
     "@id": "_:c14n1",
     "http://example.org/vocab#next": [
       {
-        "@id": "_:c14n0"
+        "@id": "_:c14n2"
       }
     ]
   },
   {
-    "@id": "_:c14n2",
-    "http://example.org/vocab#next": [
-      {
-        "@id": "_:c14n0"
-      }
-    ]
+    "@id": "_:c14n2"
   },
   {
     "@id": "http://example.org/vocab#test",
     "http://example.org/vocab#A": [
       {
-        "@id": "_:c14n2"
+        "@id": "_:c14n1"
       }
     ],
     "http://example.org/vocab#B": [
       {
-        "@id": "_:c14n1"
+        "@id": "_:c14n0"
       }
     ]
   }
--- a/test-suite/tests/normalize-0023-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0023-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -3,7 +3,7 @@
     "@id": "_:c14n0",
     "http://example.org/vocab#next": [
       {
-        "@id": "_:c14n1"
+        "@id": "_:c14n2"
       }
     ]
   },
@@ -11,7 +11,7 @@
     "@id": "_:c14n1",
     "http://example.org/vocab#next": [
       {
-        "@id": "_:c14n2"
+        "@id": "_:c14n0"
       }
     ]
   },
@@ -19,7 +19,7 @@
     "@id": "_:c14n2",
     "http://example.org/vocab#next": [
       {
-        "@id": "_:c14n0"
+        "@id": "_:c14n1"
       }
     ]
   }
--- a/test-suite/tests/normalize-0024-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0024-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -3,8 +3,21 @@
     "@id": "_:c14n0",
     "http://example.org/vocab#next": [
       {
+        "@id": "_:c14n2"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
         "@id": "_:c14n1"
       }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n0"
+      }
     ],
     "http://example.org/vocab#prev": [
       {
@@ -13,10 +26,10 @@
     ]
   },
   {
-    "@id": "_:c14n1",
+    "@id": "_:c14n2",
     "http://example.org/vocab#next": [
       {
-        "@id": "_:c14n2"
+        "@id": "_:c14n1"
       }
     ],
     "http://example.org/vocab#prev": [
@@ -24,18 +37,5 @@
         "@id": "_:c14n0"
       }
     ]
-  },
-  {
-    "@id": "_:c14n2",
-    "http://example.org/vocab#next": [
-      {
-        "@id": "_:c14n0"
-      }
-    ],
-    "http://example.org/vocab#prev": [
-      {
-        "@id": "_:c14n1"
-      }
-    ]
   }
 ]
\ No newline at end of file
--- a/test-suite/tests/normalize-0025-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0025-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -3,8 +3,21 @@
     "@id": "_:c14n0",
     "http://example.org/vocab#next": [
       {
+        "@id": "_:c14n2"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
         "@id": "_:c14n1"
       }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n0"
+      }
     ],
     "http://example.org/vocab#prev": [
       {
@@ -13,10 +26,10 @@
     ]
   },
   {
-    "@id": "_:c14n1",
+    "@id": "_:c14n2",
     "http://example.org/vocab#next": [
       {
-        "@id": "_:c14n2"
+        "@id": "_:c14n1"
       }
     ],
     "http://example.org/vocab#prev": [
@@ -24,18 +37,5 @@
         "@id": "_:c14n0"
       }
     ]
-  },
-  {
-    "@id": "_:c14n2",
-    "http://example.org/vocab#next": [
-      {
-        "@id": "_:c14n0"
-      }
-    ],
-    "http://example.org/vocab#prev": [
-      {
-        "@id": "_:c14n1"
-      }
-    ]
   }
 ]
\ No newline at end of file
--- a/test-suite/tests/normalize-0026-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0026-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -3,8 +3,21 @@
     "@id": "_:c14n0",
     "http://example.org/vocab#next": [
       {
+        "@id": "_:c14n2"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
         "@id": "_:c14n1"
       }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n0"
+      }
     ],
     "http://example.org/vocab#prev": [
       {
@@ -13,10 +26,10 @@
     ]
   },
   {
-    "@id": "_:c14n1",
+    "@id": "_:c14n2",
     "http://example.org/vocab#next": [
       {
-        "@id": "_:c14n2"
+        "@id": "_:c14n1"
       }
     ],
     "http://example.org/vocab#prev": [
@@ -24,18 +37,5 @@
         "@id": "_:c14n0"
       }
     ]
-  },
-  {
-    "@id": "_:c14n2",
-    "http://example.org/vocab#next": [
-      {
-        "@id": "_:c14n0"
-      }
-    ],
-    "http://example.org/vocab#prev": [
-      {
-        "@id": "_:c14n1"
-      }
-    ]
   }
 ]
\ No newline at end of file
--- a/test-suite/tests/normalize-0027-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0027-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -3,8 +3,21 @@
     "@id": "_:c14n0",
     "http://example.org/vocab#next": [
       {
+        "@id": "_:c14n2"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
         "@id": "_:c14n1"
       }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n0"
+      }
     ],
     "http://example.org/vocab#prev": [
       {
@@ -13,10 +26,10 @@
     ]
   },
   {
-    "@id": "_:c14n1",
+    "@id": "_:c14n2",
     "http://example.org/vocab#next": [
       {
-        "@id": "_:c14n2"
+        "@id": "_:c14n1"
       }
     ],
     "http://example.org/vocab#prev": [
@@ -24,18 +37,5 @@
         "@id": "_:c14n0"
       }
     ]
-  },
-  {
-    "@id": "_:c14n2",
-    "http://example.org/vocab#next": [
-      {
-        "@id": "_:c14n0"
-      }
-    ],
-    "http://example.org/vocab#prev": [
-      {
-        "@id": "_:c14n1"
-      }
-    ]
   }
 ]
\ No newline at end of file
--- a/test-suite/tests/normalize-0028-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0028-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -3,8 +3,21 @@
     "@id": "_:c14n0",
     "http://example.org/vocab#next": [
       {
+        "@id": "_:c14n2"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
         "@id": "_:c14n1"
       }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n0"
+      }
     ],
     "http://example.org/vocab#prev": [
       {
@@ -13,10 +26,10 @@
     ]
   },
   {
-    "@id": "_:c14n1",
+    "@id": "_:c14n2",
     "http://example.org/vocab#next": [
       {
-        "@id": "_:c14n2"
+        "@id": "_:c14n1"
       }
     ],
     "http://example.org/vocab#prev": [
@@ -24,18 +37,5 @@
         "@id": "_:c14n0"
       }
     ]
-  },
-  {
-    "@id": "_:c14n2",
-    "http://example.org/vocab#next": [
-      {
-        "@id": "_:c14n0"
-      }
-    ],
-    "http://example.org/vocab#prev": [
-      {
-        "@id": "_:c14n1"
-      }
-    ]
   }
 ]
\ No newline at end of file
--- a/test-suite/tests/normalize-0029-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0029-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -3,8 +3,21 @@
     "@id": "_:c14n0",
     "http://example.org/vocab#next": [
       {
+        "@id": "_:c14n2"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
         "@id": "_:c14n1"
       }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n0"
+      }
     ],
     "http://example.org/vocab#prev": [
       {
@@ -13,10 +26,10 @@
     ]
   },
   {
-    "@id": "_:c14n1",
+    "@id": "_:c14n2",
     "http://example.org/vocab#next": [
       {
-        "@id": "_:c14n2"
+        "@id": "_:c14n1"
       }
     ],
     "http://example.org/vocab#prev": [
@@ -24,18 +37,5 @@
         "@id": "_:c14n0"
       }
     ]
-  },
-  {
-    "@id": "_:c14n2",
-    "http://example.org/vocab#next": [
-      {
-        "@id": "_:c14n0"
-      }
-    ],
-    "http://example.org/vocab#prev": [
-      {
-        "@id": "_:c14n1"
-      }
-    ]
   }
 ]
\ No newline at end of file
--- a/test-suite/tests/normalize-0038-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0038-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -1,25 +1,25 @@
 [
   {
-    "@id": "_:c14n0"
+    "@id": "_:c14n0",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n3"
+      }
+    ]
   },
   {
     "@id": "_:c14n1",
     "http://example.org/vocab#p1": [
       {
         "@id": "_:c14n0"
+      },
+      {
+        "@id": "_:c14n2"
       }
     ]
   },
   {
-    "@id": "_:c14n2",
-    "http://example.org/vocab#p1": [
-      {
-        "@id": "_:c14n1"
-      },
-      {
-        "@id": "_:c14n3"
-      }
-    ]
+    "@id": "_:c14n2"
   },
   {
     "@id": "_:c14n3"
--- a/test-suite/tests/normalize-0039-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0039-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -1,25 +1,25 @@
 [
   {
-    "@id": "_:c14n0"
+    "@id": "_:c14n0",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n3"
+      }
+    ]
   },
   {
     "@id": "_:c14n1",
     "http://example.org/vocab#p1": [
       {
         "@id": "_:c14n0"
+      },
+      {
+        "@id": "_:c14n2"
       }
     ]
   },
   {
-    "@id": "_:c14n2",
-    "http://example.org/vocab#p1": [
-      {
-        "@id": "_:c14n1"
-      },
-      {
-        "@id": "_:c14n3"
-      }
-    ]
+    "@id": "_:c14n2"
   },
   {
     "@id": "_:c14n3"
--- a/test-suite/tests/normalize-0040-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0040-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -3,37 +3,37 @@
     "@id": "_:c14n0"
   },
   {
-    "@id": "_:c14n1"
+    "@id": "_:c14n1",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
   },
   {
     "@id": "_:c14n2",
     "http://example.org/vocab#p1": [
       {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n3"
+  },
+  {
+    "@id": "_:c14n4",
+    "http://example.org/vocab#p1": [
+      {
         "@id": "_:c14n3"
       }
     ]
   },
   {
-    "@id": "_:c14n3",
-    "http://example.org/vocab#p1": [
-      {
-        "@id": "_:c14n0"
-      }
-    ]
-  },
-  {
-    "@id": "_:c14n4",
-    "http://example.org/vocab#p1": [
-      {
-        "@id": "_:c14n5"
-      }
-    ]
-  },
-  {
     "@id": "_:c14n5",
     "http://example.org/vocab#p1": [
       {
-        "@id": "_:c14n1"
+        "@id": "_:c14n4"
       }
     ]
   }
--- a/test-suite/tests/normalize-0041-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0041-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -3,37 +3,37 @@
     "@id": "_:c14n0"
   },
   {
-    "@id": "_:c14n1"
+    "@id": "_:c14n1",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
   },
   {
     "@id": "_:c14n2",
     "http://example.org/vocab#p1": [
       {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n3"
+  },
+  {
+    "@id": "_:c14n4",
+    "http://example.org/vocab#p1": [
+      {
         "@id": "_:c14n3"
       }
     ]
   },
   {
-    "@id": "_:c14n3",
-    "http://example.org/vocab#p1": [
-      {
-        "@id": "_:c14n0"
-      }
-    ]
-  },
-  {
-    "@id": "_:c14n4",
-    "http://example.org/vocab#p1": [
-      {
-        "@id": "_:c14n5"
-      }
-    ]
-  },
-  {
     "@id": "_:c14n5",
     "http://example.org/vocab#p1": [
       {
-        "@id": "_:c14n1"
+        "@id": "_:c14n4"
       }
     ]
   }
--- a/test-suite/tests/normalize-0042-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0042-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -3,37 +3,37 @@
     "@id": "_:c14n0"
   },
   {
-    "@id": "_:c14n1"
+    "@id": "_:c14n1",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
   },
   {
     "@id": "_:c14n2",
     "http://example.org/vocab#p1": [
       {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n3"
+  },
+  {
+    "@id": "_:c14n4",
+    "http://example.org/vocab#p1": [
+      {
         "@id": "_:c14n3"
       }
     ]
   },
   {
-    "@id": "_:c14n3",
-    "http://example.org/vocab#p1": [
-      {
-        "@id": "_:c14n0"
-      }
-    ]
-  },
-  {
-    "@id": "_:c14n4",
-    "http://example.org/vocab#p1": [
-      {
-        "@id": "_:c14n5"
-      }
-    ]
-  },
-  {
     "@id": "_:c14n5",
     "http://example.org/vocab#p1": [
       {
-        "@id": "_:c14n1"
+        "@id": "_:c14n4"
       }
     ]
   }
--- a/test-suite/tests/normalize-0044-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0044-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -6,10 +6,10 @@
         "@id": "_:c14n1"
       },
       {
-        "@id": "_:c14n3"
+        "@id": "_:c14n2"
       },
       {
-        "@id": "_:c14n5"
+        "@id": "_:c14n3"
       }
     ]
   },
@@ -17,13 +17,13 @@
     "@id": "_:c14n1",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n2"
+        "@id": "_:c14n0"
       },
       {
         "@id": "_:c14n4"
       },
       {
-        "@id": "_:c14n0"
+        "@id": "_:c14n5"
       }
     ]
   },
@@ -31,10 +31,10 @@
     "@id": "_:c14n10",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n9"
+        "@id": "_:c14n8"
       },
       {
-        "@id": "_:c14n8"
+        "@id": "_:c14n9"
       },
       {
         "@id": "_:c14n11"
@@ -45,13 +45,13 @@
     "@id": "_:c14n11",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n10"
+        "@id": "_:c14n7"
       },
       {
-        "@id": "_:c14n6"
+        "@id": "_:c14n9"
       },
       {
-        "@id": "_:c14n7"
+        "@id": "_:c14n10"
       }
     ]
   },
@@ -59,10 +59,10 @@
     "@id": "_:c14n2",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n1"
+        "@id": "_:c14n0"
       },
       {
-        "@id": "_:c14n3"
+        "@id": "_:c14n4"
       },
       {
         "@id": "_:c14n5"
@@ -73,13 +73,13 @@
     "@id": "_:c14n3",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n2"
+        "@id": "_:c14n0"
       },
       {
         "@id": "_:c14n4"
       },
       {
-        "@id": "_:c14n0"
+        "@id": "_:c14n5"
       }
     ]
   },
@@ -90,10 +90,10 @@
         "@id": "_:c14n1"
       },
       {
-        "@id": "_:c14n3"
+        "@id": "_:c14n2"
       },
       {
-        "@id": "_:c14n5"
+        "@id": "_:c14n3"
       }
     ]
   },
@@ -101,13 +101,13 @@
     "@id": "_:c14n5",
     "http://example.org/vocab#p": [
       {
+        "@id": "_:c14n1"
+      },
+      {
         "@id": "_:c14n2"
       },
       {
-        "@id": "_:c14n4"
-      },
-      {
-        "@id": "_:c14n0"
+        "@id": "_:c14n3"
       }
     ]
   },
@@ -115,13 +115,13 @@
     "@id": "_:c14n6",
     "http://example.org/vocab#p": [
       {
+        "@id": "_:c14n7"
+      },
+      {
         "@id": "_:c14n9"
       },
       {
-        "@id": "_:c14n11"
-      },
-      {
-        "@id": "_:c14n7"
+        "@id": "_:c14n8"
       }
     ]
   },
@@ -129,10 +129,10 @@
     "@id": "_:c14n7",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n8"
+        "@id": "_:c14n6"
       },
       {
-        "@id": "_:c14n6"
+        "@id": "_:c14n8"
       },
       {
         "@id": "_:c14n11"
@@ -143,13 +143,13 @@
     "@id": "_:c14n8",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n9"
+        "@id": "_:c14n6"
+      },
+      {
+        "@id": "_:c14n7"
       },
       {
         "@id": "_:c14n10"
-      },
-      {
-        "@id": "_:c14n7"
       }
     ]
   },
@@ -157,13 +157,13 @@
     "@id": "_:c14n9",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n10"
-      },
-      {
         "@id": "_:c14n6"
       },
       {
-        "@id": "_:c14n8"
+        "@id": "_:c14n11"
+      },
+      {
+        "@id": "_:c14n10"
       }
     ]
   }
--- a/test-suite/tests/normalize-0045-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0045-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -6,10 +6,10 @@
         "@id": "_:c14n1"
       },
       {
-        "@id": "_:c14n3"
+        "@id": "_:c14n2"
       },
       {
-        "@id": "_:c14n5"
+        "@id": "_:c14n3"
       }
     ]
   },
@@ -17,13 +17,13 @@
     "@id": "_:c14n1",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n2"
+        "@id": "_:c14n0"
       },
       {
         "@id": "_:c14n4"
       },
       {
-        "@id": "_:c14n0"
+        "@id": "_:c14n5"
       }
     ]
   },
@@ -31,10 +31,10 @@
     "@id": "_:c14n10",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n9"
+        "@id": "_:c14n8"
       },
       {
-        "@id": "_:c14n8"
+        "@id": "_:c14n9"
       },
       {
         "@id": "_:c14n11"
@@ -45,13 +45,13 @@
     "@id": "_:c14n11",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n10"
+        "@id": "_:c14n7"
       },
       {
-        "@id": "_:c14n6"
+        "@id": "_:c14n9"
       },
       {
-        "@id": "_:c14n7"
+        "@id": "_:c14n10"
       }
     ]
   },
@@ -59,10 +59,10 @@
     "@id": "_:c14n2",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n1"
+        "@id": "_:c14n0"
       },
       {
-        "@id": "_:c14n3"
+        "@id": "_:c14n4"
       },
       {
         "@id": "_:c14n5"
@@ -73,13 +73,13 @@
     "@id": "_:c14n3",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n2"
+        "@id": "_:c14n0"
       },
       {
         "@id": "_:c14n4"
       },
       {
-        "@id": "_:c14n0"
+        "@id": "_:c14n5"
       }
     ]
   },
@@ -90,10 +90,10 @@
         "@id": "_:c14n1"
       },
       {
-        "@id": "_:c14n3"
+        "@id": "_:c14n2"
       },
       {
-        "@id": "_:c14n5"
+        "@id": "_:c14n3"
       }
     ]
   },
@@ -101,13 +101,13 @@
     "@id": "_:c14n5",
     "http://example.org/vocab#p": [
       {
+        "@id": "_:c14n1"
+      },
+      {
         "@id": "_:c14n2"
       },
       {
-        "@id": "_:c14n4"
-      },
-      {
-        "@id": "_:c14n0"
+        "@id": "_:c14n3"
       }
     ]
   },
@@ -115,13 +115,13 @@
     "@id": "_:c14n6",
     "http://example.org/vocab#p": [
       {
+        "@id": "_:c14n7"
+      },
+      {
         "@id": "_:c14n9"
       },
       {
-        "@id": "_:c14n11"
-      },
-      {
-        "@id": "_:c14n7"
+        "@id": "_:c14n8"
       }
     ]
   },
@@ -129,10 +129,10 @@
     "@id": "_:c14n7",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n8"
+        "@id": "_:c14n6"
       },
       {
-        "@id": "_:c14n6"
+        "@id": "_:c14n8"
       },
       {
         "@id": "_:c14n11"
@@ -143,13 +143,13 @@
     "@id": "_:c14n8",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n9"
+        "@id": "_:c14n6"
+      },
+      {
+        "@id": "_:c14n7"
       },
       {
         "@id": "_:c14n10"
-      },
-      {
-        "@id": "_:c14n7"
       }
     ]
   },
@@ -157,13 +157,13 @@
     "@id": "_:c14n9",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n10"
-      },
-      {
         "@id": "_:c14n6"
       },
       {
-        "@id": "_:c14n8"
+        "@id": "_:c14n11"
+      },
+      {
+        "@id": "_:c14n10"
       }
     ]
   }
--- a/test-suite/tests/normalize-0046-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0046-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -6,10 +6,10 @@
         "@id": "_:c14n1"
       },
       {
-        "@id": "_:c14n3"
+        "@id": "_:c14n2"
       },
       {
-        "@id": "_:c14n5"
+        "@id": "_:c14n3"
       }
     ]
   },
@@ -17,13 +17,13 @@
     "@id": "_:c14n1",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n2"
+        "@id": "_:c14n0"
       },
       {
         "@id": "_:c14n4"
       },
       {
-        "@id": "_:c14n0"
+        "@id": "_:c14n5"
       }
     ]
   },
@@ -31,10 +31,10 @@
     "@id": "_:c14n10",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n9"
+        "@id": "_:c14n8"
       },
       {
-        "@id": "_:c14n8"
+        "@id": "_:c14n9"
       },
       {
         "@id": "_:c14n11"
@@ -45,13 +45,13 @@
     "@id": "_:c14n11",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n10"
+        "@id": "_:c14n7"
       },
       {
-        "@id": "_:c14n6"
+        "@id": "_:c14n9"
       },
       {
-        "@id": "_:c14n7"
+        "@id": "_:c14n10"
       }
     ]
   },
@@ -59,10 +59,10 @@
     "@id": "_:c14n2",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n1"
+        "@id": "_:c14n0"
       },
       {
-        "@id": "_:c14n3"
+        "@id": "_:c14n4"
       },
       {
         "@id": "_:c14n5"
@@ -73,13 +73,13 @@
     "@id": "_:c14n3",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n2"
+        "@id": "_:c14n0"
       },
       {
         "@id": "_:c14n4"
       },
       {
-        "@id": "_:c14n0"
+        "@id": "_:c14n5"
       }
     ]
   },
@@ -90,10 +90,10 @@
         "@id": "_:c14n1"
       },
       {
-        "@id": "_:c14n3"
+        "@id": "_:c14n2"
       },
       {
-        "@id": "_:c14n5"
+        "@id": "_:c14n3"
       }
     ]
   },
@@ -101,13 +101,13 @@
     "@id": "_:c14n5",
     "http://example.org/vocab#p": [
       {
+        "@id": "_:c14n1"
+      },
+      {
         "@id": "_:c14n2"
       },
       {
-        "@id": "_:c14n4"
-      },
-      {
-        "@id": "_:c14n0"
+        "@id": "_:c14n3"
       }
     ]
   },
@@ -115,13 +115,13 @@
     "@id": "_:c14n6",
     "http://example.org/vocab#p": [
       {
+        "@id": "_:c14n7"
+      },
+      {
         "@id": "_:c14n9"
       },
       {
-        "@id": "_:c14n11"
-      },
-      {
-        "@id": "_:c14n7"
+        "@id": "_:c14n8"
       }
     ]
   },
@@ -129,10 +129,10 @@
     "@id": "_:c14n7",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n8"
+        "@id": "_:c14n6"
       },
       {
-        "@id": "_:c14n6"
+        "@id": "_:c14n8"
       },
       {
         "@id": "_:c14n11"
@@ -143,13 +143,13 @@
     "@id": "_:c14n8",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n9"
+        "@id": "_:c14n6"
+      },
+      {
+        "@id": "_:c14n7"
       },
       {
         "@id": "_:c14n10"
-      },
-      {
-        "@id": "_:c14n7"
       }
     ]
   },
@@ -157,13 +157,13 @@
     "@id": "_:c14n9",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n10"
-      },
-      {
         "@id": "_:c14n6"
       },
       {
-        "@id": "_:c14n8"
+        "@id": "_:c14n11"
+      },
+      {
+        "@id": "_:c14n10"
       }
     ]
   }
--- a/test-suite/tests/normalize-0047-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0047-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -1,10 +1,9 @@
 [
   {
     "@id": "_:c14n0",
-    "http://example.org/vocab#p": [
-      {
-        "@id": "_:c14n1"
-      }
+    "http://example.org/vocab#z": [
+      "bar1",
+      "bar2"
     ]
   },
   {
@@ -18,7 +17,7 @@
     "@id": "_:c14n2",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n3"
+        "@id": "_:c14n0"
       }
     ]
   },
@@ -26,22 +25,23 @@
     "@id": "_:c14n3",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n4"
+        "@id": "_:c14n1"
       }
     ]
   },
   {
     "@id": "_:c14n4",
-    "http://example.org/vocab#z": [
-      "bar1",
-      "bar2"
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n3"
+      }
     ]
   },
   {
     "@id": "_:c14n5",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n0"
+        "@id": "_:c14n2"
       }
     ]
   }
--- a/test-suite/tests/normalize-0048-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0048-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -1,10 +1,9 @@
 [
   {
     "@id": "_:c14n0",
-    "http://example.org/vocab#p": [
-      {
-        "@id": "_:c14n1"
-      }
+    "http://example.org/vocab#z": [
+      "bar1",
+      "bar2"
     ]
   },
   {
@@ -18,7 +17,7 @@
     "@id": "_:c14n2",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n3"
+        "@id": "_:c14n0"
       }
     ]
   },
@@ -26,22 +25,23 @@
     "@id": "_:c14n3",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n4"
+        "@id": "_:c14n1"
       }
     ]
   },
   {
     "@id": "_:c14n4",
-    "http://example.org/vocab#z": [
-      "bar1",
-      "bar2"
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n3"
+      }
     ]
   },
   {
     "@id": "_:c14n5",
     "http://example.org/vocab#p": [
       {
-        "@id": "_:c14n0"
+        "@id": "_:c14n2"
       }
     ]
   }
--- a/test-suite/tests/normalize-0050-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0050-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -1,6 +1,9 @@
 [
   {
-    "@id": "_:c14n0",
+    "@id": "_:c14n0"
+  },
+  {
+    "@id": "_:c14n1",
     "http://example.org/vocab#array": [
       "value"
     ],
@@ -9,11 +12,8 @@
     ],
     "http://example.org/vocab#object": [
       {
-        "@id": "_:c14n1"
+        "@id": "_:c14n0"
       }
     ]
-  },
-  {
-    "@id": "_:c14n1"
   }
 ]
\ No newline at end of file
--- a/test-suite/tests/normalize-0053-out.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-0053-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -2,18 +2,18 @@
   {
     "@id": "_:c14n0",
     "http://www.w3.org/1999/02/22-rdf-syntax-ns#first": [
-      "4"
+      "6"
     ],
     "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest": [
       {
-        "@id": "_:c14n1"
+        "@id": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
       }
     ]
   },
   {
     "@id": "_:c14n1",
     "http://www.w3.org/1999/02/22-rdf-syntax-ns#first": [
-      "5"
+      "4"
     ],
     "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest": [
       {
@@ -24,11 +24,11 @@
   {
     "@id": "_:c14n2",
     "http://www.w3.org/1999/02/22-rdf-syntax-ns#first": [
-      "6"
+      "5"
     ],
     "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest": [
       {
-        "@id": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        "@id": "_:c14n0"
       }
     ]
   },
@@ -39,13 +39,37 @@
     ],
     "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest": [
       {
-        "@id": "_:c14n4"
+        "@id": "_:c14n6"
       }
     ]
   },
   {
     "@id": "_:c14n4",
     "http://www.w3.org/1999/02/22-rdf-syntax-ns#first": [
+      "1"
+    ],
+    "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest": [
+      {
+        "@id": "_:c14n3"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n5",
+    "http://example.org/test#property1": [
+      {
+        "@id": "_:c14n4"
+      }
+    ],
+    "http://example.org/test#property2": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n6",
+    "http://www.w3.org/1999/02/22-rdf-syntax-ns#first": [
       "3"
     ],
     "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest": [
@@ -55,30 +79,6 @@
     ]
   },
   {
-    "@id": "_:c14n5",
-    "http://www.w3.org/1999/02/22-rdf-syntax-ns#first": [
-      "1"
-    ],
-    "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest": [
-      {
-        "@id": "_:c14n3"
-      }
-    ]
-  },
-  {
-    "@id": "_:c14n6",
-    "http://example.org/test#property1": [
-      {
-        "@id": "_:c14n5"
-      }
-    ],
-    "http://example.org/test#property2": [
-      {
-        "@id": "_:c14n0"
-      }
-    ]
-  },
-  {
     "@id": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
   }
 ]
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-suite/tests/normalize-0054-in.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -0,0 +1,64 @@
+{
+  "@context": {
+    "eg": "http://example.org/vocab#",
+    "eg:p": {"@type": "@id"}
+  },
+  "@graph": [
+    {
+      "@id": "_:a",
+      "eg:p": "_:b"
+    },
+    {
+      "@id": "_:b",
+      "eg:p": "_:c"
+    },
+    {
+      "@id": "_:c",
+      "eg:p": ["_:d","_:z"]
+    },
+    {
+      "@id": "_:d",
+      "eg:p": "_:e"
+    },
+    {
+      "@id": "_:e",
+      "eg:p": "_:f"
+    },
+    {
+      "@id": "_:f",
+      "eg:p": "_:g"
+    },
+    {
+      "@id": "_:g",
+      "eg:p": "_:h"
+    },
+    {
+      "@id": "_:h",
+      "eg:p": "_:i"
+    },
+    {
+      "@id": "_:z",
+      "eg:p": "_:w"
+    },
+    {
+      "@id": "_:w",
+      "eg:p": "_:x"
+    },
+    {
+      "@id": "_:x",
+      "eg:p": "_:y"
+    },
+    {
+      "@id": "_:y",
+      "eg:p": "_:v"
+    },
+    {
+      "@id": "_:v",
+      "eg:p": "_:u"
+    },
+    {
+      "@id": "_:u",
+      "eg:p": "_:t"
+    }
+  ]
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-suite/tests/normalize-0054-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -0,0 +1,123 @@
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n2"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n8"
+      },
+      {
+        "@id": "_:c14n15"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n10",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n9"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n11",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n10"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n12",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n11"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n13",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n12"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n14",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n13"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n15",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n14"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n3"
+  },
+  {
+    "@id": "_:c14n4",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n3"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n5",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n4"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n6",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n5"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n7",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n6"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n8",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n7"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n9"
+  }
+]
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-suite/tests/normalize-0055-in.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -0,0 +1,16 @@
+{
+  "@context": {
+    "eg": "http://example.org/vocab#",
+    "eg:p": {"@type": "@id"}
+  },
+  "@graph": [
+    {
+      "@id": "_:a",
+      "eg:p": ["_:b", "http://example.com"]
+    },
+    {
+      "@id": "_:b",
+      "eg:p": "http://example.org"
+    }
+  ]
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-suite/tests/normalize-0055-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -0,0 +1,27 @@
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n1"
+      },
+      {
+        "@id": "http://example.com"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "http://example.org"
+      }
+    ]
+  },
+  {
+    "@id": "http://example.com"
+  },
+  {
+    "@id": "http://example.org"
+  }
+]
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-suite/tests/normalize-0056-in.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -0,0 +1,16 @@
+{
+  "@context": {
+    "eg": "http://example.org/vocab#",
+    "eg:p": {"@type": "@id"}
+  },
+  "@graph": [
+    {
+      "@id": "_:b",
+      "eg:p": "http://example.org"
+    },
+    {
+      "@id": "_:a",
+      "eg:p": ["_:b", "http://example.com"]
+    }
+  ]
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-suite/tests/normalize-0056-out.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -0,0 +1,27 @@
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n1"
+      },
+      {
+        "@id": "http://example.com"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "http://example.org"
+      }
+    ]
+  },
+  {
+    "@id": "http://example.com"
+  },
+  {
+    "@id": "http://example.org"
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-manifest.jsonld	Mon Apr 09 19:24:24 2012 +0800
+++ b/test-suite/tests/normalize-manifest.jsonld	Mon Apr 09 14:08:59 2012 -0400
@@ -269,5 +269,20 @@
     "name": "@list",
     "input": "normalize-0053-in.jsonld",
     "expect": "normalize-0053-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "t-graph",
+    "input": "normalize-0054-in.jsonld",
+    "expect": "normalize-0054-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "simple reorder (1)",
+    "input": "normalize-0055-in.jsonld",
+    "expect": "normalize-0055-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "simple reorder (2)",
+    "input": "normalize-0056-in.jsonld",
+    "expect": "normalize-0056-out.jsonld"
   }]
 }