22
22
import org .kohsuke .github .GitHub ;
23
23
import org .mockito .Mockito ;
24
24
25
+ import com .projectkaiser .scm .vcs .api .IVCS ;
25
26
import com .projectkaiser .scm .vcs .api .abstracttest .VCSAbstractTest ;
26
27
import com .projectkaiser .scm .vcs .api .workingcopy .IVCSLockedWorkingCopy ;
27
28
import com .projectkaiser .scm .vcs .api .workingcopy .IVCSRepositoryWorkspace ;
@@ -160,12 +161,13 @@ protected String getVCSRepoUrl() {
160
161
}
161
162
162
163
@ Override
163
- protected void createVCS (IVCSRepositoryWorkspace mockedVCSRepo ) {
164
- vcs = Mockito .spy (new GitVCS (mockedVCSRepo ));
164
+ protected IVCS getVCS (IVCSRepositoryWorkspace mockedVCSRepo ) {
165
+ IVCS vcs = Mockito .spy (new GitVCS (mockedVCSRepo ));
165
166
vcs .setCredentials (GITHUB_USER , GITHUB_PASS );
166
167
if (PROXY_HOST != null ) {
167
168
vcs .setProxy (PROXY_HOST , PROXY_PORT , PROXY_USER , PROXY_PASS );
168
169
}
170
+ return vcs ;
169
171
}
170
172
171
173
@ Override
@@ -174,7 +176,7 @@ protected Set<String> getBranches() throws IOException {
174
176
}
175
177
176
178
@ Override
177
- protected Set <String > getCommitMessagesRemote (String branchName ) throws Exception {
179
+ protected Set <String > getCommitMessagesRemote (String branchName ) throws Exception {
178
180
try (IVCSLockedWorkingCopy wc = localVCSRepo .getVCSLockedWorkingCopy ()) {
179
181
try (Git git = ((GitVCS ) vcs ).getLocalGit (wc )) {
180
182
Iterable <RevCommit > logs = git
@@ -202,9 +204,5 @@ protected void setMakeFailureOnVCSReset(Boolean doMakeFailure) {
202
204
mockedGit = null ;
203
205
}
204
206
}
205
-
206
-
207
-
208
-
209
207
}
210
208
0 commit comments