Sophisticate proxy parsing and generating, fix misinterpretation if SOCKS proxies

This is a quick and dirty fix; it seems a major redesign is appropriate.
We should also switch to some maintained version of proxy-vole from github.
This one looks halfway active:
https://github.com/MarkusBernhardt/proxy-vole
or maybe one of its forks...

1 files changed, 43 insertions, 0 deletions

diff --git a/src/test/java/com/btr/proxy/util/ProxyUtilTest.java b/src/test/java/com/btr/proxy/util/ProxyUtilTest.java
index 5634600..ffcf03e 100644
--- a/src/test/java/com/btr/proxy/util/ProxyUtilTest.java
+++ b/src/test/java/com/btr/proxy/util/ProxyUtilTest.java
@@ -73,6 +73,49 @@ public class ProxyUtilTest {
 		assertEquals("HTTP @ 192.123.123.1:8080", psList.get(0).toString());
 	}
 
+	/*************************************************************************
+	 * Test parsing method.
+	 ************************************************************************/
+	
+	@Test
+	public void testParseProxySettings6() {
+		ProxySelector rs = ProxyUtil.parseProxySettings("192.123.123.1:8080",Proxy.Type.SOCKS, 1234);
+		List<Proxy> psList = rs.select(TestUtil.HTTP_TEST_URI);
+		assertEquals("SOCKS @ 192.123.123.1:8080", psList.get(0).toString());
+	}
+
+	/*************************************************************************
+	 * Test parsing method.
+	 ************************************************************************/
+	
+	@Test
+	public void testParseProxySettings7() {
+		ProxySelector rs = ProxyUtil.parseProxySettings("192.123.123.1", Proxy.Type.SOCKS, 1234);
+		List<Proxy> psList = rs.select(TestUtil.HTTP_TEST_URI);
+		assertEquals("SOCKS @ 192.123.123.1:1234", psList.get(0).toString());
+	}
+
+	/*************************************************************************
+	 * Test parsing method.
+	 ************************************************************************/
+	
+	@Test
+	public void testParseProxySettings8() {
+		ProxySelector rs = ProxyUtil.parseProxySettings("socks://192.123.123.1", Proxy.Type.HTTP, 1234);
+		List<Proxy> psList = rs.select(TestUtil.HTTP_TEST_URI);
+		assertEquals("SOCKS @ 192.123.123.1:1234", psList.get(0).toString());
+	}
+	
+	/*************************************************************************
+	 * Test parsing method.
+	 ************************************************************************/
+	
+	@Test
+	public void testParseProxySettings9() {
+		ProxySelector rs = ProxyUtil.parseProxySettings("socks://http_proxy.unit-test.invalid/");
+		List<Proxy> psList = rs.select(TestUtil.HTTP_TEST_URI);
+		assertEquals("SOCKS @ http_proxy.unit-test.invalid:1080", psList.get(0).toString());
+	}
 
 }