diff --git a/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java b/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
index a0cc8da10c..ca8ce0bba5 100644
--- a/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
+++ b/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
@@ -31,148 +31,202 @@ import org.apache.maven.model.Model;
 import org.apache.maven.project.builder.PomClassicDomainModel;
 import org.apache.maven.shared.model.ModelProperty;
 
-public class PomTestWrapper {
+public class PomTestWrapper
+{
 
-	private PomClassicDomainModel domainModel;
-	
-	private JXPathContext context;
-	
-	public PomTestWrapper(PomClassicDomainModel domainModel) throws IOException {
-		if(domainModel == null) {
-			throw new IllegalArgumentException("domainModel: null");
-		}
-		this.domainModel = domainModel;
-		context = JXPathContext.newContext(domainModel.getModel());
-	}
-	
-	public PomTestWrapper(File file) throws IOException {
-		if(file == null) {
-			throw new IllegalArgumentException("file: null");
-		}
-		
-		this.domainModel = new PomClassicDomainModel(file);
-		context = JXPathContext.newContext(domainModel.getModel());
-	}	
-	
-	public PomTestWrapper(Model model) throws IOException  {
-		if(model == null) {
-			throw new IllegalArgumentException("model: null");
-		}
-		
-		this.domainModel = new PomClassicDomainModel(model);
-		context = JXPathContext.newContext(domainModel.getModel());
-	}		
+    private PomClassicDomainModel domainModel;
+
+    private JXPathContext context;
+
+    public PomTestWrapper( PomClassicDomainModel domainModel )
+        throws IOException
+    {
+        if ( domainModel == null )
+        {
+            throw new IllegalArgumentException( "domainModel: null" );
+        }
+        this.domainModel = domainModel;
+        context = JXPathContext.newContext( domainModel.getModel() );
+    }
+
+    public PomTestWrapper( File file )
+        throws IOException
+    {
+        if ( file == null )
+        {
+            throw new IllegalArgumentException( "file: null" );
+        }
+
+        this.domainModel = new PomClassicDomainModel( file );
+        context = JXPathContext.newContext( domainModel.getModel() );
+    }
+
+    public PomTestWrapper( Model model )
+        throws IOException
+    {
+        if ( model == null )
+        {
+            throw new IllegalArgumentException( "model: null" );
+        }
+
+        this.domainModel = new PomClassicDomainModel( model );
+        context = JXPathContext.newContext( domainModel.getModel() );
+    }
 
     public PomClassicDomainModel getDomainModel()
     {
         return this.domainModel;
     }
 
-	public String getValueOfProjectUri(String projectUri, boolean withResolvedValue) throws IOException {
-		if(projectUri.contains("#collection") || projectUri.contains("#set")) {
-			throw new IllegalArgumentException("projectUri: contains a collection or set");
-		}
-		return asMap(withResolvedValue).get(projectUri);
-	}
-	
-	public void setValueOnModel(String expression, Object value) {
-		context.setValue(expression, value);
-	}
-	/*
-	public int containerCountForUri(String uri) throws IOException {
-		if(uri == null || uri.trim().equals("")) {
-			throw new IllegalArgumentException("uri: null or empty");
-		}
-		ModelDataSource source = new DefaultModelDataSource();
-		source.init(domainModel.getModelProperties(), null);
-		return source.queryFor(uri).size();
-	}
+    public String getValueOfProjectUri( String projectUri, boolean withResolvedValue )
+        throws IOException
+    {
+        if ( projectUri.contains( "#collection" ) || projectUri.contains( "#set" ) )
+        {
+            throw new IllegalArgumentException( "projectUri: contains a collection or set" );
+        }
+        return asMap( withResolvedValue ).get( projectUri );
+    }
+
+    public void setValueOnModel( String expression, Object value )
+    {
+        context.setValue( expression, value );
+    }
+
+    /*
+    public int containerCountForUri( String uri )
+        throws IOException
+    {
+        if ( uri == null || uri.trim().equals( "" ) )
+        {
+            throw new IllegalArgumentException( "uri: null or empty" );
+        }
+        ModelDataSource source = new DefaultModelDataSource();
+        source.init( domainModel.getModelProperties(), null );
+        return source.queryFor( uri ).size();
+    }
 	*/
-	
-	public Iterator<?> getIteratorForXPathExpression(String expression) {
-		return context.iterate(expression);
-	}
-	
-	public boolean containsXPathExpression(String expression) {
-		return context.getValue(expression) != null;
-	}
 
-    public Object getValue(String expression) {
-        return context.getValue(expression);
-    }	
-	
-	public boolean xPathExpressionEqualsValue(String expression, String value) {
-		return context.getValue(expression) != null && context.getValue(expression).equals(value);
-	}	
+	public Iterator<?> getIteratorForXPathExpression( String expression )
+    {
+        return context.iterate( expression );
+    }
 
-	public Map<String, String> asMap(boolean withResolvedValues) throws IOException {
-		Map<String, String> map = new HashMap<String, String>();
-		for(ModelProperty mp : domainModel.getModelProperties()) {
-			if(withResolvedValues) {
-				map.put(mp.getUri(), mp.getResolvedValue());	
-			} else {
-				map.put(mp.getUri(), mp.getValue());	
-			}
-			
-		}
-		return map;
-	}
-	
-	public boolean containsModelProperty(ModelProperty modelProperty) throws IOException {
-		return domainModel.getModelProperties().contains(modelProperty);
-	}
-	
-	public boolean containsAllModelPropertiesOf(List<ModelProperty> modelProperties) throws IOException {
-		for(ModelProperty mp : modelProperties) {
-			if(!containsModelProperty(mp)) {
-				return false;
-			}
-		}
-		return true;
-	}	
-	
-	public boolean matchModelProperties(List<ModelProperty> hasProperties, List<ModelProperty> doesNotHaveProperties) throws IOException {
-		return containsAllModelPropertiesOf(hasProperties) && containNoModelPropertiesOf(doesNotHaveProperties);
-	}
-	
-	public boolean matchUris(List<String> hasAllUris, List<String> doesNotHaveUris) throws IOException {
-		return hasAllUris(hasAllUris) && hasNoUris(doesNotHaveUris);
-	}
-	
-	public boolean containNoModelPropertiesOf(List<ModelProperty> modelProperties) throws IOException {
-		for(ModelProperty mp : modelProperties) {
-			if(containsModelProperty(mp)) {
-				return false;
-			}
-		}
-		return true;
-	}		
+    public boolean containsXPathExpression( String expression )
+    {
+        return context.getValue( expression ) != null;
+    }
+
+    public Object getValue( String expression )
+    {
+        return context.getValue( expression );
+    }
+
+    public boolean xPathExpressionEqualsValue( String expression, String value )
+    {
+        return context.getValue( expression ) != null && context.getValue( expression ).equals( value );
+    }
+
+    public Map<String, String> asMap( boolean withResolvedValues )
+        throws IOException
+    {
+        Map<String, String> map = new HashMap<String, String>();
+        for ( ModelProperty mp : domainModel.getModelProperties() )
+        {
+            if ( withResolvedValues )
+            {
+                map.put( mp.getUri(), mp.getResolvedValue() );
+            }
+            else
+            {
+                map.put( mp.getUri(), mp.getValue() );
+            }
+
+        }
+        return map;
+    }
+
+    public boolean containsModelProperty( ModelProperty modelProperty )
+        throws IOException
+    {
+        return domainModel.getModelProperties().contains( modelProperty );
+    }
+
+    public boolean containsAllModelPropertiesOf( List<ModelProperty> modelProperties )
+        throws IOException
+    {
+        for ( ModelProperty mp : modelProperties )
+        {
+            if ( !containsModelProperty( mp ) )
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean matchModelProperties( List<ModelProperty> hasProperties, List<ModelProperty> doesNotHaveProperties )
+        throws IOException
+    {
+        return containsAllModelPropertiesOf( hasProperties ) && containNoModelPropertiesOf( doesNotHaveProperties );
+    }
+
+    public boolean matchUris( List<String> hasAllUris, List<String> doesNotHaveUris )
+        throws IOException
+    {
+        return hasAllUris( hasAllUris ) && hasNoUris( doesNotHaveUris );
+    }
+
+    public boolean containNoModelPropertiesOf( List<ModelProperty> modelProperties )
+        throws IOException
+    {
+        for ( ModelProperty mp : modelProperties )
+        {
+            if ( containsModelProperty( mp ) )
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean hasUri( String uri )
+        throws IOException
+    {
+        for ( ModelProperty mp : domainModel.getModelProperties() )
+        {
+            if ( mp.getValue().equals( uri ) )
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean hasAllUris( List<String> uris )
+        throws IOException
+    {
+        for ( String s : uris )
+        {
+            if ( !hasUri( s ) )
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean hasNoUris( List<String> uris )
+        throws IOException
+    {
+        for ( String s : uris )
+        {
+            if ( hasUri( s ) )
+            {
+                return false;
+            }
+        }
+        return true;
+    }
 
-	public boolean hasUri(String uri) throws IOException {
-		for(ModelProperty mp : domainModel.getModelProperties()) {
-			if(mp.getValue().equals(uri)) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	public boolean hasAllUris(List<String> uris) throws IOException {
-		for(String s : uris) {
-			if(!hasUri(s)) {
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	public boolean hasNoUris(List<String> uris) throws IOException {
-		for(String s : uris) {
-			if(hasUri(s)) {
-				return false;
-			}
-		}
-		return true;
-	}	
-	
 }