svn commit: r512558 - in /maven/components/trunk/maven-embedder/src: main/java/org/apache/maven/embedder/MavenEmbedder.java test/java/org/apache/maven/embedder/configuration/ValidateConfigurationTest.java test/resources/settings/invalid-settings.xml

[jvanzyl]

Author: jvanzyl
Date: Tue Feb 27 17:54:23 2007
New Revision: 512558

URL: http://svn.apache.org/viewvc?view=rev&rev=512558
Log:
o more tests for the configuration validation

Added:
    
maven/components/trunk/maven-embedder/src/test/resources/settings/invalid-settings.xml
   (with props)
Modified:
    
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
    
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/configuration/ValidateConfigurationTest.java

Modified: 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?view=diff&rev=512558&r1=512557&r2=512558
==============================================================================
--- 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
 (original)
+++ 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
 Tue Feb 27 17:54:23 2007
@@ -755,7 +755,6 @@
 
         if ( configuration.getGlobalSettingsFile() != null )
         {
-
             try
             {
                 fileReader = new FileReader( 
configuration.getGlobalSettingsFile() );

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=512558&r1=512557&r2=512558
==============================================================================
--- 
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:54:23 2007
@@ -18,11 +18,25 @@
 
         ConfigurationValidationResult result = 
MavenEmbedder.validateConfiguration( configuration );
 
-        assertTrue( result.isUserSettingsFileParses() );
+        assertTrue( result.isUserSettingsFilePresent() );
 
         assertTrue( result.isUserSettingsFileParses() );
     }
 
+    public void testConfigurationOnlyUserSettingsAreActiveAndItIsInvalid()
+    {
+        File user = new File( getBasedir(), 
"src/test/resources/settings/invalid-settings.xml" );
+
+        Configuration configuration = new DefaultConfiguration()
+            .setUserSettingsFile( user );
+
+        ConfigurationValidationResult result = 
MavenEmbedder.validateConfiguration( configuration );
+
+        assertTrue( result.isUserSettingsFilePresent() );
+
+        assertFalse( result.isUserSettingsFileParses() );
+    }
+
     public void testConfigurationOnlyGlobalSettingsAreActiveAndItIsValid()
     {
         File global = new File( getBasedir(), 
"src/test/resources/settings/valid-settings.xml" );
@@ -35,5 +49,19 @@
         assertTrue( result.isGlobalSettingsFilePresent() );
 
         assertTrue( result.isGlobalSettingsFileParses() );
+    }
+
+    public void testConfigurationOnlyGlobalSettingsAreActiveAndItIsInvalid()
+    {
+        File global = new File( getBasedir(), 
"src/test/resources/settings/invalid-settings.xml" );
+
+        Configuration configuration = new DefaultConfiguration()
+            .setGlobalSettingsFile( global );
+
+        ConfigurationValidationResult result = 
MavenEmbedder.validateConfiguration( configuration );
+
+        assertTrue( result.isGlobalSettingsFilePresent() );
+
+        assertFalse( result.isGlobalSettingsFileParses() );
     }
 }

Added: 
maven/components/trunk/maven-embedder/src/test/resources/settings/invalid-settings.xml
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/resources/settings/invalid-settings.xml?view=auto&rev=512558
==============================================================================
--- 
maven/components/trunk/maven-embedder/src/test/resources/settings/invalid-settings.xml
 (added)
+++ 
maven/components/trunk/maven-embedder/src/test/resources/settings/invalid-settings.xml
 Tue Feb 27 17:54:23 2007
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<settings>
+  <!-- Missing end tag below -->
+  <localRepository>/Users/jvanzyl/maven-repo-local</localRepository
+</settings>

Propchange: 
maven/components/trunk/maven-embedder/src/test/resources/settings/invalid-settings.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
maven/components/trunk/maven-embedder/src/test/resources/settings/invalid-settings.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"