Skip to content

Commit a93ecc7

Browse files
Fix tests
1 parent 6216253 commit a93ecc7

File tree

1 file changed

+58
-4
lines changed

1 file changed

+58
-4
lines changed

RubberduckTests/CodeExplorer/CodeExplorerTests.cs

Lines changed: 58 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,7 +1278,7 @@ End Property
12781278

12791279
[TestCategory("Code Explorer")]
12801280
[TestMethod]
1281-
public void CompareByType_ReturnsPropertyGetAbovePropertyLet()
1281+
public void CompareByType_ReturnsPropertyGetEqualToPropertyLet()
12821282
{
12831283
var inputCode =
12841284
@"Public Property Get Foo() As Variant
@@ -1300,12 +1300,66 @@ End Property
13001300
var propertyGetNode = vm.Projects.First().Items.First().Items.First().Items.Single(s => s.Name == "Foo (Get)");
13011301
var propertyLetNode = vm.Projects.First().Items.First().Items.First().Items.Single(s => s.Name == "Foo (Let)");
13021302

1303-
Assert.AreEqual(-1, new CompareByType().Compare(propertyGetNode, propertyLetNode));
1303+
Assert.AreEqual(0, new CompareByType().Compare(propertyGetNode, propertyLetNode));
13041304
}
13051305

13061306
[TestCategory("Code Explorer")]
13071307
[TestMethod]
1308-
public void CompareByType_ReturnsPropertyLetAbovePropertySet()
1308+
public void CompareByType_ReturnsPropertyGetEqualToPropertySet()
1309+
{
1310+
var inputCode =
1311+
@"Public Property Get Foo() As Variant
1312+
End Property
1313+
1314+
Public Property Set Foo(ByVal Value As Variant)
1315+
End Property
1316+
";
1317+
1318+
IVBComponent component;
1319+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component);
1320+
1321+
var state = new RubberduckParserState(vbe.Object, new DeclarationFinderFactory());
1322+
var vm = new CodeExplorerViewModel(new FolderHelper(state), state, new List<CommandBase>(), _generalSettingsProvider.Object, _windowSettingsProvider.Object);
1323+
1324+
var parser = MockParser.Create(vbe.Object, state);
1325+
parser.Parse(new CancellationTokenSource());
1326+
1327+
var propertyGetNode = vm.Projects.First().Items.First().Items.First().Items.Single(s => s.Name == "Foo (Get)");
1328+
var propertyLetNode = vm.Projects.First().Items.First().Items.First().Items.Single(s => s.Name == "Foo (Set)");
1329+
1330+
Assert.AreEqual(0, new CompareByType().Compare(propertyGetNode, propertyLetNode));
1331+
}
1332+
1333+
[TestCategory("Code Explorer")]
1334+
[TestMethod]
1335+
public void CompareByType_ReturnsPropertyLetEqualToPropertyGet()
1336+
{
1337+
var inputCode =
1338+
@"Public Property Let Foo(ByVal Value As Variant)
1339+
End Property
1340+
1341+
Public Property Get Foo() As Variant
1342+
End Property
1343+
";
1344+
1345+
IVBComponent component;
1346+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component);
1347+
1348+
var state = new RubberduckParserState(vbe.Object, new DeclarationFinderFactory());
1349+
var vm = new CodeExplorerViewModel(new FolderHelper(state), state, new List<CommandBase>(), _generalSettingsProvider.Object, _windowSettingsProvider.Object);
1350+
1351+
var parser = MockParser.Create(vbe.Object, state);
1352+
parser.Parse(new CancellationTokenSource());
1353+
1354+
var propertyLetNode = vm.Projects.First().Items.First().Items.First().Items.Single(s => s.Name == "Foo (Let)");
1355+
var propertySetNode = vm.Projects.First().Items.First().Items.First().Items.Single(s => s.Name == "Foo (Get)");
1356+
1357+
Assert.AreEqual(0, new CompareByType().Compare(propertyLetNode, propertySetNode));
1358+
}
1359+
1360+
[TestCategory("Code Explorer")]
1361+
[TestMethod]
1362+
public void CompareByType_ReturnsPropertyLetEqualToPropertySet()
13091363
{
13101364
var inputCode =
13111365
@"Public Property Let Foo(ByVal Value As Variant)
@@ -1327,7 +1381,7 @@ End Property
13271381
var propertyLetNode = vm.Projects.First().Items.First().Items.First().Items.Single(s => s.Name == "Foo (Let)");
13281382
var propertySetNode = vm.Projects.First().Items.First().Items.First().Items.Single(s => s.Name == "Foo (Set)");
13291383

1330-
Assert.AreEqual(-1, new CompareByType().Compare(propertyLetNode, propertySetNode));
1384+
Assert.AreEqual(0, new CompareByType().Compare(propertyLetNode, propertySetNode));
13311385
}
13321386

13331387
[TestCategory("Code Explorer")]

0 commit comments

Comments
 (0)