Skip to content

Commit 7ca2d78

Browse files
MDoernerMDoerner
committed
fixed setup of failing tests to make them pass again
1 parent ed20254 commit 7ca2d78

File tree

1 file changed

+75
-33
lines changed

1 file changed

+75
-33
lines changed

‎RubberduckTests/Inspections/UntypedFunctionUsageInspectionTests.cs‎

Lines changed: 75 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,16 @@ private List<Declaration> GetBuiltInDeclarations()
262262
new List<IAnnotation>(),
263263
new Attributes());
264264

265+
var dateTimeModule = new ProceduralModuleDeclaration(
266+
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "DateTime"), "DateTime"),
267+
vbaDeclaration,
268+
"Strings",
269+
true,
270+
new List<IAnnotation>(),
271+
new Attributes());
272+
265273
var commandFunction = new FunctionDeclaration(
266-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Interaction"), "_B_var_Command"),
274+
new QualifiedMemberName(interactionModule.QualifiedName.QualifiedModuleName, "_B_var_Command"),
267275
interactionModule,
268276
interactionModule,
269277
"Variant",
@@ -278,7 +286,7 @@ private List<Declaration> GetBuiltInDeclarations()
278286
new Attributes());
279287

280288
var environFunction = new FunctionDeclaration(
281-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Interaction"), "_B_var_Environ"),
289+
new QualifiedMemberName(interactionModule.QualifiedName.QualifiedModuleName, "_B_var_Environ"),
282290
interactionModule,
283291
interactionModule,
284292
"Variant",
@@ -293,7 +301,7 @@ private List<Declaration> GetBuiltInDeclarations()
293301
new Attributes());
294302

295303
var rtrimFunction = new FunctionDeclaration(
296-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_RTrim"),
304+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "_B_var_RTrim"),
297305
stringsModule,
298306
stringsModule,
299307
"Variant",
@@ -308,7 +316,7 @@ private List<Declaration> GetBuiltInDeclarations()
308316
new Attributes());
309317

310318
var chrFunction = new FunctionDeclaration(
311-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_Chr"),
319+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "_B_var_Chr"),
312320
stringsModule,
313321
stringsModule,
314322
"Variant",
@@ -323,7 +331,7 @@ private List<Declaration> GetBuiltInDeclarations()
323331
new Attributes());
324332

325333
var formatFunction = new FunctionDeclaration(
326-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_Format"),
334+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "_B_var_Format"),
327335
stringsModule,
328336
stringsModule,
329337
"Variant",
@@ -338,7 +346,7 @@ private List<Declaration> GetBuiltInDeclarations()
338346
new Attributes());
339347

340348
var firstFormatParam = new ParameterDeclaration(
341-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "Expression"),
349+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "Expression"),
342350
formatFunction,
343351
"Variant",
344352
null,
@@ -347,7 +355,7 @@ private List<Declaration> GetBuiltInDeclarations()
347355
true);
348356

349357
var secondFormatParam = new ParameterDeclaration(
350-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "Format"),
358+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "Format"),
351359
formatFunction,
352360
"Variant",
353361
null,
@@ -356,7 +364,7 @@ private List<Declaration> GetBuiltInDeclarations()
356364
true);
357365

358366
var thirdFormatParam = new ParameterDeclaration(
359-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "FirstDayOfWeek"),
367+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "FirstDayOfWeek"),
360368
formatFunction,
361369
"VbDayOfWeek",
362370
null,
@@ -369,7 +377,7 @@ private List<Declaration> GetBuiltInDeclarations()
369377
formatFunction.AddParameter(thirdFormatParam);
370378

371379
var rightFunction = new FunctionDeclaration(
372-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_Right"),
380+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "_B_var_Right"),
373381
stringsModule,
374382
stringsModule,
375383
"Variant",
@@ -384,7 +392,7 @@ private List<Declaration> GetBuiltInDeclarations()
384392
new Attributes());
385393

386394
var firstRightParam = new ParameterDeclaration(
387-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "String"),
395+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "String"),
388396
rightFunction,
389397
"Variant",
390398
null,
@@ -395,7 +403,7 @@ private List<Declaration> GetBuiltInDeclarations()
395403
rightFunction.AddParameter(firstRightParam);
396404

397405
var lcaseFunction = new FunctionDeclaration(
398-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_LCase"),
406+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "_B_var_LCase"),
399407
stringsModule,
400408
stringsModule,
401409
"Variant",
@@ -410,7 +418,7 @@ private List<Declaration> GetBuiltInDeclarations()
410418
new Attributes());
411419

