Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-02 19:45:51 +01:00
Code Issues Packages Projects Releases Activity

fix bug in RegexResourceProcessor

Browse Source
This commit is contained in:
Sebastian Sdorra
2010-11-27 17:44:32 +01:00
parent e16c9a17a6
commit 1265785453
2 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scm-core/src/main/java/sonia/scm/io/RegexResourceProcessor.java
View File

@@ -127,8 +127,12 @@ public class RegexResourceProcessor extends AbstractResourceProcessor
} }
} }
return (result != null) if (result != null)
? result.toString() {
: line; m.appendTail(result);
line = result.toString();
}
return line;
} }
} }

30
scm-core/src/test/java/sonia/scm/io/ResourceProcessorTestBase.java
View File

@@ -53,13 +53,16 @@ public abstract class ResourceProcessorTestBase
{ {
/** Field description */ /** Field description */
public static final String TEXT_1 = "Hello Tricia McMillan"; public static final String TEXT_1 = "Hello Tricia McMillan!";
/** Field description */ /** Field description */
public static final String TEXT_2 = "Hello ${person}"; public static final String TEXT_2 = "Hello ${person}!";
/** Field description */ /** Field description */
public static final String TEXT_3 = "Hello ${person} and ${secondPerson}"; public static final String TEXT_3 = "Hello ${person} and ${secondPerson}!";
/** Field description */
public static final String TEXT_4 = "<h1>Hello ${person}</h1>";
/** Field description */ /** Field description */
public static final String VAR_PERSON = "person"; public static final String VAR_PERSON = "person";
@@ -83,6 +86,25 @@ public abstract class ResourceProcessorTestBase
*/ */
protected abstract ResourceProcessor createNewResourceProcessor(); protected abstract ResourceProcessor createNewResourceProcessor();
/**
* Method description
*
*
* @throws IOException
*/
@Test
public void testHtml() throws IOException
{
ResourceProcessor processor = createNewResourceProcessor();
processor.addVariable(VAR_PERSON, VAR_PERSON_VALUE);
StringWriter output = new StringWriter();
processor.process(new StringReader(TEXT_4), output);
assertEquals("<h1>Hello Tricia McMillan</h1>", output.toString());
}
/** /**
* Method description * Method description
* *
@@ -135,7 +157,7 @@ public abstract class ResourceProcessorTestBase
StringWriter output = new StringWriter(); StringWriter output = new StringWriter();
processor.process(new StringReader(TEXT_3), output); processor.process(new StringReader(TEXT_3), output);
assertEquals("Hello Tricia McMillan and Zaphod Beeblebrox", assertEquals("Hello Tricia McMillan and Zaphod Beeblebrox!",
output.toString()); output.toString());
} }