@@ -50,16 +50,12 @@ public async Task UnknownLinkType()
50
50
vsServices . Received ( 1 ) . ShowMessageBoxInfo ( expectMessage ) ;
51
51
}
52
52
53
- [ Test ]
54
- public async Task DifferentLocalRepository_DifferentRepositoryMessage ( )
55
- {
56
- await DifferentLocalRepository ( "targetRepositoryName" , "activeRepositoryName" , Resources . DifferentRepositoryMessage ) ;
57
- }
58
-
59
53
[ TestCase ( "SameRepositoryName" , "SameRepositoryName" , null ) ]
60
54
[ TestCase ( "same_repository_name" , "SAME_REPOSITORY_NAME" , null ) ]
55
+ [ TestCase ( "targetRepositoryName" , "activeRepositoryName" , "#" + nameof ( Resources . DifferentRepositoryMessage ) ) ]
61
56
public async Task DifferentLocalRepository ( string targetRepositoryName , string activeRepositoryName , string expectMessage )
62
57
{
58
+ expectMessage = ResolveResources ( expectMessage ) ;
63
59
var activeRepositoryDir = "activeRepositoryDir" ;
64
60
var context = CreateGitHubContext ( repositoryName : targetRepositoryName ) ;
65
61
var resolveBlobResult = ( "commitish" , "path" , "SHA" ) ;
@@ -79,27 +75,12 @@ public async Task DifferentLocalRepository(string targetRepositoryName, string a
79
75
}
80
76
}
81
77
82
-
83
- [ Test ]
84
- public async Task CouldNotResolve_NoResolveDifferentOwnerMessage ( )
85
- {
86
- await CouldNotResolve ( "TargetOwner" , "CurrentOwner" , Resources . NoResolveDifferentOwnerMessage ) ;
87
- }
88
-
89
- [ Test ]
90
- public async Task CouldNotResolve_NoResolveSameOwnerMessage_SameOwner_SameOwner ( )
91
- {
92
- await CouldNotResolve ( "SameOwner" , "SameOwner" , Resources . NoResolveSameOwnerMessage ) ;
93
- }
94
-
95
- [ Test ]
96
- public async Task CouldNotResolve_NoResolveSameOwnerMessage_sameowner_SAMEOWNER ( )
97
- {
98
- await CouldNotResolve ( "sameowner" , "SAMEOWNER" , Resources . NoResolveSameOwnerMessage ) ;
99
- }
100
-
78
+ [ TestCase ( "TargetOwner" , "CurrentOwner" , "#" + nameof ( Resources . NoResolveDifferentOwnerMessage ) ) ]
79
+ [ TestCase ( "SameOwner" , "SameOwner" , "#" + nameof ( Resources . NoResolveSameOwnerMessage ) ) ]
80
+ [ TestCase ( "sameowner" , "SAMEOWNER" , "#" + nameof ( Resources . NoResolveSameOwnerMessage ) ) ]
101
81
public async Task CouldNotResolve ( string targetOwner , string currentOwner , string expectMessage )
102
82
{
83
+ expectMessage = ResolveResources ( expectMessage ) ;
103
84
var repositoryDir = "repositoryDir" ;
104
85
var repositoryName = "repositoryName" ;
105
86
var context = CreateGitHubContext ( repositoryName : repositoryName , owner : targetOwner ) ;
@@ -146,16 +127,13 @@ public async Task NoChangesInWorkingDirectory()
146
127
vsServices . DidNotReceiveWithAnyArgs ( ) . ShowMessageBoxInfo ( null ) ;
147
128
gitHubContextService . Received ( 1 ) . TryOpenFile ( repositoryDir , context ) ;
148
129
}
149
- [ Test ]
150
- public async Task HasChangesInWorkingDirectorye_ChangesInWorkingDirectoryMessage ( )
151
- {
152
- await HasChangesInWorkingDirectory ( false , Resources . ChangesInWorkingDirectoryMessage , 1 , 1 ) ;
153
- }
154
130
131
+ [ TestCase ( false , "#" + nameof ( Resources . ChangesInWorkingDirectoryMessage ) , 1 , 1 ) ]
155
132
[ TestCase ( true , null , 1 , 0 ) ]
156
133
public async Task HasChangesInWorkingDirectory ( bool annotateFileSupported , string message ,
157
134
int receivedTryAnnotateFile , int receivedTryOpenFile )
158
135
{
136
+ message = ResolveResources ( message ) ;
159
137
var repositoryDir = "repositoryDir" ;
160
138
var repositoryName = "repositoryName" ;
161
139
var targetBranch = "targetBranch" ;
@@ -228,5 +206,15 @@ static OpenFromClipboardCommand CreateOpenFromClipboardCommand(
228
206
new Lazy < ITeamExplorerContext > ( ( ) => teamExplorerContext ) ,
229
207
new Lazy < IVSServices > ( ( ) => vsServices ) ) ;
230
208
}
209
+
210
+ static string ResolveResources ( string str )
211
+ {
212
+ if ( str != null && str . StartsWith ( "#" , StringComparison . Ordinal ) )
213
+ {
214
+ return ( string ) typeof ( Resources ) . GetProperty ( str . Substring ( 1 ) ) . GetValue ( null ) ;
215
+ }
216
+
217
+ return str ;
218
+ }
231
219
}
232
220
}
0 commit comments