@@ -1278,7 +1278,7 @@ End Property
1278
1278
1279
1279
[ TestCategory ( "Code Explorer" ) ]
1280
1280
[ TestMethod ]
1281
- public void CompareByType_ReturnsPropertyGetAbovePropertyLet ( )
1281
+ public void CompareByType_ReturnsPropertyGetEqualToPropertyLet ( )
1282
1282
{
1283
1283
var inputCode =
1284
1284
@"Public Property Get Foo() As Variant
@@ -1300,12 +1300,66 @@ End Property
1300
1300
var propertyGetNode = vm . Projects . First ( ) . Items . First ( ) . Items . First ( ) . Items . Single ( s => s . Name == "Foo (Get)" ) ;
1301
1301
var propertyLetNode = vm . Projects . First ( ) . Items . First ( ) . Items . First ( ) . Items . Single ( s => s . Name == "Foo (Let)" ) ;
1302
1302
1303
- Assert . AreEqual ( - 1 , new CompareByType ( ) . Compare ( propertyGetNode , propertyLetNode ) ) ;
1303
+ Assert . AreEqual ( 0 , new CompareByType ( ) . Compare ( propertyGetNode , propertyLetNode ) ) ;
1304
1304
}
1305
1305
1306
1306
[ TestCategory ( "Code Explorer" ) ]
1307
1307
[ 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 ( )
1309
1363
{
1310
1364
var inputCode =
1311
1365
@"Public Property Let Foo(ByVal Value As Variant)
@@ -1327,7 +1381,7 @@ End Property
1327
1381
var propertyLetNode = vm . Projects . First ( ) . Items . First ( ) . Items . First ( ) . Items . Single ( s => s . Name == "Foo (Let)" ) ;
1328
1382
var propertySetNode = vm . Projects . First ( ) . Items . First ( ) . Items . First ( ) . Items . Single ( s => s . Name == "Foo (Set)" ) ;
1329
1383
1330
- Assert . AreEqual ( - 1 , new CompareByType ( ) . Compare ( propertyLetNode , propertySetNode ) ) ;
1384
+ Assert . AreEqual ( 0 , new CompareByType ( ) . Compare ( propertyLetNode , propertySetNode ) ) ;
1331
1385
}
1332
1386
1333
1387
[ TestCategory ( "Code Explorer" ) ]
0 commit comments