@@ -40,7 +40,7 @@ End Sub
40
40
Public Sub IClass1_DoSomethingElse(ByVal a As Integer)
41
41
MsgBox ""?""
42
42
End Sub" ;
43
- CheckActualEmptyBlockCountEqualsExpected ( interfaceCode , concreteCode , 0 ) ;
43
+ CheckActualEmptyBlockCountEqualsExpected ( ( "IClass1" , interfaceCode ) , ( "Class1" , concreteCode ) , 0 ) ;
44
44
}
45
45
46
46
[ Test ]
@@ -61,7 +61,7 @@ Private Sub IClass1_DoSomething(ByVal a As Integer)
61
61
End Sub
62
62
Public Sub IClass1_DoSomethingElse(ByVal a As Integer)
63
63
End Sub" ;
64
- CheckActualEmptyBlockCountEqualsExpected ( interfaceCode , concreteCode , 1 ) ;
64
+ CheckActualEmptyBlockCountEqualsExpected ( ( "IClass1" , interfaceCode ) , ( "Class1" , concreteCode ) , 1 ) ;
65
65
}
66
66
67
67
[ Test ]
@@ -83,7 +83,7 @@ public void ImplementedInterfaceMember_VariousStatements_DontReturnResult(string
83
83
MsgBox ""?""
84
84
End Sub" ;
85
85
86
- CheckActualEmptyBlockCountEqualsExpected ( interfaceCode , concreteCode , 0 ) ;
86
+ CheckActualEmptyBlockCountEqualsExpected ( ( "IClass1" , interfaceCode ) , ( "Class1" , concreteCode ) , 0 ) ;
87
87
}
88
88
89
89
[ Test ]
@@ -119,7 +119,7 @@ public void ImplementedInterfaceMember_VariousStatements_ReturnResult(string sta
119
119
Sub IClass1_Qux()
120
120
End Sub" ;
121
121
122
- CheckActualEmptyBlockCountEqualsExpected ( interfaceCode , concreteCode , 1 ) ;
122
+ CheckActualEmptyBlockCountEqualsExpected ( ( "IClass1" , interfaceCode ) , ( "Class1" , concreteCode ) , 1 ) ;
123
123
}
124
124
125
125
//https://github.com/rubberduck-vba/Rubberduck/issues/5143
@@ -129,7 +129,7 @@ Sub IClass1_Qux()
129
129
[ Category ( "Inspections" ) ]
130
130
public void ImplementedInterfaceMember_AnnotatedOnly_ReturnsResult ( string interfaceBody , string implementsStatement , int expected )
131
131
{
132
- string interfaceCode =
132
+ var interfaceCode =
133
133
$@ "
134
134
'@Interface
135
135
@@ -138,30 +138,28 @@ End Sub
138
138
Public Sub DoSomethingElse(ByVal a As Integer)
139
139
{ interfaceBody }
140
140
End Sub" ;
141
- string concreteCode =
141
+ var concreteCode =
142
142
$@ "
143
143
144
144
{ implementsStatement }
145
145
146
- Private Sub IClass_DoSomething (ByVal a As Integer)
146
+ Private Sub IClass1_DoSomething (ByVal a As Integer)
147
147
MsgBox ""?""
148
148
End Sub
149
- Public Sub IClass_DoSomethingElse (ByVal a As Integer)
149
+ Public Sub IClass1_DoSomethingElse (ByVal a As Integer)
150
150
End Sub" ;
151
- CheckActualEmptyBlockCountEqualsExpected ( interfaceCode , concreteCode , expected ) ;
151
+ CheckActualEmptyBlockCountEqualsExpected ( ( "IClass1" , interfaceCode ) , ( "Class1" , concreteCode ) , expected ) ;
152
152
}
153
153
154
- private void CheckActualEmptyBlockCountEqualsExpected ( string interfaceCode , string concreteCode , int expectedCount )
154
+ private void CheckActualEmptyBlockCountEqualsExpected ( ( string identifier , string code ) interfaceDef , ( string identifier , string code ) implementerDef , int expectedCount )
155
155
{
156
- var builder = new MockVbeBuilder ( ) ;
157
- var project = builder . ProjectBuilder ( "TestProject1" , ProjectProtection . Unprotected )
158
- . AddComponent ( "IClass1" , ComponentType . ClassModule , interfaceCode )
159
- . AddComponent ( "Class1" , ComponentType . ClassModule , concreteCode )
160
- . Build ( ) ;
161
- var vbe = builder . AddProject ( project ) . Build ( ) ;
162
-
163
- var inspectionResults = InspectionResults ( vbe . Object ) ;
164
- Assert . AreEqual ( expectedCount , inspectionResults . Count ( ) ) ;
156
+ var modules = new ( string , string , ComponentType ) [ ]
157
+ {
158
+ ( interfaceDef . identifier , interfaceDef . code , ComponentType . ClassModule ) ,
159
+ ( implementerDef . identifier , implementerDef . code , ComponentType . ClassModule )
160
+ } ;
161
+
162
+ Assert . AreEqual ( expectedCount , InspectionResultsForModules ( modules ) . Count ( ) ) ;
165
163
}
166
164
167
165
protected override IInspection InspectionUnderTest ( RubberduckParserState state )
0 commit comments