From: <ap...@us...> - 2006-11-18 08:10:38
|
Revision: 1667 http://svn.sourceforge.net/pcgen/?rev=1667&view=rev Author: apsen Date: 2006-11-18 00:10:38 -0800 (Sat, 18 Nov 2006) Log Message: ----------- Fixes related to BioTokenTest failing after adding support for regexp filters Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/io/filters/PatternFilter.java Trunk/pcgen/code/src/java/plugin/exporttokens/BioToken.java Trunk/pcgen/code/src/test/plugin/exporttokens/BioTokenTest.java Modified: Trunk/pcgen/code/src/java/pcgen/io/filters/PatternFilter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/filters/PatternFilter.java 2006-11-17 02:56:58 UTC (rev 1666) +++ Trunk/pcgen/code/src/java/pcgen/io/filters/PatternFilter.java 2006-11-18 08:10:38 UTC (rev 1667) @@ -87,7 +87,8 @@ if (filterEntry.size() == 2) { match.add(filterEntry.get(0)); - replace.add(filterEntry.get(1)); + + replace.add(filterEntry.get(1).replaceAll("\\\\n", System.getProperty("line.separator"))); Logging.debugPrint("Match: [" + filterEntry.get(0) + "] and replace with [" + filterEntry.get(1) + "]"); } else if (filterEntry.size() == 1) Modified: Trunk/pcgen/code/src/java/plugin/exporttokens/BioToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/exporttokens/BioToken.java 2006-11-17 02:56:58 UTC (rev 1666) +++ Trunk/pcgen/code/src/java/plugin/exporttokens/BioToken.java 2006-11-18 08:10:38 UTC (rev 1667) @@ -28,7 +28,6 @@ import pcgen.core.Constants; import pcgen.core.PlayerCharacter; import pcgen.io.ExportHandler; -import pcgen.io.FileAccess; import pcgen.io.exporttoken.Token; import java.util.ArrayList; @@ -65,8 +64,7 @@ public String getToken(String tokenSource, PlayerCharacter pc, ExportHandler eh) { String beforeValue = ""; - String afterValue = getAfterValue(eh); - boolean addAfterOnLast = true; + String afterValue = ""; if (tokenSource.length()<=3 || tokenSource.charAt(3)==',') { @@ -74,44 +72,17 @@ { afterValue = tokenSource.substring(4); } - addAfterOnLast=false; } else { String[] tokens = tokenSource.split("\\."); - if(tokens.length>1) - { - beforeValue=tokens[1]; - } - if(tokens.length>2) - { - afterValue=tokens[2]; - } + if(tokens.length>1) beforeValue=tokens[1]; + if(tokens.length>2) afterValue=tokens[2]; } - StringBuffer sb = new StringBuffer(); - List<String> bioList = getBioToken(pc); - for (int i = 0; i < bioList.size(); ++i) - { - sb.append(beforeValue); - sb.append(FileAccess.filterString(bioList.get(i))); - if (addAfterOnLast || i+1<bioList.size()) - { - sb.append(afterValue); - } - } - - return sb.toString(); + return beforeValue + pc.getBio().replaceAll("\n", afterValue + "\n" + beforeValue) + afterValue; } - /** - * Returns false - * @return false - */ - public boolean isEncoded() { - return false; - } - /** * Convert the characters bio token to a list of strings, each * string being a line. Modified: Trunk/pcgen/code/src/test/plugin/exporttokens/BioTokenTest.java =================================================================== --- Trunk/pcgen/code/src/test/plugin/exporttokens/BioTokenTest.java 2006-11-17 02:56:58 UTC (rev 1666) +++ Trunk/pcgen/code/src/test/plugin/exporttokens/BioTokenTest.java 2006-11-18 08:10:38 UTC (rev 1667) @@ -69,54 +69,39 @@ } /** - * Class under test for String getToken(String, PlayerCharacter) + * Test the bio export * @throws Exception */ - public void testGetTokenStringPlayerCharacter() throws Exception + public void testBioExport() throws Exception { - assertEquals("Default Bio", - "Test bio entry<br/>2nd line<br/>Third line<br/>last one", new BioToken() - .getToken("BIO", getCharacter(), null)); + FileAccess.setCurrentOutputFilter("xml"); + PlayerCharacter character = getCharacter(); + assertEquals("Default Bio" + , "<para>Test bio entry</para><para>2nd line</para><para>Third line</para><para>last one</para>" + , evaluateToken("BIO", character)); - assertEquals("Old Style Bio", - "Test bio entry|2nd line|Third line|last one", new BioToken() - .getToken("BIO,|", getCharacter(), null)); + assertEquals("New Style Bio start and end" + , "<para>[b]Test bio entry[/b]</para><para>[b]2nd line[/b]</para><para>[b]Third line[/b]</para><para>[b]last one[/b]</para>" + , evaluateToken("BIO.[b].[/b]", character)); - assertEquals("Old Style Bio with comma", - "Test bio entry,2nd line,Third line,last one", new BioToken() - .getToken("BIO,,", getCharacter(), null)); + assertEquals("New Style Bio start only" + , "<para>**Test bio entry</para><para>**2nd line</para><para>**Third line</para><para>**last one</para>" + , evaluateToken("BIO.**", character)); - assertEquals( - "New Style Bio start and end", - "<b>Test bio entry</b>| <b>2nd line</b>| <b>Third line</b>| <b>last one</b>| ", - new BioToken().getToken("BIO.<b>.</b>| ", getCharacter(), null)); + assertEquals("New Style Bio start only" + , "<para>Test bio entry,</para><para>2nd line,</para><para>Third line,</para><para>last one,</para>" + , evaluateToken("BIO..,", character)); - assertEquals("New Style Bio start only", - "**Test bio entry<br/>**2nd line<br/>**Third line<br/>**last one<br/>", new BioToken() - .getToken("BIO.**", getCharacter(), null)); - - assertEquals("New Style Bio start only", - "Test bio entry,2nd line,Third line,last one,", new BioToken() - .getToken("BIO..,", getCharacter(), null)); - } - - /** - * Test the bio export - * @throws Exception - */ - public void testBioExport() throws Exception - { FileAccess.setCurrentOutputFilter("foo.htm"); - PlayerCharacter character = getCharacter(); character.setBio("Test bio <br/>entry\n2nd line\nThird line\nlast one"); - assertEquals("Bio and exportHandler should be the same", - evaluateToken("BIO.<b>.</b>", character), new BioToken() - .getToken("BIO.<b>.</b>", character, null)); + String expected = "<p>[b]Test bio <br/>entry[/b]</p>\n<p>[b]2nd line[/b]</p>\n<p>[b]Third line[/b]</p>\n<p>[b]last one[/b]</p>"; + String actual = evaluateToken("BIO.[b].[/b]", character); + assertEquals(expected, actual); - assertEquals("New Style Bio start only", - "Test bio <br/>entry,2nd line,Third line,last one,", new BioToken() - .getToken("BIO..,", getCharacter(), null)); + actual = evaluateToken("BIO..,", character); + expected = "<p>Test bio <br/>entry,</p>\n<p>2nd line,</p>\n<p>Third line,</p>\n<p>last one,</p>"; + assertEquals("New Style Bio start only", expected, actual); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |