Change project Name, Add JSON.GET command + tests

Author: shacharPash

.vscode/launch.json

@@ -9,9 +9,9 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/tests/RediSharp.Tests/bin/Debug/net6.0/RediSharp.Tests.dll",
+            "program": "${workspaceFolder}/tests/NRedisStack.Tests/bin/Debug/net6.0/NRedisStack.Tests.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/tests/RediSharp.Tests",
+            "cwd": "${workspaceFolder}/tests/NRedisStack.Tests",
             "console": "internalConsole",
             "stopAtEntry": false
         },

.vscode/tasks.json

@@ -7,7 +7,7 @@
             "type": "process",
             "args": [
                 "build",
-                "${workspaceFolder}/tests/RediSharp.Tests/RediSharp.Tests.csproj",
+                "${workspaceFolder}/tests/NRedisStack.Tests/NRedisStack.Tests.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -19,7 +19,7 @@
             "type": "process",
             "args": [
                 "publish",
-                "${workspaceFolder}/tests/RediSharp.Tests/RediSharp.Tests.csproj",
+                "${workspaceFolder}/tests/NRedisStack.Tests/NRedisStack.Tests.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -33,7 +33,7 @@
                 "watch",
                 "run",
                 "--project",
-                "${workspaceFolder}/tests/RediSharp.Tests/RediSharp.Tests.csproj"
+                "${workspaceFolder}/tests/NRedisStack.Tests/NRedisStack.Tests.csproj"
             ],
             "problemMatcher": "$msCompile"
         }

RediSharp.sln renamed to NRedisStack.sln

