You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2020/02/13 22:11:21 UTC

[maven-filtering] 11/44: fix license header add junit

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to annotated tag maven-filtering-1.0-alpha-1
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git

commit b711d73ab55ce045e1e8d4daca43adb2bb64c81f
Author: Oliver Lamy <ol...@apache.org>
AuthorDate: Fri Feb 8 22:49:37 2008 +0000

    fix license header
    add junit
    
    
    git-svn-id: https://svn.apache.org/repos/asf/maven/sandbox/trunk/shared/maven-filtering@620020 13f79535-47bb-0310-9956-ffa450edef68
---
 .../DefaultMavenResourcesFilteringTest.java        |  3 ++-
 .../maven/shared/filtering/PropertyUtilsTest.java  | 17 +++++++++++++++-
 .../maven/shared/filtering/StubMavenProject.java   |  3 ++-
 .../shared/filtering/TestReflectionProperties.java |  3 ++-
 src/test/units-files/propertyutils-test.properties | 23 ++++++++++++++++++++++
 5 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
index 0fe15c4..b8d3fce 100755
--- a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
@@ -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;
diff --git a/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java b/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
index 2a75b98..12bd282 100755
--- a/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
@@ -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 @@ public class PropertyUtilsTest
             // 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" ) );
+    }    
 }
diff --git a/src/test/java/org/apache/maven/shared/filtering/StubMavenProject.java b/src/test/java/org/apache/maven/shared/filtering/StubMavenProject.java
index 2e3262c..9fb5cab 100755
--- a/src/test/java/org/apache/maven/shared/filtering/StubMavenProject.java
+++ b/src/test/java/org/apache/maven/shared/filtering/StubMavenProject.java
@@ -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;
diff --git a/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java b/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
index e0a7077..4784f6e 100755
--- a/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
+++ b/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
@@ -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;
diff --git a/src/test/units-files/propertyutils-test.properties b/src/test/units-files/propertyutils-test.properties
new file mode 100755
index 0000000..aac8e87
--- /dev/null
+++ b/src/test/units-files/propertyutils-test.properties
@@ -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