travis build fix

Author: host6

.travis.yml

@@ -8,7 +8,7 @@ cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
-script: ./gradlew build --debug
+script: ./gradlew build --info
 after_success:
   - ./gradlew jacocoTestReport coveralls
 

src/main/java/org/scm4j/vcs/GitVCS.java

@@ -264,7 +264,8 @@ public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
 			protected PasswordAuthentication getPasswordAuthentication() {
 				System.out.println(super.getRequestingSite().getHostName());
 				System.out.println(repo.getRepoUrl());
-				if (super.getRequestingSite().getHostName().contains(repo.getRepoUrl())) {
+				if (super.getRequestingSite().getHostName().contains(repo.getRepoUrl()) &&
+						super.getRequestingPort() == port) {
 					return new PasswordAuthentication(proxyUser, proxyPassword.toCharArray());
 				}
 				return super.getPasswordAuthentication();

src/test/java/org/scm4j/vcs/GitVCSTest.java

@@ -91,39 +91,39 @@ public void testSetCredentials() {
 
 	@Test
 	public void testProxyAuth() throws Exception {
-		PasswordAuthentication initialAuth = Authenticator.requestPasswordAuthentication(InetAddress.getByName("127.0.0.1"),
+		PasswordAuthentication initialAuth = Authenticator.requestPasswordAuthentication(InetAddress.getByName("localhost"),
 				123, "http", "", "");
-		IVCS vcs = new GitVCS(localVCSWorkspace.getVCSRepositoryWorkspace("127.0.0.1"));
-		vcs.setProxy("127.0.0.1", 123, "username", "pwd");
+		IVCS vcs = new GitVCS(localVCSWorkspace.getVCSRepositoryWorkspace("localhost"));
+		vcs.setProxy("localhost", 123, "username", "pwd");
 
 		PasswordAuthentication resultAuth = Authenticator.requestPasswordAuthentication(
-				InetAddress.getByName("127.0.0.1"), 123, "http", "", "");
+				InetAddress.getByName("localhost"), 123, "http", "", "");
 		assertEquals(resultAuth.getUserName(), "username");
 		assertEquals(new String(resultAuth.getPassword()), "pwd");
 
 		resultAuth = Authenticator.requestPasswordAuthentication(
-				InetAddress.getByName("localhost"), 123, "http", "", "");
+				InetAddress.getByName("localhost"), 124, "http", "", "");
 		assertEquals(resultAuth, initialAuth);
 	}
 
 	@Test
 	public void testProxySelector() throws URISyntaxException {
-		vcs.setProxy("127.0.0.1", 123, "username", "pwd");
+		vcs.setProxy("localhost", 123, "username", "pwd");
 		ProxySelector actualPS = ProxySelector.getDefault();
 		List<Proxy> proxies = actualPS.select(new URI(vcs.getRepoUrl()));
 		assertTrue(proxies.size() == 1);
 		Proxy actualP = proxies.get(0);
 		assertTrue(actualP.address() instanceof InetSocketAddress);
 		InetSocketAddress isa = (InetSocketAddress) actualP.address();
-		assertEquals(isa.getHostName(), "127.0.0.1");
+		assertEquals(isa.getHostName(), "localhost");
 		assertEquals(isa.getPort(), 123);
 	}
 
 	@Test
 	public void testParentProxySelectorUsage() throws URISyntaxException {
 		ProxySelector mockedPS = Mockito.mock(ProxySelector.class);
 		ProxySelector.setDefault(mockedPS);
-		vcs.setProxy("127.0.0.1", 123, "username", "pwd");
+		vcs.setProxy("localhost", 123, "username", "pwd");
 		ProxySelector actualPS = ProxySelector.getDefault();
 		URI uri = new URI("http://unknown");
 		actualPS.select(uri);
@@ -133,7 +133,7 @@ public void testParentProxySelectorUsage() throws URISyntaxException {
 	@Test
 	public void testNullProxySelector() throws URISyntaxException {
 		ProxySelector.setDefault(null);
-		vcs.setProxy("127.0.0.1", 123, "username", "pwd");
+		vcs.setProxy("localhost", 123, "username", "pwd");
 		ProxySelector actualPS = ProxySelector.getDefault();
 		List<Proxy> proxies = actualPS.select(new URI("http://unknown"));
 		assertTrue(proxies.size() == 1);
@@ -144,7 +144,7 @@ public void testNullProxySelector() throws URISyntaxException {
 	public void testParentSelectorCallOnConnectFailed() throws URISyntaxException {
 		ProxySelector mockedPS = Mockito.mock(ProxySelector.class);
 		ProxySelector.setDefault(mockedPS);
-		vcs.setProxy("127.0.0.1", 123, "username", "pwd");
+		vcs.setProxy("localhost", 123, "username", "pwd");
 		ProxySelector actualPS = ProxySelector.getDefault();
 		URI testURI = new URI("http://proxy.net");
 		SocketAddress testSA = InetSocketAddress.createUnresolved("http://proxy.net", 123);
@@ -155,7 +155,7 @@ public void testParentSelectorCallOnConnectFailed() throws URISyntaxException {
 	@Test
 	public void testNoParentSelectorOnConnectFailed() throws URISyntaxException {
 		ProxySelector.setDefault(null);
-		vcs.setProxy("127.0.0.1", 123, "username", "pwd");
+		vcs.setProxy("localhost", 123, "username", "pwd");
 		ProxySelector actualPS = Mockito.spy(ProxySelector.getDefault());
 		URI testURI = new URI("http://proxy.net");
 		SocketAddress testSA = InetSocketAddress.createUnresolved("http://proxy.net", 123);