Author: brett
Date: Thu Aug 23 07:18:00 2007
New Revision: 569007
URL: http://svn.apache.org/viewvc?rev=569007&view=rev
Log:
[MRM-462] couple of additional tests
Modified:
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
Modified:
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml?rev=569007&r1=569006&r2=569007&view=diff
==============================================================================
---
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml
(original)
+++
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml
Thu Aug 23 07:18:00 2007
@@ -33,7 +33,7 @@
<repository>
<id>snapshots</id>
<name>Archiva Managed Snapshot Repository</name>
- <url>file://${appserver.base}/repositories/internal</url>
+ <url>file://${appserver.base}/repositories/snapshots</url>
<layout>default</layout>
<releases>false</releases>
<snapshots>true</snapshots>
Modified:
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java?rev=569007&r1=569006&r2=569007&view=diff
==============================================================================
---
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
(original)
+++
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
Thu Aug 23 07:18:00 2007
@@ -28,6 +28,7 @@
import java.io.File;
import java.util.List;
+import java.util.Map;
/**
* Test the configuration store.
@@ -519,15 +520,27 @@
assertConfiguration( configuration );
assertEquals( "check network proxies", 1,
configuration.getNetworkProxies().size() );
- ManagedRepositoryConfiguration repository =
- (ManagedRepositoryConfiguration)
configuration.getManagedRepositories().get( 0 );
+ assertEquals( "check managed repositories", 2,
configuration.getManagedRepositories().size() );
+ Map<String, ManagedRepositoryConfiguration> map =
configuration.getManagedRepositoriesAsMap();
+
+ ManagedRepositoryConfiguration repository = map.get( "internal" );
assertEquals( "check managed repositories",
"${appserver.base}/repositories/internal",
repository.getLocation() );
assertEquals( "check managed repositories", "Archiva Managed Internal
Repository", repository.getName() );
assertEquals( "check managed repositories", "internal",
repository.getId() );
assertEquals( "check managed repositories", "default",
repository.getLayout() );
assertTrue( "check managed repositories", repository.isIndexed() );
+ assertFalse( "check managed repositories", repository.isSnapshots() );
+
+ repository = map.get( "snapshots" );
+ assertEquals( "check managed repositories",
"${appserver.base}/repositories/snapshots",
+ repository.getLocation() );
+ assertEquals( "check managed repositories", "Archiva Managed Snapshot
Repository", repository.getName() );
+ assertEquals( "check managed repositories", "snapshots",
repository.getId() );
+ assertEquals( "check managed repositories", "default",
repository.getLayout() );
+ assertTrue( "check managed repositories", repository.isIndexed() );
+ assertTrue( "check managed repositories", repository.isSnapshots() );
}
public void testCronExpressionsWithComma()