@@ -50,16 +50,12 @@ public async Task UnknownLinkType()
5050 vsServices . Received ( 1 ) . ShowMessageBoxInfo ( expectMessage ) ;
5151 }
5252
53- [ Test ]
54- public async Task DifferentLocalRepository_DifferentRepositoryMessage ( )
55- {
56- await DifferentLocalRepository ( "targetRepositoryName" , "activeRepositoryName" , Resources . DifferentRepositoryMessage ) ;
57- }
58-
5953 [ TestCase ( "SameRepositoryName" , "SameRepositoryName" , null ) ]
6054 [ TestCase ( "same_repository_name" , "SAME_REPOSITORY_NAME" , null ) ]
55+ [ TestCase ( "targetRepositoryName" , "activeRepositoryName" , "#" + nameof ( Resources . DifferentRepositoryMessage ) ) ]
6156 public async Task DifferentLocalRepository ( string targetRepositoryName , string activeRepositoryName , string expectMessage )
6257 {
58+ expectMessage = ResolveResources ( expectMessage ) ;
6359 var activeRepositoryDir = "activeRepositoryDir" ;
6460 var context = CreateGitHubContext ( repositoryName : targetRepositoryName ) ;
6561 var resolveBlobResult = ( "commitish" , "path" , "SHA" ) ;
@@ -79,27 +75,12 @@ public async Task DifferentLocalRepository(string targetRepositoryName, string a
7975 }
8076 }
8177
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 ) ) ]
10181 public async Task CouldNotResolve ( string targetOwner , string currentOwner , string expectMessage )
10282 {
83+ expectMessage = ResolveResources ( expectMessage ) ;
10384 var repositoryDir = "repositoryDir" ;
10485 var repositoryName = "repositoryName" ;
10586 var context = CreateGitHubContext ( repositoryName : repositoryName , owner : targetOwner ) ;
@@ -146,16 +127,13 @@ public async Task NoChangesInWorkingDirectory()
146127 vsServices . DidNotReceiveWithAnyArgs ( ) . ShowMessageBoxInfo ( null ) ;
147128 gitHubContextService . Received ( 1 ) . TryOpenFile ( repositoryDir , context ) ;
148129 }
149- [ Test ]
150- public async Task HasChangesInWorkingDirectorye_ChangesInWorkingDirectoryMessage ( )
151- {
152- await HasChangesInWorkingDirectory ( false , Resources . ChangesInWorkingDirectoryMessage , 1 , 1 ) ;
153- }
154130
131+ [ TestCase ( false , "#" + nameof ( Resources . ChangesInWorkingDirectoryMessage ) , 1 , 1 ) ]
155132 [ TestCase ( true , null , 1 , 0 ) ]
156133 public async Task HasChangesInWorkingDirectory ( bool annotateFileSupported , string message ,
157134 int receivedTryAnnotateFile , int receivedTryOpenFile )
158135 {
136+ message = ResolveResources ( message ) ;
159137 var repositoryDir = "repositoryDir" ;
160138 var repositoryName = "repositoryName" ;
161139 var targetBranch = "targetBranch" ;
@@ -228,5 +206,15 @@ static OpenFromClipboardCommand CreateOpenFromClipboardCommand(
228206 new Lazy < ITeamExplorerContext > ( ( ) => teamExplorerContext ) ,
229207 new Lazy < IVSServices > ( ( ) => vsServices ) ) ;
230208 }
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+ }
231219 }
232220}
0 commit comments