svn commit: r512556 - /maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/configuration/ValidateConfigurationTest.java

[jvanzyl]

Author: jvanzyl
Date: Tue Feb 27 17:45:55 2007
New Revision: 512556

URL: http://svn.apache.org/viewvc?view=rev&rev=512556
Log:
o test for embedder configuration validation

Modified:
    
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/configuration/ValidateConfigurationTest.java

Modified: 
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/configuration/ValidateConfigurationTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/configuration/ValidateConfigurationTest.java?view=diff&rev=512556&r1=512555&r2=512556
==============================================================================
--- 
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/configuration/ValidateConfigurationTest.java
 (original)
+++ 
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/configuration/ValidateConfigurationTest.java
 Tue Feb 27 17:45:55 2007
@@ -9,7 +9,7 @@
 public class ValidateConfigurationTest
     extends PlexusTestCase
 {
-    public void testConfigurationOnlyUserSettingsAreActive()
+    public void testConfigurationOnlyUserSettingsAreActiveAndItIsValid()
     {
         File user = new File( getBasedir(), 
"src/test/resources/settings/valid-settings.xml" );
 
@@ -23,17 +23,17 @@
         assertTrue( result.isUserSettingsFileParses() );
     }
 
-    public void testConfigurationOnlyGlobalSettingsAreActive()
+    public void testConfigurationOnlyGlobalSettingsAreActiveAndItIsValid()
     {
-        File user = new File( getBasedir(), 
"src/test/resources/settings/valid-settings.xml" );
+        File global = new File( getBasedir(), 
"src/test/resources/settings/valid-settings.xml" );
 
         Configuration configuration = new DefaultConfiguration()
-            .setUserSettingsFile( user );
+            .setUserSettingsFile( global );
 
         ConfigurationValidationResult result = 
MavenEmbedder.validateConfiguration( configuration );
 
-        assertTrue( result.isUserSettingsFileParses() );
+        assertTrue( result.isGlobalSettingsFilePresent() );
 
-        assertTrue( result.isUserSettingsFileParses() );
+        assertTrue( result.isGlobalSettingsFileParses() );
     }
 }