Updates test

Moves to ExtendedFunctionalityTests

Refactors to create room for more extended functionality tests

Author: dnllowe

test/json-ld.net.tests/Sorting/W3C/fromRdf-in.json renamed to test/json-ld.net.tests/ExtendedFunctionality/Sorting/fromRdf-in.json

@@ -8,10 +8,12 @@
 
 namespace JsonLD.Test
 {
-    public class SortingTests
+    public class ExtendedFunctionalityTests
     {
-        [Theory, MemberData(nameof(SortingTestCases))]
-        public void RunJsonLdApi(string id, SortingTestCase testCase)
+        public const string ManifestRoot = "ExtendedFunctionality";
+
+        [Theory, MemberData(nameof(ExtendedFunctionalityCases))]
+        public void ExtendedFunctionalityTestPasses(string id, ExtendedFunctionalityTestCase testCase)
         {
             JToken result = testCase.run();
             if (testCase.error != null)
@@ -37,7 +39,7 @@ public void RunJsonLdApi(string id, SortingTestCase testCase)
             }
         }
 
-        public class SortingTestCase
+        public class ExtendedFunctionalityTestCase
         {
             public JToken  input { get; set; }
             public JToken output { get; set; }
@@ -47,28 +49,33 @@ public class SortingTestCase
             public Func<JToken> run { get; set; }
         }
 
-        private static string[] GetManifests()
+        public static IEnumerable<object[]> ExtendedFunctionalityCases()
         {
-            return new[] {
-            "fromRdf-manifest.jsonld",
-            //"compact-manifest.jsonld"
-            };
+            foreach (var testCase in SortingTestCases())
+            {
+                yield return testCase;
+            }
         }
 
+        private static string[] SortingManifests =
+        {
+            "fromRdf-manifest.jsonld"
+        };
+
         public static IEnumerable<object[]> SortingTestCases()
         {
-            var manifests = GetManifests();
             var jsonFetcher = new JsonFetcher();
-            var rootDirectory = Path.Combine("Sorting", "W3C");
-
-            foreach (string manifest in manifests)
+            var rootDirectory = Path.Combine(ManifestRoot, "Sorting");
+            var cases = new List<object[]> { };
+            
+            foreach (string manifest in SortingManifests)
             {
                 JToken manifestJson = jsonFetcher.GetJson(manifest, rootDirectory);
 
                 foreach (JObject testcase in manifestJson["sequence"])
                 {
                     Func<JToken> run = null;
-                    SortingTestCase newCase = new SortingTestCase();
+                    ExtendedFunctionalityTestCase newCase = new ExtendedFunctionalityTestCase();
 
                     newCase.input = jsonFetcher.GetJson(manifestJson["input"], rootDirectory);
                     newCase.output = jsonFetcher.GetJson(testcase["expect"], rootDirectory);
@@ -102,14 +109,7 @@ public static IEnumerable<object[]> SortingTestCases()
 
                     var testType = (string)testcase["test-type"];
 
-                    if (testType == "jld:Compact")
-                    {
-                        newCase.context = jsonFetcher.GetJson(manifestJson["test-context"], rootDirectory);
-                        Context activeCtx = new Context(newCase.context, options);
-
-                        run = () => jsonLdApi.Compact(activeCtx, null, newCase.input);
-                    }
-                    else if (testType == "jld:FromRDF")
+                    if (testType == "jld:FromRDF")
                     {
                         JToken quads = newCase.input["quads"];
                         RDFDataset rdf = new RDFDataset();

test/json-ld.net.tests/Sorting/W3C/fromRdf-manifest.jsonld renamed to test/json-ld.net.tests/ExtendedFunctionality/Sorting/fromRdf-manifest.jsonld

@@ -28,31 +28,22 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="Sorting\W3C\compact-context.jsonld">
+    <None Update="ExtendedFunctionality\Sorting\fromRdf-out-sort-graph-nodes.jsonld">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Sorting\W3C\compact-in.jsonld">
+    <None Update="ExtendedFunctionality\Sorting\fromRdf-out-no-sorting.jsonld">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Sorting\W3C\compact-manifest.jsonld">
+    <None Update="ExtendedFunctionality\Sorting\fromRdf-out-sort-graphs.jsonld">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Sorting\W3C\fromRdf-out-sort-graph-nodes.jsonld">
+    <None Update="ExtendedFunctionality\Sorting\fromRdf-out-sort-graphs-and-nodes.jsonld">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Sorting\W3C\fromRdf-out-no-sorting.jsonld">
+    <None Update="ExtendedFunctionality\Sorting\fromRdf-manifest.jsonld">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Sorting\W3C\fromRdf-out-sort-graphs.jsonld">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Sorting\W3C\fromRdf-out-sort-graphs-and-nodes.jsonld">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Sorting\W3C\fromRdf-manifest.jsonld">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Sorting\W3C\fromRdf-in.json">
+    <None Update="ExtendedFunctionality\Sorting\fromRdf-in.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>