412420
var leftbFunction = new FunctionDeclaration(
413-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_LeftB"),
421+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "_B_var_LeftB"),
414422
stringsModule,
415423
stringsModule,
416424
"Variant",
@@ -425,7 +433,7 @@ private List<Declaration> GetBuiltInDeclarations()
425433
new Attributes());
426434

427435
var firstLeftBParam = new ParameterDeclaration(
428-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "String"),
436+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "String"),
429437
leftbFunction,
430438
"Variant",
431439
null,
@@ -436,7 +444,7 @@ private List<Declaration> GetBuiltInDeclarations()
436444
leftbFunction.AddParameter(firstLeftBParam);
437445

438446
var chrwFunction = new FunctionDeclaration(
439-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_ChrW"),
447+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "_B_var_ChrW"),
440448
stringsModule,
441449
stringsModule,
442450
"Variant",
@@ -451,7 +459,7 @@ private List<Declaration> GetBuiltInDeclarations()
451459
new Attributes());
452460

453461
var leftFunction = new FunctionDeclaration(
454-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_Left"),
462+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "_B_var_Left"),
455463
stringsModule,
456464
stringsModule,
457465
"Variant",
@@ -466,7 +474,7 @@ private List<Declaration> GetBuiltInDeclarations()
466474
new Attributes());
467475

468476
var firstLeftParam = new ParameterDeclaration(
469-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "String"),
477+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "String"),
470478
leftFunction,
471479
"Variant",
472480
null,
@@ -477,7 +485,7 @@ private List<Declaration> GetBuiltInDeclarations()
477485
leftFunction.AddParameter(firstLeftParam);
478486

479487
var rightbFunction = new FunctionDeclaration(
480-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_RightB"),
488+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "_B_var_RightB"),
481489
stringsModule,
482490
stringsModule,
483491
"Variant",
@@ -492,7 +500,7 @@ private List<Declaration> GetBuiltInDeclarations()
492500
new Attributes());
493501

494502
var firstRightBParam = new ParameterDeclaration(
495-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "String"),
503+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "String"),
496504
rightbFunction,
497505
"Variant",
498506
null,
@@ -503,7 +511,7 @@ private List<Declaration> GetBuiltInDeclarations()
503511
rightbFunction.AddParameter(firstRightBParam);
504512

505513
var midbFunction = new FunctionDeclaration(
506-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_MidB"),
514+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "_B_var_MidB"),
507515
stringsModule,
508516
stringsModule,
509517
"Variant",
@@ -518,7 +526,7 @@ private List<Declaration> GetBuiltInDeclarations()
518526
new Attributes());
519527

520528
var firstMidBParam = new ParameterDeclaration(
521-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "String"),
529+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "String"),
522530
midbFunction,
523531
"Variant",
524532
null,
@@ -527,7 +535,7 @@ private List<Declaration> GetBuiltInDeclarations()
527535
true);
528536

529537
var secondMidBParam = new ParameterDeclaration(
530-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "Start"),
538+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "Start"),
531539
midbFunction,
532540
"Long",
533541
null,
@@ -539,7 +547,7 @@ private List<Declaration> GetBuiltInDeclarations()
539547
midbFunction.AddParameter(secondMidBParam);
540548

541549
var ucaseFunction = new FunctionDeclaration(
542-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_UCase"),
550+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "_B_var_UCase"),
543551
stringsModule,
544552
stringsModule,
545553
"Variant",
@@ -554,7 +562,7 @@ private List<Declaration> GetBuiltInDeclarations()
554562
new Attributes());
555563

556564
var trimFunction = new FunctionDeclaration(
557-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_Trim"),
565+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "_B_var_Trim"),
558566
stringsModule,
559567
stringsModule,
560568
"Variant",
@@ -569,7 +577,7 @@ private List<Declaration> GetBuiltInDeclarations()
569577
new Attributes());
570578

571579
var ltrimFunction = new FunctionDeclaration(
572-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_LTrim"),
580+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "_B_var_LTrim"),
573581
stringsModule,
574582
stringsModule,
575583
"Variant",
@@ -584,7 +592,7 @@ private List<Declaration> GetBuiltInDeclarations()
584592
new Attributes());
585593

586594
var midFunction = new FunctionDeclaration(
587-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_Mid"),
595+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "_B_var_Mid"),
588596
stringsModule,
589597
stringsModule,
590598
"Variant",
@@ -599,7 +607,7 @@ private List<Declaration> GetBuiltInDeclarations()
599607
new Attributes());
600608

