Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 30eeac1

Browse files
stephentoubstephentoub
committed
Address PR feedback
- Change protected fields on the registry test base class to instead be properties
1 parent cb59309 commit 30eeac1

29 files changed

+454
-454
lines changed

‎src/Microsoft.Win32.Registry/tests/Registry/Registry_Getvalue_str_str_obj.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ public static void NegativeTests()
2828
public void ShouldReturnNull()
2929
{
3030
// Passing null object as default object to return shouldn't throw
31-
Assert.Null(Registry.GetValue(_testRegistryKey.Name, "xzy", defaultValue: null));
31+
Assert.Null(Registry.GetValue(TestRegistryKey.Name, "xzy", defaultValue: null));
3232

3333
// If the key does not exists, then the method should return null all time
34-
Assert.Null(Registry.GetValue(_testRegistryKey.Name + "\\XYZ", null, -1));
34+
Assert.Null(Registry.GetValue(TestRegistryKey.Name + "\\XYZ", null, -1));
3535
}
3636

3737
public static IEnumerable<object[]> TestValueTypes { get { return TestData.TestValueTypes; } }
@@ -40,9 +40,9 @@ public void ShouldReturnNull()
4040
[MemberData("TestValueTypes")]
4141
public void TestGetValueWithValueTypes(string valueName, object testValue)
4242
{
43-
_testRegistryKey.SetValue(valueName, testValue);
44-
Assert.Equal(testValue.ToString(), Registry.GetValue(_testRegistryKey.Name, valueName, null).ToString());
45-
_testRegistryKey.DeleteValue(valueName);
43+
TestRegistryKey.SetValue(valueName, testValue);
44+
Assert.Equal(testValue.ToString(), Registry.GetValue(TestRegistryKey.Name, valueName, null).ToString());
45+
TestRegistryKey.DeleteValue(valueName);
4646
}
4747

4848
public static IEnumerable<object[]> TestRegistryKeys

‎src/Microsoft.Win32.Registry/tests/Registry/Registry_SetValue_str_str_obj.cs

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ public void Test01()
1515
// [] Passing in null should throw ArgumentNullException
1616
//UPDATE: This sets the default value. We should move this test to a newly defined reg key so as not to screw up the system
1717
const string expected = "This is a test";
18-
Registry.SetValue(_testRegistryKey.Name, null, expected);
19-
Assert.Equal(expected, _testRegistryKey.GetValue(null));
18+
Registry.SetValue(TestRegistryKey.Name, null, expected);
19+
Assert.Equal(expected, TestRegistryKey.GetValue(null));
2020
}
2121

2222
[Fact]
2323
public void NegativeTests()
2424
{
2525
// Should throw if passed value is null
26-
Assert.Throws<ArgumentNullException>(() => Registry.SetValue(_testRegistryKey.Name, "test", value: null));
26+
Assert.Throws<ArgumentNullException>(() => Registry.SetValue(TestRegistryKey.Name, "test", value: null));
2727

2828
// Should throw if passed keyName is null
2929
Assert.Throws<ArgumentNullException>(() => Registry.SetValue(keyName: null, valueName: "test", value: "test"));
@@ -36,14 +36,14 @@ public void NegativeTests()
3636

3737
// Should throw if key length above 255 characters but prior to V4, the limit is 16383
3838
const int maxValueNameLength = 16383;
39-
Assert.Throws<ArgumentException>(() => Registry.SetValue(_testRegistryKey.Name, new string('a', maxValueNameLength + 1), 5));
39+
Assert.Throws<ArgumentException>(() => Registry.SetValue(TestRegistryKey.Name, new string('a', maxValueNameLength + 1), 5));
4040

4141
// Should throw if passed value is array with uninitialized elements
42-
Assert.Throws<ArgumentException>(() => Registry.SetValue(_testRegistryKey.Name, "StringArr", value: new string[1]));
42+
Assert.Throws<ArgumentException>(() => Registry.SetValue(TestRegistryKey.Name, "StringArr", value: new string[1]));
4343

4444
// Should throw because only String[] (REG_MULTI_SZ) and byte[] (REG_BINARY) are supported.
4545
// RegistryKey.SetValue does not support arrays of type UInt32[].
46-
Assert.Throws<ArgumentException>(() => Registry.SetValue(_testRegistryKey.Name, "IntArray", new[] { 1, 2, 3 }));
46+
Assert.Throws<ArgumentException>(() => Registry.SetValue(TestRegistryKey.Name, "IntArray", new[] { 1, 2, 3 }));
4747
}
4848

