Author: brett
Date: Wed Feb 25 14:40:02 2009
New Revision: 747799
URL: http://svn.apache.org/viewvc?rev=747799&view=rev
Log:
[MNG-2387] <active> on <proxy> in settings is misleading (test cases)
Submitted by: Torben S. Giesselmann
Added:
maven/components/branches/maven-2.1.x/maven-settings/src/test/java/org/apache/maven/settings/SettingsTest.java
(with props)
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-no-proxies.xml
(with props)
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-active-proxy.xml
(with props)
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-inactive-proxy.xml
(with props)
Added:
maven/components/branches/maven-2.1.x/maven-settings/src/test/java/org/apache/maven/settings/SettingsTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-settings/src/test/java/org/apache/maven/settings/SettingsTest.java?rev=747799&view=auto
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-settings/src/test/java/org/apache/maven/settings/SettingsTest.java
(added)
+++
maven/components/branches/maven-2.1.x/maven-settings/src/test/java/org/apache/maven/settings/SettingsTest.java
Wed Feb 25 14:40:02 2009
@@ -0,0 +1,33 @@
+package org.apache.maven.settings;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+public class SettingsTest extends TestCase {
+
+ private Settings settingsNoProxies;
+ private Settings settingsOneInactiveProxy;
+ private Settings settingsOneActiveProxy;
+
+
+ protected void setUp() throws Exception {
+
+ super.setUp();
+
+ // Read different settings files for proxy testing.
+ DefaultMavenSettingsBuilder settingsBuilder = new
DefaultMavenSettingsBuilder();
+ settingsNoProxies = settingsBuilder.buildSettings(new
File("src/test/resources/org/apache/maven/settings/settings-no-proxies.xml"),
false);
+ settingsOneInactiveProxy = settingsBuilder.buildSettings(new
File("src/test/resources/org/apache/maven/settings/settings-one-inactive-proxy.xml"),
false);
+ settingsOneActiveProxy = settingsBuilder.buildSettings(new
File("src/test/resources/org/apache/maven/settings/settings-one-active-proxy.xml"),
false);
+
+ }
+
+
+ public void testProxySettings() {
+
+ assertNull(settingsNoProxies.getActiveProxy());
+ assertNull(settingsOneInactiveProxy.getActiveProxy());
+ assertNotNull(settingsOneActiveProxy.getActiveProxy());
+ }
+}
Propchange:
maven/components/branches/maven-2.1.x/maven-settings/src/test/java/org/apache/maven/settings/SettingsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-no-proxies.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-no-proxies.xml?rev=747799&view=auto
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-no-proxies.xml
(added)
+++
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-no-proxies.xml
Wed Feb 25 14:40:02 2009
@@ -0,0 +1,6 @@
+<settings>
+
+ <proxies>
+ </proxies>
+
+</settings>
Propchange:
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-no-proxies.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-active-proxy.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-active-proxy.xml?rev=747799&view=auto
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-active-proxy.xml
(added)
+++
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-active-proxy.xml
Wed Feb 25 14:40:02 2009
@@ -0,0 +1,15 @@
+<settings>
+
+ <proxies>
+ <proxy>
+ <active>true</active>
+ <protocol>http</protocol>
+ <username>proxyuser</username>
+ <password>proxypass</password>
+ <host>proxy.host.net</host>
+ <port>80</port>
+ <nonProxyHosts>local.net,some.host.com</nonProxyHosts>
+ </proxy>
+ </proxies>
+
+</settings>
Propchange:
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-active-proxy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-inactive-proxy.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-inactive-proxy.xml?rev=747799&view=auto
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-inactive-proxy.xml
(added)
+++
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-inactive-proxy.xml
Wed Feb 25 14:40:02 2009
@@ -0,0 +1,15 @@
+<settings>
+
+ <proxies>
+ <proxy>
+ <active>false</active>
+ <protocol>http</protocol>
+ <username>proxyuser</username>
+ <password>proxypass</password>
+ <host>proxy.host.net</host>
+ <port>80</port>
+ <nonProxyHosts>local.net,some.host.com</nonProxyHosts>
+ </proxy>
+ </proxies>
+
+</settings>
Propchange:
maven/components/branches/maven-2.1.x/maven-settings/src/test/resources/org/apache/maven/settings/settings-one-inactive-proxy.xml
------------------------------------------------------------------------------
svn:eol-style = native
