revert

Author: host6

.gitignore

@@ -10,7 +10,9 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
-/.*
-/build/
-/bin/
-
+/.gradle/
+/.settings
+/.classpath
+/.project
+/build/
+/bin/

README.md

@@ -68,7 +68,7 @@ Features:
 
 # Functional testing
 - New local file-based Test Repository is created before each test and deletes automatically after each test
-- To execute tests just run GitVCSTest class as JUnit test. Tests from VCSAbstractTest class will be executed. See [pk-vcs-test](https://github.com/ProjectKaiser/pk-vcs-test) for details
+- To execute tests just run GitVCSTest class as JUnit test. Tests from VCSAbstractTest class will be executed. See  [pk-vcs-test](https://github.com/ProjectKaiser/pk-vcs-test) for details
 - Run `gradle test` to execute tests
 
 # Limitations

build.gradle

@@ -16,6 +16,7 @@ repositories {
 
 dependencies {                                                            
     compile 'com.github.ProjectKaiser:pk-vcs-api:1.1'
+    compile 'commons-logging:commons-logging:1.2'
     compile 'org.eclipse.jgit:org.eclipse.jgit:4.3.0.201604071810-r'
 
     testCompile 'org.mockito:mockito-core:2.0.62-beta'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Mar 28 23:38:07 MSK 2017
+#Fri Apr 22 10:26:49 GMT+03:00 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip

src/main/java/com/projectkaiser/scm/vcs/GitVCS.java

@@ -11,7 +11,11 @@
 import java.net.SocketAddress;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -55,7 +59,7 @@ public class GitVCS implements IVCS {
 	private static final String REFS_REMOTES_ORIGIN = Constants.R_REMOTES + Constants.DEFAULT_REMOTE_NAME + "/";
 
 	private CredentialsProvider credentials;
-	private final IVCSRepositoryWorkspace repo;
+	private IVCSRepositoryWorkspace repo;
 
 	public CredentialsProvider getCredentials() {
 		return credentials;
@@ -265,10 +269,10 @@ public void setProxy(final String host, final int port, String proxyUser, String
 			@Override
 			public List<Proxy> select(URI uri) {
 				if (uri.toString().toLowerCase().contains(repo.getRepoUrl().toLowerCase())) {
-					return Collections.singletonList(new Proxy(Type.HTTP, InetSocketAddress
-							.createUnresolved(host, port)));
+					return Arrays.asList(new Proxy(Type.HTTP, InetSocketAddress
+		                    .createUnresolved(host, port)));
 				} else {
-					return delegate == null ? Collections.singletonList(Proxy.NO_PROXY)
+					return delegate == null ? Arrays.asList(Proxy.NO_PROXY)
 			                : delegate.select(uri);
 				}
 			}

src/test/java/com/projectkaiser/scm/vcs/GitVCSTest.java

@@ -18,10 +18,24 @@
 import com.projectkaiser.scm.vcs.api.workingcopy.IVCSRepositoryWorkspace;
 
 public class GitVCSTest extends VCSAbstractTest {
+	
+	private static final String GITHUB_USER = System.getProperty("PK_VCS_TEST_GITHUB_USER") == null ? 
+			System.getenv("PK_VCS_TEST_GITHUB_USER") : System.getProperty("PK_VCS_TEST_GITHUB_USER");
+	private static final String GITHUB_PASS = System.getProperty("PK_VCS_TEST_GITHUB_PASS") == null ? 
+			System.getenv("PK_VCS_TEST_GITHUB_PASS") : System.getProperty("PK_VCS_TEST_GITHUB_PASS");
 
+	private Git mockedGit;
 	private Repository localGitRepo;
 	private RuntimeException testGitResetException = new RuntimeException("test exeption on git.reset()");
 
+	@BeforeClass
+	public static void setUpClass() {
+		assertTrue("Set PK_VCS_TEST_GITHUB_USER enviroment variable as user name of a valid github account to execute tests.", 
+				GITHUB_USER != null);
+		assertTrue("Set PK_VCS_TEST_GITHUB_PASS enviroment variable as user password of a valid github account to execute tests.", 
+				GITHUB_PASS != null);
+	}
+	
 	@Override
 	public void setUp() throws Exception {
 		super.setUp();
@@ -56,7 +70,6 @@ protected IVCS getVCS(IVCSRepositoryWorkspace mockedVCSRepo) {
 
 	@Override
 	protected void setMakeFailureOnVCSReset(Boolean doMakeFailure) {
-		Git mockedGit;
 		if (doMakeFailure) {
 			mockedGit = Mockito.spy(((GitVCS) vcs).getLocalGit(mockedLWC));
 			Mockito.doReturn(mockedGit).when((GitVCS) vcs).getLocalGit(mockedLWC);