601609
var firstMidParam = new ParameterDeclaration(
602-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "String"),
610+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "String"),
603611
midbFunction,
604612
"Variant",
605613
null,
@@ -608,7 +616,7 @@ private List<Declaration> GetBuiltInDeclarations()
608616
true);
609617

610618
var secondMidParam = new ParameterDeclaration(
611-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "Start"),
619+
new QualifiedMemberName(stringsModule.QualifiedName.QualifiedModuleName, "Start"),
612620
midbFunction,
613621
"Long",
614622
null,
@@ -620,7 +628,7 @@ private List<Declaration> GetBuiltInDeclarations()
620628
midFunction.AddParameter(secondMidParam);
621629

622630
var hexFunction = new FunctionDeclaration(
623-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_Hex"),
631+
new QualifiedMemberName(conversionModule.QualifiedName.QualifiedModuleName, "_B_var_Hex"),
624632
conversionModule,
625633
conversionModule,
626634
"Variant",
@@ -635,7 +643,7 @@ private List<Declaration> GetBuiltInDeclarations()
635643
new Attributes());
636644

637645
var octFunction = new FunctionDeclaration(
638-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_Oct"),
646+
new QualifiedMemberName(conversionModule.QualifiedName.QualifiedModuleName, "_B_var_Oct"),
639647
conversionModule,
640648
conversionModule,
641649
"Variant",
@@ -650,7 +658,7 @@ private List<Declaration> GetBuiltInDeclarations()
650658
new Attributes());
651659

652660
var errorFunction = new FunctionDeclaration(
653-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_Error"),
661+
new QualifiedMemberName(conversionModule.QualifiedName.QualifiedModuleName, "_B_var_Error"),
654662
conversionModule,
655663
conversionModule,
656664
"Variant",
@@ -665,7 +673,7 @@ private List<Declaration> GetBuiltInDeclarations()
665673
new Attributes());
666674

667675
var strFunction = new FunctionDeclaration(
668-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_Str"),
676+
new QualifiedMemberName(conversionModule.QualifiedName.QualifiedModuleName, "_B_var_Str"),
669677
conversionModule,
670678
conversionModule,
671679
"Variant",
@@ -680,7 +688,7 @@ private List<Declaration> GetBuiltInDeclarations()
680688
new Attributes());
681689

682690
var curDirFunction = new FunctionDeclaration(
683-
new QualifiedMemberName(new QualifiedModuleName("VBA", "C:\\Program Files\\Common Files\\Microsoft Shared\\VBA\\VBA7.1\\VBE7.DLL", "Strings"), "_B_var_CurDir"),
691+
new QualifiedMemberName(fileSystemModule.QualifiedName.QualifiedModuleName, "_B_var_CurDir"),
684692
fileSystemModule,
685693
fileSystemModule,
686694
"Variant",
@@ -694,13 +702,45 @@ private List<Declaration> GetBuiltInDeclarations()
694702
new List<IAnnotation>(),
695703
new Attributes());
696704

705+
var datePropertyGet = new PropertyGetDeclaration(
706+
new QualifiedMemberName(dateTimeModule.QualifiedName.QualifiedModuleName, "Date"),
707+
dateTimeModule,
708+
dateTimeModule,
709+
"Variant",
710+
null,
711+
string.Empty,
712+
Accessibility.Global,
713+
null,
714+
new Selection(),
715+
false,
716+
true,
717+
new List<IAnnotation>(),
718+
new Attributes());
719+
720+
721+
var timePropertyGet = new PropertyGetDeclaration(
722+
new QualifiedMemberName(dateTimeModule.QualifiedName.QualifiedModuleName, "Time"),
723+
dateTimeModule,
724+
dateTimeModule,
725+
"Variant",
726+
null,
727+
string.Empty,
728+
Accessibility.Global,
729+
null,
730+
new Selection(),
731+
false,
732+
true,
733+
new List<IAnnotation>(),
734+
new Attributes());
735+
697736
return new List<Declaration>
698737
{
699738
vbaDeclaration,
700739
conversionModule,
701740
fileSystemModule,
702741
interactionModule,
703742
stringsModule,
743+
dateTimeModule,
704744
commandFunction,
705745
environFunction,
706746
rtrimFunction,
@@ -732,7 +772,9 @@ private List<Declaration> GetBuiltInDeclarations()
732772
octFunction,
733773
errorFunction,
734774
strFunction,
735-
curDirFunction
775+
curDirFunction,
776+
datePropertyGet,
777+
timePropertyGet
736778
};
737779
}
738780
}

0 commit comments

Comments
 (0)