You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2007/08/29 20:31:12 UTC
svn commit: r570891 -
/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/ValidateConfigurationTest.java
Author: carlos
Date: Wed Aug 29 11:31:11 2007
New Revision: 570891
URL: http://svn.apache.org/viewvc?rev=570891&view=rev
Log:
Add tests for new methods
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/ValidateConfigurationTest.java
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/ValidateConfigurationTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/ValidateConfigurationTest.java?rev=570891&r1=570890&r2=570891&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/ValidateConfigurationTest.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/ValidateConfigurationTest.java Wed Aug 29 11:31:11 2007
@@ -20,6 +20,7 @@
*/
import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
@@ -37,8 +38,11 @@
ConfigurationValidationResult result = MavenEmbedder.validateConfiguration( configuration );
assertTrue( result.isUserSettingsFilePresent() );
-
assertTrue( result.isUserSettingsFileParses() );
+ assertNotNull( result.getUserSettings() );
+ assertNull( result.getUserSettingsException() );
+ assertNull( result.getGlobalSettings() );
+ assertNull( result.getGlobalSettingsException() );
}
public void testConfigurationOnlyUserSettingsAreActiveAndItIsInvalid()
@@ -51,8 +55,12 @@
ConfigurationValidationResult result = MavenEmbedder.validateConfiguration( configuration );
assertTrue( result.isUserSettingsFilePresent() );
-
assertFalse( result.isUserSettingsFileParses() );
+ assertNull( result.getUserSettings() );
+ assertNotNull( result.getUserSettingsException() );
+ assertTrue( result.getUserSettingsException() instanceof XmlPullParserException );
+ assertNull( result.getGlobalSettings() );
+ assertNull( result.getGlobalSettingsException() );
}
public void testConfigurationOnlyGlobalSettingsAreActiveAndItIsValid()
@@ -65,8 +73,11 @@
ConfigurationValidationResult result = MavenEmbedder.validateConfiguration( configuration );
assertTrue( result.isGlobalSettingsFilePresent() );
-
assertTrue( result.isGlobalSettingsFileParses() );
+ assertNotNull( result.getGlobalSettings() );
+ assertNull( result.getGlobalSettingsException() );
+ assertNull( result.getUserSettings() );
+ assertNull( result.getUserSettingsException() );
}
public void testConfigurationOnlyGlobalSettingsAreActiveAndItIsInvalid()
@@ -79,7 +90,11 @@
ConfigurationValidationResult result = MavenEmbedder.validateConfiguration( configuration );
assertTrue( result.isGlobalSettingsFilePresent() );
-
assertFalse( result.isGlobalSettingsFileParses() );
+ assertNull( result.getGlobalSettings() );
+ assertNotNull( result.getGlobalSettingsException() );
+ assertTrue( result.getGlobalSettingsException() instanceof XmlPullParserException );
+ assertNull( result.getUserSettings() );
+ assertNull( result.getUserSettingsException() );
}
}