Skip to content

Commit 25d847e

Browse files
michael-omichael-o
committed
Fix comment formatting
1 parent 95c565a commit 25d847e

1 file changed

Lines changed: 81 additions & 81 deletions

File tree

‎src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java‎

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -48,85 +48,85 @@ public void testFoo() {
4848
}
4949

5050
/**
51-
FIXME find a way to restore those tests as wagonManager.addProxy is not anymore available in maven 3.
52-
public void testGetProxyInfoNoProxyForRepositoryProtocol()
53-
{
54-
wagonManager.addProxy( "http", "proxy-host", 8080, "my-user", "my-password", null );
55-
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
56-
assertNull( "ProxyInfo must be null because http != scp", proxyInfo );
57-
}
58-
59-
public void testGetProxyInfoForRepositoryHostExactlyMatchesNonProxyHosts()
60-
{
61-
wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password",
62-
"a-host,repository-host;another-host" );
63-
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
64-
assertNull( "ProxyInfo must be null because 'repository-host' in nonProxyHosts list", proxyInfo );
65-
}
66-
67-
public void testGetProxyInfoForRepositoryHostWildcardMatchNonProxyHosts1()
68-
{
69-
wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "a-host|repository*|another-host" );
70-
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
71-
assertNull( "ProxyInfo must be null because 'repository-host' in nonProxyHosts list", proxyInfo );
72-
}
73-
74-
public void testGetProxyInfoForRepositoryHostWildcardMatchNonProxyHosts2()
75-
{
76-
wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "*host" );
77-
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
78-
assertNull( "ProxyInfo must be null because 'repository-host' in nonProxyHosts list", proxyInfo );
79-
}
80-
81-
public void testGetProxyInfoForRepositoryHostWildcardMatchNonProxyHosts3()
82-
{
83-
wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "repository*host" );
84-
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
85-
assertNull( "ProxyInfo must be null because 'repository-host' in nonProxyHosts list", proxyInfo );
86-
}
87-
88-
public void testGetProxyInfoForRepositoryHostWildcardNoMatchNonProxyHosts1()
89-
{
90-
wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "mycompany*" );
91-
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
92-
assertNotNull( "ProxyInfo must be found because 'repository-host' not in nonProxyHosts list", proxyInfo );
93-
}
94-
95-
public void testGetProxyInfoForRepositoryHostWildcardNoMatchNonProxyHosts2()
96-
{
97-
wagonManager.
98-
99-
wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "*mycompany" );
100-
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
101-
assertNotNull( "ProxyInfo must be found because 'repository-host' not in nonProxyHosts list", proxyInfo );
102-
}
103-
104-
public void testGetProxyInfoForRepositoryHostWildcardNoMatchNonProxyHosts3()
105-
{
106-
wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "repository*mycompany" );
107-
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
108-
assertNotNull( "ProxyInfo must be found because 'repository-host' not in nonProxyHosts list", proxyInfo );
109-
}
110-
111-
public void testGetProxyInfoForRepositoryHostWildcardNoMatchNonProxyHosts4()
112-
{
113-
wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "mycompany*host" );
114-
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
115-
assertNotNull( "ProxyInfo must be found because 'repository-host' not in nonProxyHosts list", proxyInfo );
116-
}
117-
118-
public void testGetProxyInfoForRepositoryHostWildcardNoMatchNonProxyHosts5()
119-
{
120-
wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "mycompany*mycompany" );
121-
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
122-
assertNotNull( "ProxyInfo must be found because 'repository-host' not in nonProxyHosts list", proxyInfo );
123-
}
124-
125-
public void testGetProxyInfoFound()
126-
{
127-
wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "an-host|another-host" );
128-
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
129-
assertNotNull( "ProxyInfo must be found because 'repository-host' not in nonProxyHosts list", proxyInfo );
130-
}
131-
**/
51+
* FIXME find a way to restore those tests as wagonManager.addProxy is not anymore available in maven 3.
52+
* public void testGetProxyInfoNoProxyForRepositoryProtocol()
53+
* {
54+
* wagonManager.addProxy( "http", "proxy-host", 8080, "my-user", "my-password", null );
55+
* ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
56+
* assertNull( "ProxyInfo must be null because http != scp", proxyInfo );
57+
* }
58+
*
59+
* public void testGetProxyInfoForRepositoryHostExactlyMatchesNonProxyHosts()
60+
* {
61+
* wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password",
62+
* "a-host,repository-host;another-host" );
63+
* ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
64+
* assertNull( "ProxyInfo must be null because 'repository-host' in nonProxyHosts list", proxyInfo );
65+
* }
66+
*
67+
* public void testGetProxyInfoForRepositoryHostWildcardMatchNonProxyHosts1()
68+
* {
69+
* wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "a-host|repository*|another-host" );
70+
* ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
71+
* assertNull( "ProxyInfo must be null because 'repository-host' in nonProxyHosts list", proxyInfo );
72+
* }
73+
*
74+
* public void testGetProxyInfoForRepositoryHostWildcardMatchNonProxyHosts2()
75+
* {
76+
* wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "*host" );
77+
* ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
78+
* assertNull( "ProxyInfo must be null because 'repository-host' in nonProxyHosts list", proxyInfo );
79+
* }
80+
*
81+
* public void testGetProxyInfoForRepositoryHostWildcardMatchNonProxyHosts3()
82+
* {
83+
* wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "repository*host" );
84+
* ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
85+
* assertNull( "ProxyInfo must be null because 'repository-host' in nonProxyHosts list", proxyInfo );
86+
* }
87+
*
88+
* public void testGetProxyInfoForRepositoryHostWildcardNoMatchNonProxyHosts1()
89+
* {
90+
* wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "mycompany*" );
91+
* ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
92+
* assertNotNull( "ProxyInfo must be found because 'repository-host' not in nonProxyHosts list", proxyInfo );
93+
* }
94+
*
95+
* public void testGetProxyInfoForRepositoryHostWildcardNoMatchNonProxyHosts2()
96+
* {
97+
* wagonManager.
98+
*
99+
* wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "*mycompany" );
100+
* ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
101+
* assertNotNull( "ProxyInfo must be found because 'repository-host' not in nonProxyHosts list", proxyInfo );
102+
* }
103+
*
104+
* public void testGetProxyInfoForRepositoryHostWildcardNoMatchNonProxyHosts3()
105+
* {
106+
* wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "repository*mycompany" );
107+
* ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
108+
* assertNotNull( "ProxyInfo must be found because 'repository-host' not in nonProxyHosts list", proxyInfo );
109+
* }
110+
*
111+
* public void testGetProxyInfoForRepositoryHostWildcardNoMatchNonProxyHosts4()
112+
* {
113+
* wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "mycompany*host" );
114+
* ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
115+
* assertNotNull( "ProxyInfo must be found because 'repository-host' not in nonProxyHosts list", proxyInfo );
116+
* }
117+
*
118+
* public void testGetProxyInfoForRepositoryHostWildcardNoMatchNonProxyHosts5()
119+
* {
120+
* wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "mycompany*mycompany" );
121+
* ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
122+
* assertNotNull( "ProxyInfo must be found because 'repository-host' not in nonProxyHosts list", proxyInfo );
123+
* }
124+
*
125+
* public void testGetProxyInfoFound()
126+
* {
127+
* wagonManager.addProxy( "scp", "localhost", 8080, "my-user", "my-password", "an-host|another-host" );
128+
* ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
129+
* assertNotNull( "ProxyInfo must be found because 'repository-host' not in nonProxyHosts list", proxyInfo );
130+
* }
131+
**/
132132
}

0 commit comments

Comments
 (0)