PR fixes

Author: ReubenBond

test/Extensions/Tester.Redis/Utility/CommonFixture.cs

@@ -9,11 +9,11 @@
 using Orleans.Serialization;
 using Orleans.Storage;
 using StackExchange.Redis;
+using Tester;
 using TestExtensions;
 
 public class CommonFixture : TestEnvironmentFixture
 {
-
     /// <summary>
     /// Caches DefaultProviderRuntime for multiple uses.
     /// </summary>
@@ -24,6 +24,7 @@ public class CommonFixture : TestEnvironmentFixture
     /// </summary>
     public CommonFixture()
     {
+        TestUtils.CheckForRedis();
         _ = this.Services.GetRequiredService<IOptions<ClusterOptions>>();
         DefaultProviderRuntime = new ClientProviderRuntime(
             this.InternalGrainFactory,
@@ -38,13 +39,12 @@ public CommonFixture()
     /// a <em>null</em> value will be provided.</remarks>
     public async Task<IGrainStorage> GetStorageProvider(bool useOrleansSerializer = false)
     {
+
         IGrainStorageSerializer grainStorageSerializer = useOrleansSerializer ? new OrleansGrainStorageSerializer(this.DefaultProviderRuntime.ServiceProvider.GetService<Serializer>())
                                                                               : new JsonGrainStorageSerializer(this.DefaultProviderRuntime.ServiceProvider.GetService<OrleansJsonSerializer>());
-
-        var redisOptions = ConfigurationOptions.Parse(TestDefaultConfiguration.RedisConnectionString);
         var options = new RedisStorageOptions()
         {
-            ConnectionString = redisOptions.ToString(),
+            ConfigurationOptions = ConfigurationOptions.Parse(TestDefaultConfiguration.RedisConnectionString),
             GrainStorageSerializer = grainStorageSerializer
         };
 

test/TesterInternal/StorageTests/CommonStorageTests.cs

@@ -187,18 +187,18 @@ await RetryHelper.RetryOnExceptionAsync(5, RetryOperation.Sigmoid, async () =>
             await Storage.WriteStateAsync(grainTypeName, grainId, grainState);
             var writtenStateVersion = grainState.ETag;
             var recordExitsAfterWriting = grainState.RecordExists;
+            Assert.True(recordExitsAfterWriting);
 
             await Storage.ClearStateAsync(grainTypeName, grainId, grainState).ConfigureAwait(false);
             var clearedStateVersion = grainState.ETag;
-            var recordExitsAfterClearing = grainState.RecordExists;
+            Assert.NotEqual(writtenStateVersion, clearedStateVersion);
 
-            var storedGrainState = new GrainState<T> { State = new T() };
-            await Storage.ReadStateAsync(grainTypeName, grainId, storedGrainState).ConfigureAwait(false);
+            var recordExitsAfterClearing = grainState.RecordExists;
+            Assert.False(recordExitsAfterClearing);
 
-            Assert.NotEqual(writtenStateVersion, clearedStateVersion);
+            var storedGrainState = new GrainState<T> { State = new T(), ETag = clearedStateVersion };
+            await Storage.WriteStateAsync(grainTypeName, grainId, storedGrainState).ConfigureAwait(false);
             Assert.Equal(storedGrainState.State, Activator.CreateInstance<T>());
-            Assert.True(recordExitsAfterWriting);
-            Assert.False(recordExitsAfterClearing);
             Assert.True(storedGrainState.RecordExists);
         }
 

test/TesterInternal/StorageTests/CommonStorageUtilities.cs

@@ -1,4 +1,4 @@
-using Xunit;
+using Xunit;
 
 
 namespace UnitTests.StorageTests.Relational
@@ -17,8 +17,8 @@ public static void AssertRelationalInconsistentExceptionMessage(string exception
             Assert.Contains("ServiceId=", exceptionMessage);
             Assert.Contains("ProviderName=", exceptionMessage);
             Assert.Contains("GrainType=", exceptionMessage);
-            Assert.Contains($"GrainId=", exceptionMessage);
-            Assert.Contains($"ETag=", exceptionMessage);
+            Assert.Contains("GrainId=", exceptionMessage);
+            Assert.Contains("ETag=", exceptionMessage);
         }
     }
 }