Resolve ttu#19 - Added get root to IDataStore and changed location of…

… tests
colbytimm · Feb 21, 2022 · 75c3a53 · 75c3a53
1 parent 9d04821
commit 75c3a53
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 38 deletions.
diff --git a/JsonFlatFileDataStore.Test/DataStoreTests.cs b/JsonFlatFileDataStore.Test/DataStoreTests.cs
@@ -419,41 +419,6 @@ public async Task Insert_CorrectIdWithDynamic_With_InitialId()
             UTHelpers.Down(pathToJson);
         }
 
-        [Fact]
-        public void GetRoot_Dynamic()
-        {
-            var pathToJson = UTHelpers.Up();
-
-            var store = new DataStore(pathToJson);
-
-            // Get root
-            var root = store.GetRoot();
-
-            Assert.Equal(1, root.user[0].id);
-            Assert.Equal(2.1, root.myValue);
-            Assert.Equal("Carrillo", root.family[0].parents[0].name);
-
-            UTHelpers.Down(pathToJson);
-        }
-
-        [Fact]
-        public void GetRoot_Typed()
-        {
-            var pathToJson = UTHelpers.Up();
-
-            // Open database (create new if file doesn't exist)
-            var store = new DataStore(pathToJson);
-
-            // Get root
-            var root = store.GetRoot<Store>();
-
-            Assert.Equal(1, root.User.First().Id);
-            Assert.Equal(2.1, root.MyValue);
-            Assert.Equal("Carrillo", root.Family.First().Parents.First().Name);
-
-            UTHelpers.Down(pathToJson);
-        }
-
         [Fact]
         public async Task Readme_Example3()
         {

diff --git a/JsonFlatFileDataStore.Test/SingleItemTests.cs b/JsonFlatFileDataStore.Test/SingleItemTests.cs
@@ -100,6 +100,41 @@ public void GetItem_Nullable_NotFound()
             UTHelpers.Down(newFilePath);
         }
 
+        [Fact]
+        public void GetRoot_Dynamic()
+        {
+            var pathToJson = UTHelpers.Up();
+
+            var store = new DataStore(pathToJson);
+
+            // Get root
+            var root = store.GetRoot();
+
+            Assert.Equal(1, root.user[0].id);
+            Assert.Equal(2.1, root.myValue);
+            Assert.Equal("Carrillo", root.family[0].parents[0].name);
+
+            UTHelpers.Down(pathToJson);
+        }
+
+        [Fact]
+        public void GetRoot_Typed()
+        {
+            var pathToJson = UTHelpers.Up();
+
+            // Open database (create new if file doesn't exist)
+            var store = new DataStore(pathToJson);
+
+            // Get root
+            var root = store.GetRoot<Store>();
+
+            Assert.Equal(1, root.User.First().Id);
+            Assert.Equal(2.1, root.MyValue);
+            Assert.Equal("Carrillo", root.Family.First().Parents.First().Name);
+
+            UTHelpers.Down(pathToJson);
+        }
+
         [Fact]
         public void NotFound_Exception()
         {

diff --git a/JsonFlatFileDataStore/DataStore.cs b/JsonFlatFileDataStore/DataStore.cs
@@ -468,9 +468,7 @@ public T GetRoot<T>()
                 throw new KeyNotFoundException();
             }
 
-            var temp = _jsonData.ToObject<T>();
-
-            return temp;
+            return _jsonData.ToObject<T>();
         }
 
         private dynamic SingleDynamicItemReadConverter(JToken e)

diff --git a/JsonFlatFileDataStore/IDataStore.cs b/JsonFlatFileDataStore/IDataStore.cs
@@ -129,6 +129,19 @@ public interface IDataStore : IDisposable
         /// <param name="key">Item key</param>
         /// <returns>true if items found for deletion</returns>
         Task<bool> DeleteItemAsync(string key);
+
+        /// <summary>
+        /// Get root item
+        /// </summary>
+        /// <returns>Dynamic item</returns>
+        dynamic GetRoot();
+
+        /// <summary>
+        /// Get root item
+        /// </summary>
+        /// <typeparam name="T">Item type</typeparam>
+        /// <returns>Typed item</returns>
+        T GetRoot<T>();
     }
 
     public enum ValueType