Skip to content

Commit 11ebc00

Browse files
committed
Update other tests to have consistent accessibility
1 parent 4f6e02f commit 11ebc00

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

RubberduckTests/Refactoring/EncapsulateField/EncapsulateFieldUseBackingField/EncapsulateArrayFieldTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void EncapsulateArray(string visibility, string arrayDeclaration, string
4343
4444
Private {expectedArrayDeclaration}
4545
46-
Public Property Get MyArray() As Variant
46+
{visibility} Property Get MyArray() As Variant
4747
MyArray = mArray
4848
End Property
4949
";

RubberduckTests/Refactoring/EncapsulateField/EncapsulateFieldUseBackingField/EncapsulateFieldTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ public void EncapsulatePrivateField()
294294
var presenterAction = Support.SetParametersForSingleTarget("fizz", "Name");
295295

296296
var actualCode = Support.RefactoredCode(inputCode.ToCodeString(), presenterAction);
297-
StringAssert.Contains("Public Property Get Name() As Integer", actualCode);
298-
StringAssert.Contains("Public Property Let Name(", actualCode);
297+
StringAssert.Contains("Private Property Get Name() As Integer", actualCode);
298+
StringAssert.Contains("Private Property Let Name(", actualCode);
299299
StringAssert.Contains($"(ByVal {Support.RHSIdentifier} As Integer)", actualCode);
300300
StringAssert.Contains("Name = fizz", actualCode);
301301
StringAssert.Contains($"fizz = {Support.RHSIdentifier}", actualCode);
@@ -323,7 +323,7 @@ End Enum
323323
var presenterAction = Support.UserAcceptsDefaults();
324324
var actualCode = Support.RefactoredCode(inputCode.ToCodeString(), presenterAction);
325325
StringAssert.Contains("Private numberType1 As NumberTypes", actualCode);
326-
StringAssert.Contains("Public Property Get NumberType() As NumberTypes", actualCode);
326+
StringAssert.Contains($"{fieldAccessibility} Property Get NumberType() As NumberTypes", actualCode);
327327
StringAssert.Contains("NumberType = numberType1", actualCode);
328328
}
329329

@@ -352,7 +352,7 @@ Private numberT|ype As NumberTypes{declarationList ?? string.Empty}
352352
var actualCode = Support.RefactoredCode(inputCode.ToCodeString(), presenterAction);
353353
var expectedPropertyType = enumTypeAccessibility == "Public" ? "NumberTypes" : "Long";
354354
StringAssert.Contains("Private numberType1 As NumberTypes", actualCode);
355-
StringAssert.Contains($"Public Property Get NumberType() As {expectedPropertyType}", actualCode);
355+
StringAssert.Contains($"Private Property Get NumberType() As {expectedPropertyType}", actualCode);
356356
StringAssert.Contains("NumberType = numberType1", actualCode);
357357
}
358358

@@ -368,8 +368,8 @@ public void EncapsulatePrivateFieldInList()
368368

369369
var actualCode = Support.RefactoredCode(inputCode.ToCodeString(), presenterAction);
370370
StringAssert.Contains("Private fizz1 As Integer, fuzz As Integer,", actualCode);
371-
StringAssert.Contains("Public Property Get Fizz() As Integer", actualCode);
372-
StringAssert.Contains("Public Property Let Fizz(", actualCode);
371+
StringAssert.Contains("Private Property Get Fizz() As Integer", actualCode);
372+
StringAssert.Contains("Private Property Let Fizz(", actualCode);
373373
StringAssert.Contains($"(ByVal {Support.RHSIdentifier} As Integer)", actualCode);
374374
StringAssert.Contains("Fizz = fizz1", actualCode);
375375
StringAssert.Contains($"fizz1 = {Support.RHSIdentifier}", actualCode);
@@ -387,8 +387,8 @@ public void EncapsulatePrivateField_Defaults()
387387
var presenterAction = Support.UserAcceptsDefaults();
388388

389389
var actualCode = Support.RefactoredCode(inputCode.ToCodeString(), presenterAction);
390-
StringAssert.Contains("Public Property Get Fizz() As Integer", actualCode);
391-
StringAssert.Contains("Public Property Let Fizz(", actualCode);
390+
StringAssert.Contains("Private Property Get Fizz() As Integer", actualCode);
391+
StringAssert.Contains("Private Property Let Fizz(", actualCode);
392392
StringAssert.Contains($"(ByVal {Support.RHSIdentifier} As Integer)", actualCode);
393393
StringAssert.Contains("Fizz = fizz1", actualCode);
394394
StringAssert.Contains($"fizz1 = {Support.RHSIdentifier}", actualCode);

RubberduckTests/Refactoring/EncapsulateField/EncapsulateFieldUseBackingField/EncapsulateUDTFieldTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ Private mFizz
167167
StringAssert.Contains($"Public Property Get Bar(", actualCode);
168168
StringAssert.Contains($"Public Property Let Bar(", actualCode);
169169
StringAssert.Contains($"Private mFizz As Variant", actualCode);
170-
StringAssert.Contains($"Public Property Get Fizz() As Variant", actualCode);
171-
StringAssert.Contains($"Public Property Let Fizz(", actualCode);
170+
StringAssert.Contains($"Private Property Get Fizz() As Variant", actualCode);
171+
StringAssert.Contains($"Private Property Let Fizz(", actualCode);
172172
}
173173

174174
[TestCase("Public")]
@@ -359,7 +359,7 @@ End Sub
359359
StringAssert.Contains($"Private mTheClass As Class1", actualCode);
360360
StringAssert.Contains($"Set mTheClass = {Support.RHSIdentifier}", actualCode);
361361
StringAssert.Contains($"Set TheClass = mTheClass", actualCode);
362-
StringAssert.Contains($"Public Property Set TheClass", actualCode);
362+
StringAssert.Contains($"{accessibility} Property Set TheClass", actualCode);
363363
}
364364

365365
[Test]

RubberduckTests/Refactoring/EncapsulateField/EncapsulateFieldValidatorTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void EncapsulatePrivateField_ReadOnlyRequiresSet()
4343
const string expectedCode =
4444
@"Private fizz As Collection
4545
46-
Public Property Get Name() As Collection
46+
Private Property Get Name() As Collection
4747
Set Name = fizz
4848
End Property
4949
";
@@ -257,7 +257,7 @@ Private rati|onal As NumberTypes
257257

258258
var presenterAction = Support.UserAcceptsDefaults();
259259
var actualCode = Support.RefactoredCode(inputCode.ToCodeString(), presenterAction);
260-
StringAssert.Contains("Public Property Get Rational() As NumberTypes", actualCode);
260+
StringAssert.Contains("Private Property Get Rational() As NumberTypes", actualCode);
261261
StringAssert.Contains("Rational = rational2", actualCode);
262262
}
263263

@@ -279,7 +279,7 @@ Private whe|els As Integer
279279

280280
var presenterAction = Support.UserAcceptsDefaults();
281281
var actualCode = Support.RefactoredCode(inputCode.ToCodeString(), presenterAction);
282-
StringAssert.Contains("Public Property Get Wheels()", actualCode);
282+
StringAssert.Contains("Private Property Get Wheels()", actualCode);
283283
StringAssert.Contains("Wheels = wheels1", actualCode);
284284
}
285285

0 commit comments

Comments
 (0)