Author: olamy
Date: Fri Feb 8 14:49:37 2008
New Revision: 620020
URL: http://svn.apache.org/viewvc?rev=620020&view=rev
Log:
fix license header
add junit
Added:
maven/sandbox/trunk/shared/maven-filtering/src/test/units-files/propertyutils-test.properties
(with props)
Modified:
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/StubMavenProject.java
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
Modified:
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java?rev=620020&r1=620019&r2=620020&view=diff
==============================================================================
---
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
(original)
+++
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
Fri Feb 8 14:49:37 2008
@@ -1,3 +1,5 @@
+package org.apache.maven.shared.filtering;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.shared.filtering;
import java.io.File;
import java.util.ArrayList;
Modified:
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java?rev=620020&r1=620019&r2=620020&view=diff
==============================================================================
---
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
(original)
+++
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
Fri Feb 8 14:49:37 2008
@@ -1,3 +1,5 @@
+package org.apache.maven.shared.filtering;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.shared.filtering;
import java.io.File;
import java.io.FileWriter;
@@ -98,4 +99,18 @@
// exception ok
}
}
+
+ public void testloadpropertiesFile()
+ throws Exception
+ {
+ File propertyFile = new File( getBasedir() +
"/src/test/units-files/propertyutils-test.properties" );
+ Properties baseProps = new Properties();
+ baseProps.put( "pom.version", "realVersion" );
+
+ Properties interpolated = PropertyUtils.loadPropertyFile(
propertyFile, baseProps );
+ assertEquals( "realVersion", interpolated.get( "version" ) );
+ assertEquals( "${foo}", interpolated.get( "foo" ) );
+ assertEquals( "realVersion", interpolated.get( "bar" ) );
+ assertEquals( "none filtered", interpolated.get( "none" ) );
+ }
}
Modified:
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/StubMavenProject.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/StubMavenProject.java?rev=620020&r1=620019&r2=620020&view=diff
==============================================================================
---
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/StubMavenProject.java
(original)
+++
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/StubMavenProject.java
Fri Feb 8 14:49:37 2008
@@ -1,3 +1,5 @@
+package org.apache.maven.shared.filtering;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.shared.filtering;
import java.io.File;
import java.util.Properties;
Modified:
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java?rev=620020&r1=620019&r2=620020&view=diff
==============================================================================
---
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
(original)
+++
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
Fri Feb 8 14:49:37 2008
@@ -1,3 +1,5 @@
+package org.apache.maven.shared.filtering;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.shared.filtering;
import java.io.File;
import java.io.FileInputStream;
Added:
maven/sandbox/trunk/shared/maven-filtering/src/test/units-files/propertyutils-test.properties
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/test/units-files/propertyutils-test.properties?rev=620020&view=auto
==============================================================================
---
maven/sandbox/trunk/shared/maven-filtering/src/test/units-files/propertyutils-test.properties
(added)
+++
maven/sandbox/trunk/shared/maven-filtering/src/test/units-files/propertyutils-test.properties
Fri Feb 8 14:49:37 2008
@@ -0,0 +1,23 @@
+#/*
+# * Licensed to the Apache Software Foundation (ASF) under one
+# * or more contributor license agreements. See the NOTICE file
+# * distributed with this work for additional information
+# * regarding copyright ownership. The ASF licenses this file
+# * to you under the Apache License, Version 2.0 (the
+# * "License"); you may not use this file except in compliance
+# * with the License. You may obtain a copy of the License at
+# *
+# * http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing,
+# * software distributed under the License is distributed on an
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# * KIND, either express or implied. See the License for the
+# * specific language governing permissions and limitations
+# * under the License.
+# */
+version=${pom.version}
+groupId=${pom.groupId}
+foo=${foo}
+none=none filtered
+bar=${version}
\ No newline at end of file
Propchange:
maven/sandbox/trunk/shared/maven-filtering/src/test/units-files/propertyutils-test.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/sandbox/trunk/shared/maven-filtering/src/test/units-files/propertyutils-test.properties
------------------------------------------------------------------------------
svn:executable = *
Propchange:
maven/sandbox/trunk/shared/maven-filtering/src/test/units-files/propertyutils-test.properties
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
