fixed tests

_src/Implementation/Repositories/JsonRepository.cs

@@ -9,7 +9,7 @@
 
 namespace Implementation.Repositories
 {
-    internal class JsonRepository<T> : IJsonRepository<T> where T: IEntity
+    internal class JsonRepository<T> : IJsonRepository<T> where T : IEntity
     {
         private readonly string _dataPath;
         private readonly string _filePath;
@@ -18,18 +18,18 @@ internal class JsonRepository<T> : IJsonRepository<T> where T: IEntity
         private readonly IList<T> _addedEntities;
         private readonly IList<Guid> _removedEntities;
         private bool _isLocked = false;
-        
+
         public JsonRepository(string filePath)
         {
             _updatedEntities = new List<T>();
             _addedEntities = new List<T>();
             _removedEntities = new List<Guid>();
-            
+
             _id = Guid.NewGuid();
             _filePath = filePath ?? throw new ArgumentNullException(nameof(filePath));
-            _dataPath = "./";
+            _dataPath = Path.GetDirectoryName(filePath) ?? @".\";
         }
-        
+
         public JsonRepository(string directory, string repositoryKey)
         {
             _updatedEntities = new List<T>();
@@ -40,9 +40,9 @@ public JsonRepository(string directory, string repositoryKey)
             _dataPath = directory ?? throw new ArgumentNullException(nameof(directory));
             _filePath = $@"{_dataPath}\{repositoryKey}.json";
         }
+
         public async Task<IEnumerable<T>> GetAllEntities()
         {
-            await SaveChanges();
             return await GetAllContent();
         }
         public async Task<T?> GetEntity(Guid id)
@@ -82,6 +82,7 @@ private async Task CreateRepository()
 
         private async Task<IEnumerable<T>> GetAllContent()
         {
+            await SaveChanges();
             var allContent = await File.ReadAllTextAsync(_filePath);
             return await Task.Factory.StartNew(() => JsonConvert.DeserializeObject<IEnumerable<T>>(allContent));
         }
@@ -106,29 +107,34 @@ public async Task<IRepository<T>> SaveChanges()
                     currentContent.Add(updatedEntity);
                 }
             }
-            
+
             foreach (var id in _removedEntities)
             {
                 if (currentContent.Any(e => e.Id.Equals(id)))
                 {
                     currentContent.Remove(currentContent.First(e => e.Id.Equals(id)));
                 }
             }
-            
+
             var newContent = await Task.Factory.StartNew(() => JsonConvert.SerializeObject(currentContent));
             await File.WriteAllTextAsync(_filePath, newContent);
             _isLocked = false;
             return await Task.FromResult<IRepository<T>>(this);
         }
-        
+
         public async ValueTask DisposeAsync()
         {
             await SaveChanges();
         }
-        
+
         public void Dispose()
         {
-            new Task(async () => { await SaveChanges(); }).RunSynchronously();
+            new Task(Action).RunSynchronously();
+        }
+
+        private async void Action()
+        {
+            await SaveChanges();
         }
     }
 }

_src/_Tests/ImplementationTest/RepositoryTests/JsonRepositoriesTests.cs

@@ -17,13 +17,11 @@ public async Task JRT_0001_Given_InExistentJsonRepository_When_ConstructorCalled
             var fileName = $@".\data\users-{id}.json";
             try
             {
-                await using (var repository = new JsonRepository<User>(fileName))
-                {
-                    await repository.SaveChanges();
-                    Assert.True(File.Exists(fileName));
-                    var text = await File.ReadAllTextAsync(fileName);
-                    Assert.Equal("[]", text);
-                }
+                await using var repository = new JsonRepository<User>(@".\data", $"users-{id}");
+                await repository.DisposeAsync();
+                Assert.True(File.Exists(fileName));
+                var text = await File.ReadAllTextAsync(fileName);
+                Assert.Equal("[]", text);
             }
             finally
             {