[jboss-svn-commits] JBoss Common SVN: r2898 - in common-core/trunk/src: test/java/org/jboss/test/util/test and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 11 14:23:09 EDT 2008
Author: bstansberry at jboss.com
Date: 2008-08-11 14:23:09 -0400 (Mon, 11 Aug 2008)
New Revision: 2898
Added:
common-core/trunk/src/test/java/org/jboss/test/util/test/StringPropertyReplacerUnitTestCase.java
Modified:
common-core/trunk/src/main/java/org/jboss/util/StringPropertyReplacer.java
Log:
[JBCOMMON-62] Properly handle missing properties when others are replaced
Modified: common-core/trunk/src/main/java/org/jboss/util/StringPropertyReplacer.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/StringPropertyReplacer.java 2008-08-08 08:27:06 UTC (rev 2897)
+++ common-core/trunk/src/main/java/org/jboss/util/StringPropertyReplacer.java 2008-08-11 18:23:09 UTC (rev 2898)
@@ -190,9 +190,16 @@
if (value != null)
{
- properties = true;
+ properties = true;
buffer.append(value);
}
+ else
+ {
+ buffer.append("${");
+ buffer.append(key);
+ buffer.append('}');
+ }
+
}
start = i + 1;
state = NORMAL;
Added: common-core/trunk/src/test/java/org/jboss/test/util/test/StringPropertyReplacerUnitTestCase.java
===================================================================
--- common-core/trunk/src/test/java/org/jboss/test/util/test/StringPropertyReplacerUnitTestCase.java (rev 0)
+++ common-core/trunk/src/test/java/org/jboss/test/util/test/StringPropertyReplacerUnitTestCase.java 2008-08-11 18:23:09 UTC (rev 2898)
@@ -0,0 +1,392 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.util.test;
+
+import static org.jboss.util.StringPropertyReplacer.*;
+import static org.junit.Assert.*;
+
+import java.util.Properties;
+
+import junit.framework.TestCase;
+
+import org.jboss.util.StringPropertyReplacer;
+import org.junit.Test;
+
+/**
+ * A StringPropertyReplacerUnitTestCase.
+ *
+ * @author Brian Stansberry
+ * @version $Revision$
+ */
+public class StringPropertyReplacerUnitTestCase extends TestCase
+{
+ private static final String PROP_A = "string.prop.replace.test.a";
+ private static final String PROP_B = "string.prop.replace.test.b";
+ private static final String PROP_C = "string.prop.replace.test.c";
+ private static final String PROP_D = "string.prop.replace.test.d";
+ private static final String DEFAULT = "DEFAULT";
+ private static final String VALUE = "VALUE";
+ private static final String WRAPPER = "wrapper";
+
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+
+ System.clearProperty(PROP_A);
+ System.clearProperty(PROP_B);
+ System.clearProperty(PROP_C);
+ System.clearProperty(PROP_D);
+ }
+
+ private static Properties setupProperties()
+ {
+ Properties props = new Properties();
+ props.put(PROP_A, VALUE);
+ props.put(PROP_C, VALUE);
+ return props;
+ }
+
+ private static void setupSystemProperties()
+ {
+ System.setProperty(PROP_A, VALUE);
+ System.setProperty(PROP_C, VALUE);
+ }
+
+ public void testNullInput()
+ {
+ try
+ {
+ assertNull(replaceProperties(null));
+ fail("NPE expected with null input");
+ }
+ catch (NullPointerException good) {}
+
+ try
+ {
+ assertNull(replaceProperties(null, setupProperties()));
+ fail("NPE expected with null input");
+ }
+ catch (NullPointerException good) {}
+ }
+
+ public void testBasicReplacement()
+ {
+ basicReplacementTest(false);
+ }
+
+ public void testBasicReplacementFromSystemProps()
+ {
+ basicReplacementTest(true);
+ }
+
+ private void basicReplacementTest(boolean useSysProps)
+ {
+ String input = "${"+PROP_A+"}";
+ String output = null;
+ if (useSysProps)
+ {
+ setupSystemProperties();
+ output = replaceProperties(input);
+ }
+ else
+ {
+ output = replaceProperties(input, setupProperties());
+ }
+
+ assertEquals(VALUE, output);
+ }
+
+ public void testWrappedReplacement()
+ {
+ wrappedReplacementTest(false);
+ }
+
+ public void testWrappedReplacementFromSystemProps()
+ {
+ wrappedReplacementTest(true);
+ }
+
+ private void wrappedReplacementTest(boolean useSysProps)
+ {
+ String input = WRAPPER+"${"+PROP_A+"}";
+ String output = null;
+ if (useSysProps)
+ {
+ setupSystemProperties();
+ output = replaceProperties(input);
+ }
+ else
+ {
+ output = replaceProperties(input, setupProperties());
+ }
+
+ assertEquals(WRAPPER+VALUE, output);
+
+ input = "${"+PROP_A+"}"+WRAPPER;
+ output = null;
+ if (useSysProps)
+ {
+ output = replaceProperties(input);
+ }
+ else
+ {
+ output = replaceProperties(input, setupProperties());
+ }
+
+ assertEquals(VALUE+WRAPPER, output);
+
+ input = WRAPPER+"${"+PROP_A+"}"+WRAPPER;
+ output = null;
+ if (useSysProps)
+ {
+ setupSystemProperties();
+ output = replaceProperties(input);
+ }
+ else
+ {
+ output = replaceProperties(input, setupProperties());
+ }
+
+ assertEquals(WRAPPER+VALUE+WRAPPER, output);
+ }
+
+ public void testMissingProperty()
+ {
+ missingPropertyTest(false);
+ }
+
+ public void testMissingPropertyFromSystemProps()
+ {
+ missingPropertyTest(true);
+ }
+
+ private void missingPropertyTest(boolean useSysProps)
+ {
+ String input = WRAPPER+"${"+PROP_B+"}"+WRAPPER;
+ String output = null;
+ if (useSysProps)
+ {
+ setupSystemProperties();
+ output = replaceProperties(input);
+ }
+ else
+ {
+ output = replaceProperties(input, setupProperties());
+ }
+
+ assertEquals(input, output);
+ }
+
+ public void testWrappedMissingProperty()
+ {
+ wrappedMissingPropertyTest(false);
+ }
+
+ public void testWrappedMissingPropertyFromSystemProps()
+ {
+ wrappedMissingPropertyTest(true);
+ }
+
+ private void wrappedMissingPropertyTest(boolean useSysProps)
+ {
+ String input = WRAPPER+"${"+PROP_B+"}"+WRAPPER;
+ String output = null;
+ if (useSysProps)
+ {
+ setupSystemProperties();
+ output = replaceProperties(input);
+ }
+ else
+ {
+ output = replaceProperties(input, setupProperties());
+ }
+
+ assertEquals(input, output);
+ }
+
+ public void testDefaultValue()
+ {
+ defaultValueTest(false);
+ }
+
+ public void testDefaultValueFromSystemProps()
+ {
+ defaultValueTest(true);
+ }
+
+ private void defaultValueTest(boolean useSysProps)
+ {
+ String input = "${"+PROP_B+":"+DEFAULT+"}";
+ String output = null;
+ if (useSysProps)
+ {
+ setupSystemProperties();
+ output = replaceProperties(input);
+ }
+ else
+ {
+ output = replaceProperties(input, setupProperties());
+ }
+
+ assertEquals(DEFAULT, output);
+ }
+
+ public void testSecondaryProperty()
+ {
+ secondaryPropertyTest(false);
+ }
+
+ public void testSecondaryPropertyFromSystemProps()
+ {
+ secondaryPropertyTest(true);
+ }
+
+ private void secondaryPropertyTest(boolean useSysProps)
+ {
+ String input = "${"+PROP_B+","+PROP_C+"}";
+ String output = null;
+ if (useSysProps)
+ {
+ setupSystemProperties();
+ output = replaceProperties(input);
+ }
+ else
+ {
+ output = replaceProperties(input, setupProperties());
+ }
+
+ assertEquals(VALUE, output);
+ }
+
+ public void testSecondaryPropertyAndDefault()
+ {
+ secondaryPropertyAndDefaultTest(false);
+ }
+
+ public void testSecondaryPropertyAndDefaultFromSystemProps()
+ {
+ secondaryPropertyAndDefaultTest(true);
+ }
+
+ private void secondaryPropertyAndDefaultTest(boolean useSysProps)
+ {
+ String input = "${"+PROP_B+","+PROP_D+":"+DEFAULT+"}";
+ String output = null;
+ if (useSysProps)
+ {
+ setupSystemProperties();
+ output = replaceProperties(input);
+ }
+ else
+ {
+ output = replaceProperties(input, setupProperties());
+ }
+
+ assertEquals(DEFAULT, output);
+ }
+
+ public void testSecondaryPropertyAndMissing()
+ {
+ secondaryPropertyAndMissingTest(false);
+ }
+
+ public void testSecondaryPropertyAndMissingFromSystemProps()
+ {
+ secondaryPropertyAndMissingTest(true);
+ }
+
+ private void secondaryPropertyAndMissingTest(boolean useSysProps)
+ {
+ String input = "${"+PROP_B+","+PROP_D+"}";
+ String output = null;
+ if (useSysProps)
+ {
+ setupSystemProperties();
+ output = replaceProperties(input);
+ }
+ else
+ {
+ output = replaceProperties(input, setupProperties());
+ }
+
+ assertEquals(input, output);
+ }
+
+ public void testMultipleReplacements()
+ {
+ multipleReplacementTest(false);
+ }
+
+ public void testMultipleReplacementsFromSystemProps()
+ {
+ multipleReplacementTest(true);
+ }
+
+ private void multipleReplacementTest(boolean useSysProps)
+ {
+ String input = "${"+PROP_A+"}${"+PROP_C+"}";
+ String output = null;
+ if (useSysProps)
+ {
+ setupSystemProperties();
+ output = replaceProperties(input);
+ }
+ else
+ {
+ output = replaceProperties(input, setupProperties());
+ }
+
+ assertEquals(VALUE+VALUE, output);
+ }
+
+ public void testPartialMissing()
+ {
+ partialMissingTest(false);
+ }
+
+ public void testPartialMissingFromSystemProps()
+ {
+ partialMissingTest(true);
+ }
+
+ private void partialMissingTest(boolean useSysProps)
+ {
+ String badinput = "${"+PROP_B+"}";
+ String input = WRAPPER+"${"+PROP_A+"}"+badinput+"${"+PROP_C+"}"+WRAPPER;
+ String output = null;
+ if (useSysProps)
+ {
+ setupSystemProperties();
+ output = replaceProperties(input);
+ }
+ else
+ {
+ output = replaceProperties(input, setupProperties());
+ }
+
+ assertEquals(WRAPPER+VALUE+badinput+VALUE+WRAPPER, output);
+ }
+
+}
More information about the jboss-svn-commits
mailing list