File tree Expand file tree Collapse file tree 1 file changed +9
-4
lines changed
src/test/java/org/apache/maven/plugins/javadoc Expand file tree Collapse file tree 1 file changed +9
-4
lines changed Original file line number Diff line number Diff line change 62
62
import org .codehaus .plexus .languages .java .version .JavaVersion ;
63
63
import org .hamcrest .MatcherAssert ;
64
64
import org .junit .AssumptionViolatedException ;
65
- import org .junit .Ignore ;
66
65
import org .slf4j .Logger ;
67
66
import org .slf4j .LoggerFactory ;
68
67
import org .sonatype .aether .impl .internal .SimpleLocalRepositoryManager ;
@@ -953,7 +952,6 @@ public void testJdk6()
953
952
*
954
953
* @throws Exception if any
955
954
*/
956
- @ Ignore ("We don't really want to have unit test which need internet access" )
957
955
public void testProxy ()
958
956
throws Exception
959
957
{
@@ -991,8 +989,15 @@ public void testProxy()
991
989
Path commandLine = new File ( getBasedir (), "target/test/unit/proxy-test/target/site/apidocs/javadoc." + ( SystemUtils .IS_OS_WINDOWS ? "bat" : "sh" ) ).toPath ();
992
990
assertThat ( commandLine ).exists ();
993
991
String readed = readFile ( commandLine );
994
- assertThat ( readed ).contains ( "-J-Dhttp.proxyHost=127.0.0.1" ).contains ( "-J-Dhttp.proxyPort=80" )
995
- .contains ( "-J-Dhttp.nonProxyHosts=\\ \" www.google.com^|*.somewhere.com\\ \" " );
992
+ assertThat ( readed ).contains ( "-J-Dhttp.proxyHost=127.0.0.1" ).contains ( "-J-Dhttp.proxyPort=80" );
993
+ if ( SystemUtils .IS_OS_WINDOWS )
994
+ {
995
+ assertThat ( readed ).contains ( " -J-Dhttp.nonProxyHosts=\" www.google.com^|*.somewhere.com\" " );
996
+ }
997
+ else
998
+ {
999
+ assertThat ( readed ).contains ( " \" -J-Dhttp.nonProxyHosts=\\ \" www.google.com^|*.somewhere.com\\ \" \" " );
1000
+ }
996
1001
997
1002
Path options = new File ( getBasedir (), "target/test/unit/proxy-test/target/site/apidocs/options" ).toPath ();
998
1003
assertThat ( options ).exists ();
You can’t perform that action at this time.
0 commit comments