4949
public static IEnumerable<object[]> TestValueTypes { get { return TestData.TestValueTypes; } }
@@ -52,9 +52,9 @@ public void NegativeTests()
5252
[MemberData("TestValueTypes")]
5353
public void SetValueWithValueTypes(string valueName, object testValue)
5454
{
55-
Registry.SetValue(_testRegistryKey.Name, valueName, testValue);
56-
Assert.Equal(testValue.ToString(), _testRegistryKey.GetValue(valueName).ToString());
57-
_testRegistryKey.DeleteValue(valueName);
55+
Registry.SetValue(TestRegistryKey.Name, valueName, testValue);
56+
Assert.Equal(testValue.ToString(), TestRegistryKey.GetValue(valueName).ToString());
57+
TestRegistryKey.DeleteValue(valueName);
5858
}
5959

6060
[Fact]
@@ -63,9 +63,9 @@ public void SetValueWithInt32()
6363
const string testValueName = "Int32";
6464
const int expected = -5;
6565

66-
Registry.SetValue(_testRegistryKey.Name, testValueName, expected);
67-
Assert.Equal(expected, (int)_testRegistryKey.GetValue(testValueName));
68-
_testRegistryKey.DeleteValue(testValueName);
66+
Registry.SetValue(TestRegistryKey.Name, testValueName, expected);
67+
Assert.Equal(expected, (int)TestRegistryKey.GetValue(testValueName));
68+
TestRegistryKey.DeleteValue(testValueName);
6969
}
7070

7171
[Fact]
@@ -75,9 +75,9 @@ public void SetValueWithUInt64()
7575
const string testValueName = "UInt64";
7676
const ulong expected = ulong.MaxValue;
7777

78-
Registry.SetValue(_testRegistryKey.Name, testValueName, expected);
79-
Assert.Equal(expected, Convert.ToUInt64(_testRegistryKey.GetValue(testValueName)));
80-
_testRegistryKey.DeleteValue(testValueName);
78+
Registry.SetValue(TestRegistryKey.Name, testValueName, expected);
79+
Assert.Equal(expected, Convert.ToUInt64(TestRegistryKey.GetValue(testValueName)));
80+
TestRegistryKey.DeleteValue(testValueName);
8181
}
8282

8383
[Fact]
@@ -87,9 +87,9 @@ public void SetValueWithByteArray()
8787
const string testValueName = "UBArr";
8888
byte[] expected = { 1, 2, 3 };
8989

90-
Registry.SetValue(_testRegistryKey.Name, testValueName, expected);
91-
Assert.Equal(expected, (byte[])_testRegistryKey.GetValue(testValueName));
92-
_testRegistryKey.DeleteValue(testValueName);
90+
Registry.SetValue(TestRegistryKey.Name, testValueName, expected);
91+
Assert.Equal(expected, (byte[])TestRegistryKey.GetValue(testValueName));
92+
TestRegistryKey.DeleteValue(testValueName);
9393
}
9494

9595
[Fact]
@@ -104,9 +104,9 @@ public void SetValueWithMultiString()
104104
"lot of things. one of which"
105105
};
106106

107-
Registry.SetValue(_testRegistryKey.Name, testValueName, expected);
108-
Assert.Equal(expected, (string[])_testRegistryKey.GetValue(testValueName));
109-
_testRegistryKey.DeleteValue(testValueName);
107+
Registry.SetValue(TestRegistryKey.Name, testValueName, expected);
108+
Assert.Equal(expected, (string[])TestRegistryKey.GetValue(testValueName));
109+
TestRegistryKey.DeleteValue(testValueName);
110110
}
111111

112112
public static IEnumerable<object[]> TestEnvironment { get { return TestData.TestEnvironment; } }
@@ -116,12 +116,12 @@ public void SetValueWithMultiString()
116116
public void SetValueWithEnvironmentVariable(string valueName, string envVariableName, string expectedVariableValue)
117117
{
118118
string value = "%" + envVariableName + "%";
119-
Registry.SetValue(_testRegistryKey.Name, valueName, value);
119+
Registry.SetValue(TestRegistryKey.Name, valueName, value);
120120

121-
string result = (string)_testRegistryKey.GetValue(valueName);
121+
string result = (string)TestRegistryKey.GetValue(valueName);
122122
//we don't expand for the user, REG_SZ_EXPAND not supported
123123
Assert.Equal(expectedVariableValue, Environment.ExpandEnvironmentVariables(result));
124-
_testRegistryKey.DeleteValue(valueName);
124+
TestRegistryKey.DeleteValue(valueName);
125125
}
126126

127127
[Fact]
@@ -131,9 +131,9 @@ public void SetValueWithEmptyString()
131131
const string testValueName = "test_122018";
132132
string expected = string.Empty;
133133

134-
Registry.SetValue(_testRegistryKey.Name, testValueName, expected);
135-
Assert.Equal(expected, (string)_testRegistryKey.GetValue(testValueName));
136-
_testRegistryKey.DeleteValue(testValueName);
134+
Registry.SetValue(TestRegistryKey.Name, testValueName, expected);
135+
Assert.Equal(expected, (string)TestRegistryKey.GetValue(testValueName));
136+
TestRegistryKey.DeleteValue(testValueName);
137137
}
138138
}
139139
}

0 commit comments

Comments
 (0)