@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30114.105
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RediSharp.Core", "src\RediSharp.Core\RediSharp.Core.csproj", "{6F5E84A5-DFC1-4747-AF7D-97BDAFA9102D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRedisStack.Core", "src\NRedisStack.Core\NRedisStack.Core.csproj", "{6F5E84A5-DFC1-4747-AF7D-97BDAFA9102D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RediSharp.Tests", "tests\RediSharp.Tests\RediSharp.Tests.csproj", "{73B56C35-BC92-4ACD-B077-7D55CD67B95F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRedisStack.Tests", "tests\NRedisStack.Tests\NRedisStack.Tests.csproj", "{73B56C35-BC92-4ACD-B077-7D55CD67B95F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/RediSharp.Core/RediSharp.Core.csproj renamed to src/NRedisStack.Core/NRedisStack.Core.csproj

@@ -1,7 +1,7 @@
 using StackExchange.Redis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-namespace RediSharp.Core;
+namespace NRedisStack.Core;
 
 public static class RedisJsonCommands
 {
@@ -11,7 +11,12 @@ public static class RedisJsonCommands
     };
     public static RedisResult JsonSet(this IDatabase db, RedisKey key, string path, object obj, When when = When.Always)
     {
-        var json = JsonSerializer.Serialize(obj);
+        string json = JsonSerializer.Serialize(obj);
+        return JsonSet(db, key, path, json, when);
+    }
+
+    public static RedisResult JsonSet(this IDatabase db, RedisKey key, string path, string json, When when = When.Always)
+    {
         switch(when)
         {
             case When.Exists:
@@ -22,4 +27,9 @@ public static RedisResult JsonSet(this IDatabase db, RedisKey key, string path,
                 return db.Execute("JSON.SET", key, path, json);
         }
     }
+
+    public static RedisResult JsonGet(this IDatabase db, RedisKey key)
+    {
+        return db.Execute("JSON.GET", key);
+    }
 }

src/RediSharp.Core/RedisJsonCommands.cs renamed to src/NRedisStack.Core/RedisJsonCommands.cs

@@ -0,0 +1,44 @@
+
+using StackExchange.Redis;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using Xunit;
+namespace NRedisStack.Tests
+{
+    public abstract class AbstractNRedisStackTest : IClassFixture<RedisFixture>, IAsyncLifetime
+    {
+        protected internal RedisFixture redisFixture;
+
+        protected internal AbstractNRedisStackTest(RedisFixture redisFixture) => this.redisFixture = redisFixture;
+
+        private List<string> keyNames = new List<string>();
+
+        protected internal string CreateKeyName([CallerMemberName] string memberName = "") => CreateKeyNames(1, memberName)[0];
+
+        protected internal string[] CreateKeyNames(int count, [CallerMemberName] string memberName = "")
+        {
+            if (count < 1) throw new ArgumentOutOfRangeException(nameof(count), "Must be greater than zero.");
+
+            var newKeys = new string[count];
+            for (var i = 0; i < count; i++)
+            {
+                newKeys[i] = $"{GetType().Name}:{memberName}:{i}";
+            }
+
+            keyNames.AddRange(newKeys);
+
+            return newKeys;
+        }
+
+        public Task InitializeAsync() => Task.CompletedTask;
+
+        public async Task DisposeAsync()
+        {
+            var redis = redisFixture.Redis.GetDatabase();
+            await redis.KeyDeleteAsync(keyNames.Select(i => (RedisKey)i).ToArray());
+        }
+    }
+}

tests/NRedisStack.Tests/AbstractNRedisStackTest.cs

@@ -4,18 +4,26 @@
 using StackExchange.Redis;
 using System.Linq;
 using System.IO;
-using RediSharp.Core;
+using NRedisStack.Core;
 using Moq;
 
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
 
-namespace RediSharp.Tests;
+namespace NRedisStack.Tests;
 
-public class UnitTest1
+public class JsonTests : AbstractNRedisStackTest, IDisposable
 {
     Mock<IDatabase> _mock = new Mock<IDatabase>();
+    private readonly string key = "JSON_TESTS";
+    public JsonTests(RedisFixture redisFixture) : base(redisFixture) { }
+
+    public void Dispose()
+    {
+        redisFixture.Redis.GetDatabase().KeyDelete(key);
+    }
+
     public class Person
     {
         public string Name { get; set; }
@@ -24,14 +32,6 @@ public class Person
 
     [Fact]
     public void TestJsonSet()
-    {
-        var obj = new Person { Name = "Shachar", Age = 23 };
-        _mock.Object.JsonSet("Person:Shachar", "$", obj);
-        _mock.Verify(x => x.Execute("JSON.SET", "Person:Shachar", "$", "{\"Name\":\"Shachar\",\"Age\":23}"));
-    }
-
-    [Fact]
-    public void TestJsonSetExist()
     {
         var obj = new Person { Name = "Shachar", Age = 23 };
         _mock.Object.JsonSet("Person:Shachar", "$", obj, When.Exists);
@@ -45,4 +45,15 @@ public void TestJsonSetNotExist()
         _mock.Object.JsonSet("Person:Shachar", "$", obj, When.NotExists);
         _mock.Verify(x => x.Execute("JSON.SET", "Person:Shachar", "$", "{\"Name\":\"Shachar\",\"Age\":23}", "NX"));
     }
+
+    [Fact]
+    public void TestJsonGet()
+    {
+        var obj = new Person { Name = "Shachar", Age = 23 };
+        IDatabase db = redisFixture.Redis.GetDatabase();
+
+        db.JsonSet(key, "$", obj);
+        string expected = "{\"Name\":\"Shachar\",\"Age\":23}";
+        Assert.Equal(db.JsonGet(key).ToString(), expected);
+    }
 }

tests/RediSharp.Tests/UnitTest1.cs renamed to tests/NRedisStack.Tests/JsonTests.cs

@@ -8,8 +8,8 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>    
-    <PackageReference Include="Moq" Version="4.18.1" />    
+  <ItemGroup>
+    <PackageReference Include="Moq" Version="4.18.1" />
     <PackageReference Include="coverlet.collector" Version="3.1.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\RediSharp.Core\RediSharp.Core.csproj" />
+    <ProjectReference Include="..\..\src\NRedisStack.Core\NRedisStack.Core.csproj" />
   </ItemGroup>
 
 </Project>

tests/RediSharp.Tests/RediSharp.Tests.csproj renamed to tests/NRedisStack.Tests/NRedisStack.Tests.csproj

@@ -0,0 +1,17 @@
+using System;
+using StackExchange.Redis;
+
+namespace NRedisStack.Tests
+{
+    public class RedisFixture : IDisposable
+    {
+        public RedisFixture() => Redis = ConnectionMultiplexer.Connect("localhost");
+
+        public void Dispose()
+        {
+            Redis.Close();
+        }
+
+        public ConnectionMultiplexer Redis { get; private set; }
+    }
+}