From: <th...@us...> - 2007-09-29 19:35:24
|
Revision: 4183 http://pcgen.svn.sourceforge.net/pcgen/?rev=4183&view=rev Author: thpr Date: 2007-09-29 11:38:20 -0700 (Sat, 29 Sep 2007) Log Message: ----------- Bring CDOM up to 4173 Modified Paths: -------------- branches/cdom/code/pluginbuild.xml branches/cdom/code/src/itest/plugin/lsttokens/loader/SaLstLoaderTest.java branches/cdom/code/src/test/pcgen/core/DescriptionTest.java branches/cdom/code/src/test/pcgen/core/PObjectTest.java branches/cdom/code/src/test/pcgen/core/levelability/LevelAbilityAbilityTest.java branches/cdom/code/src/test/pcgen/core/prereq/PreAbilityTest.java branches/cdom/code/src/test/pcgen/core/prereq/PreWeaponProfTest.java branches/cdom/code/src/test/pcgen/persistence/lst/BioSetLoaderTest.java branches/cdom/code/src/test/pcgen/persistence/lst/prereq/PreAbilityParserTest.java branches/cdom/code/src/test/plugin/exporttokens/AttackTokenTest.java branches/cdom/code/src/utest/plugin/lsttokens/TokenGlobalTestSuite.java branches/cdom/code/src/utest/plugin/lsttokens/template/HDTokenTest.java branches/cdom/code/src/utest/plugin/lsttokens/template/LevelTokenTest.java branches/cdom/code/src/utest/plugin/lsttokens/template/RepeatLevelTokenTest.java branches/cdom/code/testsuite/csheets/BarJack.xml branches/cdom/code/testsuite/csheets/BrdJoe.xml branches/cdom/code/testsuite/csheets/CleElf.xml branches/cdom/code/testsuite/csheets/CloudGiantHalfDragon.xml branches/cdom/code/testsuite/csheets/Quasvin.xml branches/cdom/code/testsuite/csheets/SWizSam.xml branches/cdom/code/testsuite/csheets/WizShar.xml Added Paths: ----------- branches/cdom/code/src/utest/plugin/lsttokens/SabLstTest.java Removed Paths: ------------- branches/cdom/code/src/utest/plugin/lsttokens/SaLstTest.java Modified: branches/cdom/code/pluginbuild.xml =================================================================== --- branches/cdom/code/pluginbuild.xml 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/pluginbuild.xml 2007-09-29 18:38:20 UTC (rev 4183) @@ -2737,13 +2737,6 @@ </patternset> </fileset> </jar> - <jar jarfile="${lstplugins.dir}/ChooseToken-EQBUILDER.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf"> - <fileset dir="${build.classes.dir}"> - <patternset> - <include name="plugin/lsttokens/choose/EqBuilderToken.class" /> - </patternset> - </fileset> - </jar> <jar jarfile="${lstplugins.dir}/ChooseToken-EQBUILDER.SPELL.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf"> <fileset dir="${build.classes.dir}"> <patternset> @@ -2912,14 +2905,13 @@ </patternset> </fileset> </jar> - <!-- <jar jarfile="${lstplugins.dir}/ChooseToken-STRING.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf"> + <jar jarfile="${lstplugins.dir}/ChooseToken-STRING.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf"> <fileset dir="${build.classes.dir}"> <patternset> <include name="plugin/lsttokens/choose/StringToken.class" /> </patternset> </fileset> </jar> ---> <jar jarfile="${lstplugins.dir}/ChooseToken-USERINPUT.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf"> <fileset dir="${build.classes.dir}"> <patternset> @@ -5653,6 +5645,20 @@ </patternset> </fileset> </jar> + <jar jarfile="${systemlstplugins.dir}/GameModeLstToken-PREVIEWDIR.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf"> + <fileset dir="${build.classes.dir}"> + <patternset> + <include name="plugin/lsttokens/gamemode/PreviewDirToken.class" /> + </patternset> + </fileset> + </jar> + <jar jarfile="${systemlstplugins.dir}/GameModeLstToken-PREVIEWSHEET.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf"> + <fileset dir="${build.classes.dir}"> + <patternset> + <include name="plugin/lsttokens/gamemode/PreviewSheetToken.class" /> + </patternset> + </fileset> + </jar> <jar jarfile="${systemlstplugins.dir}/GameModeLstToken-RANGEPENALTY.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf"> <fileset dir="${build.classes.dir}"> <patternset> @@ -6024,6 +6030,13 @@ </patternset> </fileset> </jar> + <jar jarfile="${systemlstplugins.dir}/GameMode-AbilityCategory-DISPLAYLOCATION.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf"> + <fileset dir="${build.classes.dir}"> + <patternset> + <include name="plugin/lsttokens/gamemode/abilitycategory/DisplayLocationToken.class" /> + </patternset> + </fileset> + </jar> <jar jarfile="${systemlstplugins.dir}/GameMode-AbilityCategory-DISPLAYNAME.jar" manifest="${src.java.dir}/plugin/lsttokens/manifest.mf"> <fileset dir="${build.classes.dir}"> <patternset> Modified: branches/cdom/code/src/itest/plugin/lsttokens/loader/SaLstLoaderTest.java =================================================================== --- branches/cdom/code/src/itest/plugin/lsttokens/loader/SaLstLoaderTest.java 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/src/itest/plugin/lsttokens/loader/SaLstLoaderTest.java 2007-09-29 18:38:20 UTC (rev 4183) @@ -26,7 +26,7 @@ import pcgen.persistence.lst.GlobalLstToken; import pcgen.persistence.lst.LstObjectFileLoader; import pcgen.persistence.lst.PCTemplateLoader; -import plugin.lsttokens.SaLst; +import plugin.lsttokens.SabLst; import plugin.lsttokens.loader.testsupport.AbstractTokenLoaderTestCase; /** @@ -36,7 +36,7 @@ * @version $Revision$ */ public class SaLstLoaderTest extends AbstractTokenLoaderTestCase{ - static GlobalLstToken token = new SaLst(); + static GlobalLstToken token = new SabLst(); static PCTemplateLoader loader = new PCTemplateLoader(); @Override Modified: branches/cdom/code/src/test/pcgen/core/DescriptionTest.java =================================================================== --- branches/cdom/code/src/test/pcgen/core/DescriptionTest.java 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/src/test/pcgen/core/DescriptionTest.java 2007-09-29 18:38:20 UTC (rev 4183) @@ -202,17 +202,18 @@ final Description desc = new Description("%1 test %3 %2"); desc.addVariable("TestVar"); desc.setOwner(dummy); - assertTrue(desc.getDescription(getCharacter()).equals("0 test ")); + assertEquals("0 test ", desc.getDescription(getCharacter())); getCharacter().setRace(dummy); - assertTrue(desc.getDescription(getCharacter()).equals("2 test ")); + assertEquals("2 test ", desc.getDescription(getCharacter())); desc.addVariable("%CHOICE"); - assertTrue(desc.getDescription(getCharacter()).equals( - "2 test Associated 1")); + assertEquals("2 test Associated 1", desc + .getDescription(getCharacter())); desc.addVariable("%LIST"); - assertTrue(desc.getDescription(getCharacter()).equals( - "2 test Associated 1,Associated 2 Associated 1")); + assertEquals("Replacement of %LIST failed", + "2 test Associated 1 and Associated 2 Associated 1", desc + .getDescription(getCharacter())); } } Modified: branches/cdom/code/src/test/pcgen/core/PObjectTest.java =================================================================== --- branches/cdom/code/src/test/pcgen/core/PObjectTest.java 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/src/test/pcgen/core/PObjectTest.java 2007-09-29 18:38:20 UTC (rev 4183) @@ -305,7 +305,7 @@ final Description desc2 = new Description("Description 2"); pobj.addDescription(desc2); - assertEquals("Description should match", "Description 1,Description 2", + assertEquals("Description should match", "Description 1, Description 2", pobj.getDescription(getCharacter())); final Description desc3 = new Description("Description %1"); @@ -313,11 +313,11 @@ pobj.addDescription(desc3); assertEquals("Description should match", - "Description 1,Description 2,Description 3", pobj + "Description 1, Description 2, Description 3", pobj .getDescription(getCharacter())); pobj.removeDescription("Description 2"); - assertEquals("Description should match", "Description 1,Description 3", + assertEquals("Description should match", "Description 1, Description 3", pobj.getDescription(getCharacter())); pobj.removeDescription("Description %"); Modified: branches/cdom/code/src/test/pcgen/core/levelability/LevelAbilityAbilityTest.java =================================================================== --- branches/cdom/code/src/test/pcgen/core/levelability/LevelAbilityAbilityTest.java 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/src/test/pcgen/core/levelability/LevelAbilityAbilityTest.java 2007-09-29 18:38:20 UTC (rev 4183) @@ -30,16 +30,13 @@ import pcgen.AbstractCharacterTestCase; import pcgen.core.Ability; import pcgen.core.AbilityCategory; -import pcgen.core.Globals; import pcgen.core.PCClass; import pcgen.core.PlayerCharacter; import pcgen.core.Race; -import pcgen.core.Skill; import pcgen.gui.utils.SwingChooser; import pcgen.util.Logging; import pcgen.util.TestHelper; import pcgen.util.chooser.ChooserFactory; -import pcgen.util.chooser.ChooserInterface; import plugin.lsttokens.AddLst; /** Modified: branches/cdom/code/src/test/pcgen/core/prereq/PreAbilityTest.java =================================================================== --- branches/cdom/code/src/test/pcgen/core/prereq/PreAbilityTest.java 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/src/test/pcgen/core/prereq/PreAbilityTest.java 2007-09-29 18:38:20 UTC (rev 4183) @@ -27,7 +27,6 @@ import junit.framework.TestSuite; import pcgen.AbstractCharacterTestCase; import pcgen.core.Ability; -import pcgen.core.AbilityCategory; import pcgen.core.PlayerCharacter; import pcgen.core.prereq.Prerequisite; import pcgen.persistence.PersistenceLayerException; Modified: branches/cdom/code/src/test/pcgen/core/prereq/PreWeaponProfTest.java =================================================================== --- branches/cdom/code/src/test/pcgen/core/prereq/PreWeaponProfTest.java 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/src/test/pcgen/core/prereq/PreWeaponProfTest.java 2007-09-29 18:38:20 UTC (rev 4183) @@ -32,7 +32,6 @@ import pcgen.core.Ability; import pcgen.core.AbilityUtilities; import pcgen.core.Campaign; -import pcgen.core.Equipment; import pcgen.core.Globals; import pcgen.core.PlayerCharacter; import pcgen.core.WeaponProf; Modified: branches/cdom/code/src/test/pcgen/persistence/lst/BioSetLoaderTest.java =================================================================== --- branches/cdom/code/src/test/pcgen/persistence/lst/BioSetLoaderTest.java 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/src/test/pcgen/persistence/lst/BioSetLoaderTest.java 2007-09-29 18:38:20 UTC (rev 4183) @@ -28,7 +28,6 @@ */ package pcgen.persistence.lst; -import java.io.File; import java.net.URI; import java.util.List; import junit.framework.Test; Modified: branches/cdom/code/src/test/pcgen/persistence/lst/prereq/PreAbilityParserTest.java =================================================================== --- branches/cdom/code/src/test/pcgen/persistence/lst/prereq/PreAbilityParserTest.java 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/src/test/pcgen/persistence/lst/prereq/PreAbilityParserTest.java 2007-09-29 18:38:20 UTC (rev 4183) @@ -33,7 +33,6 @@ import pcgen.core.SettingsHandler; import pcgen.core.prereq.Prerequisite; import pcgen.persistence.PersistenceLayerException; -import pcgen.util.Logging; import plugin.pretokens.parser.PreAbilityParser; /** Modified: branches/cdom/code/src/test/plugin/exporttokens/AttackTokenTest.java =================================================================== --- branches/cdom/code/src/test/plugin/exporttokens/AttackTokenTest.java 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/src/test/plugin/exporttokens/AttackTokenTest.java 2007-09-29 18:38:20 UTC (rev 4183) @@ -26,10 +26,6 @@ import junit.framework.Test; import junit.framework.TestSuite; import pcgen.AbstractCharacterTestCase; -import pcgen.core.Equipment; -import pcgen.core.EquipmentList; -import pcgen.core.EquipmentModifier; -import pcgen.core.GameMode; import pcgen.core.Globals; import pcgen.core.PCClass; import pcgen.core.PCStat; Deleted: branches/cdom/code/src/utest/plugin/lsttokens/SaLstTest.java =================================================================== --- branches/cdom/code/src/utest/plugin/lsttokens/SaLstTest.java 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/src/utest/plugin/lsttokens/SaLstTest.java 2007-09-29 18:38:20 UTC (rev 4183) @@ -1,149 +0,0 @@ -/* - * Copyright (c) 2007 Tom Parker <th...@us...> - * - * This program 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 program 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 library; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ -package plugin.lsttokens; - -import java.net.URISyntaxException; - -import org.junit.Before; -import org.junit.Test; - -import pcgen.core.PCTemplate; -import pcgen.persistence.PersistenceLayerException; -import pcgen.persistence.lst.GlobalLstToken; -import pcgen.persistence.lst.LstObjectFileLoader; -import pcgen.persistence.lst.PCTemplateLoader; -import plugin.lsttokens.testsupport.AbstractGlobalTokenTestCase; -import plugin.lsttokens.testsupport.TokenRegistration; -import plugin.pretokens.parser.PreClassParser; -import plugin.pretokens.parser.PreRaceParser; -import plugin.pretokens.writer.PreClassWriter; -import plugin.pretokens.writer.PreRaceWriter; - -public class SaLstTest extends AbstractGlobalTokenTestCase -{ - static GlobalLstToken token = new SaLst(); - static PCTemplateLoader loader = new PCTemplateLoader(); - - @Override - public LstObjectFileLoader<PCTemplate> getLoader() - { - return loader; - } - - @Override - public Class<PCTemplate> getCDOMClass() - { - return PCTemplate.class; - } - - @Override - public GlobalLstToken getToken() - { - return token; - } - - PreClassParser preclass = new PreClassParser(); - PreClassWriter preclasswriter = new PreClassWriter(); - PreRaceParser prerace = new PreRaceParser(); - PreRaceWriter preracewriter = new PreRaceWriter(); - - @Override - @Before - public void setUp() throws PersistenceLayerException, URISyntaxException - { - super.setUp(); - TokenRegistration.register(preclass); - TokenRegistration.register(prerace); - TokenRegistration.register(preclasswriter); - TokenRegistration.register(preracewriter); - } - - @Test - public void testInvalidDoublePipe() throws PersistenceLayerException - { - assertFalse(parse("SA Number %||VarF")); - assertNoSideEffects(); - } - - @Test - public void testInvalidEndingPipe() throws PersistenceLayerException - { - assertFalse(parse("SA Number|")); - assertNoSideEffects(); - } - - @Test - public void testInvalidStartingPipe() throws PersistenceLayerException - { - assertFalse(parse("|Var")); - assertNoSideEffects(); - } - - @Test - public void testInvalidVarAfterPre() throws PersistenceLayerException - { - assertFalse(parse("SA % plus %|Var|PRECLASS:1,Fighter|Var2")); - assertNoSideEffects(); - } - - @Test - public void testInvalidOnlyPre() throws PersistenceLayerException - { - assertFalse(parse("PRECLASS:1,Fighter")); - assertNoSideEffects(); - } - - @Test - public void testRoundRobinBase() throws PersistenceLayerException - { - runRoundRobin("SA Number One"); - } - - @Test - public void testRoundRobinVariable() throws PersistenceLayerException - { - runRoundRobin("SA Number %|Variab"); - } - - @Test - public void testRoundRobinPre() throws PersistenceLayerException - { - runRoundRobin("SA Number One|PRECLASS:1,Fighter=1"); - } - - @Test - public void testRoundRobinDoublePre() throws PersistenceLayerException - { - runRoundRobin("SA Number One|PRECLASS:1,Fighter=1|PRERACE:1,Human"); - } - - @Test - public void testRoundRobinVarDoublePre() throws PersistenceLayerException - { - runRoundRobin("SA Number % before %|Var|TwoVar|PRECLASS:1,Fighter=1|PRERACE:1,Human"); - } - - @Test - public void testRoundRobinCompound() throws PersistenceLayerException - { - runRoundRobin( - "SA Number % before %|Var|TwoVar|PRECLASS:1,Fighter=1|PRERACE:1,Human", - "SA Number One|PRECLASS:1,Fighter=1"); - } - -} Copied: branches/cdom/code/src/utest/plugin/lsttokens/SabLstTest.java (from rev 4173, branches/cdom/code/src/utest/plugin/lsttokens/SaLstTest.java) =================================================================== --- branches/cdom/code/src/utest/plugin/lsttokens/SabLstTest.java (rev 0) +++ branches/cdom/code/src/utest/plugin/lsttokens/SabLstTest.java 2007-09-29 18:38:20 UTC (rev 4183) @@ -0,0 +1,149 @@ +/* + * Copyright (c) 2007 Tom Parker <th...@us...> + * + * This program 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 program 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 library; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ +package plugin.lsttokens; + +import java.net.URISyntaxException; + +import org.junit.Before; +import org.junit.Test; + +import pcgen.core.PCTemplate; +import pcgen.persistence.PersistenceLayerException; +import pcgen.persistence.lst.GlobalLstToken; +import pcgen.persistence.lst.LstObjectFileLoader; +import pcgen.persistence.lst.PCTemplateLoader; +import plugin.lsttokens.testsupport.AbstractGlobalTokenTestCase; +import plugin.lsttokens.testsupport.TokenRegistration; +import plugin.pretokens.parser.PreClassParser; +import plugin.pretokens.parser.PreRaceParser; +import plugin.pretokens.writer.PreClassWriter; +import plugin.pretokens.writer.PreRaceWriter; + +public class SabLstTest extends AbstractGlobalTokenTestCase +{ + static GlobalLstToken token = new SabLst(); + static PCTemplateLoader loader = new PCTemplateLoader(); + + @Override + public LstObjectFileLoader<PCTemplate> getLoader() + { + return loader; + } + + @Override + public Class<PCTemplate> getCDOMClass() + { + return PCTemplate.class; + } + + @Override + public GlobalLstToken getToken() + { + return token; + } + + PreClassParser preclass = new PreClassParser(); + PreClassWriter preclasswriter = new PreClassWriter(); + PreRaceParser prerace = new PreRaceParser(); + PreRaceWriter preracewriter = new PreRaceWriter(); + + @Override + @Before + public void setUp() throws PersistenceLayerException, URISyntaxException + { + super.setUp(); + TokenRegistration.register(preclass); + TokenRegistration.register(prerace); + TokenRegistration.register(preclasswriter); + TokenRegistration.register(preracewriter); + } + + @Test + public void testInvalidDoublePipe() throws PersistenceLayerException + { + assertFalse(parse("SA Number %||VarF")); + assertNoSideEffects(); + } + + @Test + public void testInvalidEndingPipe() throws PersistenceLayerException + { + assertFalse(parse("SA Number|")); + assertNoSideEffects(); + } + + @Test + public void testInvalidStartingPipe() throws PersistenceLayerException + { + assertFalse(parse("|Var")); + assertNoSideEffects(); + } + + @Test + public void testInvalidVarAfterPre() throws PersistenceLayerException + { + assertFalse(parse("SA % plus %|Var|PRECLASS:1,Fighter|Var2")); + assertNoSideEffects(); + } + + @Test + public void testInvalidOnlyPre() throws PersistenceLayerException + { + assertFalse(parse("PRECLASS:1,Fighter")); + assertNoSideEffects(); + } + + @Test + public void testRoundRobinBase() throws PersistenceLayerException + { + runRoundRobin("SA Number One"); + } + + @Test + public void testRoundRobinVariable() throws PersistenceLayerException + { + runRoundRobin("SA Number %|Variab"); + } + + @Test + public void testRoundRobinPre() throws PersistenceLayerException + { + runRoundRobin("SA Number One|PRECLASS:1,Fighter=1"); + } + + @Test + public void testRoundRobinDoublePre() throws PersistenceLayerException + { + runRoundRobin("SA Number One|PRECLASS:1,Fighter=1|PRERACE:1,Human"); + } + + @Test + public void testRoundRobinVarDoublePre() throws PersistenceLayerException + { + runRoundRobin("SA Number % before %|Var|TwoVar|PRECLASS:1,Fighter=1|PRERACE:1,Human"); + } + + @Test + public void testRoundRobinCompound() throws PersistenceLayerException + { + runRoundRobin( + "SA Number % before %|Var|TwoVar|PRECLASS:1,Fighter=1|PRERACE:1,Human", + "SA Number One|PRECLASS:1,Fighter=1"); + } + +} Modified: branches/cdom/code/src/utest/plugin/lsttokens/TokenGlobalTestSuite.java =================================================================== --- branches/cdom/code/src/utest/plugin/lsttokens/TokenGlobalTestSuite.java 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/src/utest/plugin/lsttokens/TokenGlobalTestSuite.java 2007-09-29 18:38:20 UTC (rev 4183) @@ -30,7 +30,7 @@ KitLstTest.class, LangAutoLstTest.class, MoveLstTest.class, MoveCloneLstTest.class, NameispiLstTest.class, NaturalAttacksLstTest.class, OutputNameLstTest.class, QualifyTokenTest.class, RegionLstTest.class, - SaLstTest.class, SourceDateLstTest.class, SourceLongLstTest.class, + SabLstTest.class, SourceDateLstTest.class, SourceLongLstTest.class, SourcePageLstTest.class, SourceShortLstTest.class, SourceWebLstTest.class, SpellLevelLstTest.class, SpellsLstTest.class, SrLstTest.class, TempdescLstTest.class, TemplateLstTest.class, TypeLstTest.class, Modified: branches/cdom/code/src/utest/plugin/lsttokens/template/HDTokenTest.java =================================================================== --- branches/cdom/code/src/utest/plugin/lsttokens/template/HDTokenTest.java 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/src/utest/plugin/lsttokens/template/HDTokenTest.java 2007-09-29 18:38:20 UTC (rev 4183) @@ -29,7 +29,7 @@ import pcgen.persistence.lst.LstObjectFileLoader; import pcgen.persistence.lst.PCTemplateLoader; import plugin.lsttokens.DrLst; -import plugin.lsttokens.SaLst; +import plugin.lsttokens.SabLst; import plugin.lsttokens.SrLst; import plugin.lsttokens.testsupport.AbstractTokenTestCase; import plugin.lsttokens.testsupport.TokenRegistration; @@ -52,7 +52,7 @@ TokenRegistration.register(new CrToken()); TokenRegistration.register(new DrLst()); TokenRegistration.register(new SrLst()); - TokenRegistration.register(new SaLst()); + TokenRegistration.register(new SabLst()); TokenRegistration.register(new LegsToken()); classSetUpFired = true; } @@ -168,7 +168,7 @@ @Test public void testInvalidInputEmptySA() throws PersistenceLayerException { - assertFalse(parse("3+:SA:")); + assertFalse(parse("3+:SAB:")); assertNoSideEffects(); } @@ -191,7 +191,7 @@ public void testInvalidInputEmptySANoColon() throws PersistenceLayerException { - assertFalse(parse("3+:SA")); + assertFalse(parse("3+:SAB")); assertNoSideEffects(); } @@ -210,7 +210,7 @@ assertFalse(parse("3+:D:1/+2")); assertFalse(parse("3+:CRA:3")); assertFalse(parse("3+:DRA:1/+2")); - assertFalse(parse("3+:SAA:Special")); + assertFalse(parse("3+:SABA:Special")); assertFalse(parse("3+:SRA:1")); assertNoSideEffects(); } @@ -234,7 +234,7 @@ public void testInvalidInputBadHDRangePlus() throws PersistenceLayerException { - assertFalse(parse("+3:SA:Special Abil")); + assertFalse(parse("+3:SAB:Special Abil")); assertNoSideEffects(); } @@ -242,7 +242,7 @@ public void testInvalidInputBadHDRangeMult() throws PersistenceLayerException { - assertFalse(parse("*3:SA:Special Abil")); + assertFalse(parse("*3:SAB:Special Abil")); assertNoSideEffects(); } @@ -250,7 +250,7 @@ public void testInvalidInputBadHDRangeTwoDash() throws PersistenceLayerException { - assertFalse(parse("1--3:SA:Special Abil")); + assertFalse(parse("1--3:SAB:Special Abil")); assertNoSideEffects(); } @@ -258,7 +258,7 @@ public void testInvalidInputBadHDRangeEndDash() throws PersistenceLayerException { - assertFalse(parse("4-:SA:Special Abil")); + assertFalse(parse("4-:SAB:Special Abil")); assertNoSideEffects(); } @@ -266,7 +266,7 @@ public void testInvalidInputBadHDRangeUpTo() throws PersistenceLayerException { - assertFalse(parse("-4:SA:Special Abil")); + assertFalse(parse("-4:SAB:Special Abil")); assertNoSideEffects(); } @@ -298,7 +298,7 @@ @Test public void testRoundRobinRangeSA() throws PersistenceLayerException { - runRoundRobin("5-7:SA:Special Ability, Man!"); + runRoundRobin("5-7:SAB:Special Ability, Man!"); } @Test @@ -336,7 +336,7 @@ @Test public void testRoundRobinMinimumSA() throws PersistenceLayerException { - runRoundRobin("5+:SA:Special Ability, Man!"); + runRoundRobin("5+:SAB:Special Ability, Man!"); } @Test @@ -356,13 +356,13 @@ @Test public void testRoundRobinMultiple() throws PersistenceLayerException { - runRoundRobin("4+:CR:MultFormula", "5+:SA:Special Ability, Man!"); + runRoundRobin("4+:CR:MultFormula", "5+:SAB:Special Ability, Man!"); } @Test public void testRoundRobinMultipleSame() throws PersistenceLayerException { - runRoundRobin("4+:CR:Formula", "4+:SA:Special Ability, Man!"); + runRoundRobin("4+:CR:Formula", "4+:SAB:Special Ability, Man!"); } } Modified: branches/cdom/code/src/utest/plugin/lsttokens/template/LevelTokenTest.java =================================================================== --- branches/cdom/code/src/utest/plugin/lsttokens/template/LevelTokenTest.java 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/src/utest/plugin/lsttokens/template/LevelTokenTest.java 2007-09-29 18:38:20 UTC (rev 4183) @@ -29,7 +29,7 @@ import pcgen.persistence.lst.LstObjectFileLoader; import pcgen.persistence.lst.PCTemplateLoader; import plugin.lsttokens.DrLst; -import plugin.lsttokens.SaLst; +import plugin.lsttokens.SabLst; import plugin.lsttokens.SrLst; import plugin.lsttokens.testsupport.AbstractTokenTestCase; import plugin.lsttokens.testsupport.TokenRegistration; @@ -52,7 +52,7 @@ TokenRegistration.register(new CrToken()); TokenRegistration.register(new DrLst()); TokenRegistration.register(new SrLst()); - TokenRegistration.register(new SaLst()); + TokenRegistration.register(new SabLst()); classSetUpFired = true; } @@ -160,7 +160,7 @@ @Test public void testInvalidInputEmptySA() throws PersistenceLayerException { - assertFalse(parse("3:SA:")); + assertFalse(parse("3:SAB:")); assertNoSideEffects(); } @@ -183,7 +183,7 @@ public void testInvalidInputEmptySANoColon() throws PersistenceLayerException { - assertFalse(parse("3:SA")); + assertFalse(parse("3:SAB")); assertNoSideEffects(); } @@ -202,7 +202,7 @@ assertFalse(parse("3:D:1/+2")); assertFalse(parse("3:CRA:3")); assertFalse(parse("3:DRA:1/+2")); - assertFalse(parse("3:SAA:Special")); + assertFalse(parse("3:SABA:Special")); assertFalse(parse("3:SRA:1")); assertNoSideEffects(); } @@ -226,7 +226,7 @@ public void testInvalidInputBadHDRangePlus() throws PersistenceLayerException { - assertFalse(parse("+3:SA:Special Abil")); + assertFalse(parse("+3:SAB:Special Abil")); assertNoSideEffects(); } @@ -234,7 +234,7 @@ public void testInvalidInputBadHDRangeMult() throws PersistenceLayerException { - assertFalse(parse("*3:SA:Special Abil")); + assertFalse(parse("*3:SAB:Special Abil")); assertNoSideEffects(); } @@ -242,7 +242,7 @@ public void testInvalidInputBadHDRangeTwoDash() throws PersistenceLayerException { - assertFalse(parse("1-3:SA:Special Abil")); + assertFalse(parse("1-3:SAB:Special Abil")); assertNoSideEffects(); } @@ -250,7 +250,7 @@ public void testInvalidInputBadHDRangeEndDash() throws PersistenceLayerException { - assertFalse(parse("4-:SA:Special Abil")); + assertFalse(parse("4-:SAB:Special Abil")); assertNoSideEffects(); } @@ -258,7 +258,7 @@ public void testInvalidInputBadHDRangeEndPlus() throws PersistenceLayerException { - assertFalse(parse("4+:SA:Special Abil")); + assertFalse(parse("4+:SAB:Special Abil")); assertNoSideEffects(); } @@ -266,7 +266,7 @@ public void testInvalidInputBadHDRangeUpTo() throws PersistenceLayerException { - assertFalse(parse("-4:SA:Special Abil")); + assertFalse(parse("-4:SAB:Special Abil")); assertNoSideEffects(); } @@ -298,7 +298,7 @@ @Test public void testRoundRobinSA() throws PersistenceLayerException { - runRoundRobin("5:SA:Special Ability, Man!"); + runRoundRobin("5:SAB:Special Ability, Man!"); } @Test @@ -322,7 +322,7 @@ @Test public void testRoundRobinMultipleSame() throws PersistenceLayerException { - runRoundRobin("4:CR:Formula", "4:SA:Special Ability, Man!"); + runRoundRobin("4:CR:Formula", "4:SAB:Special Ability, Man!"); } } Modified: branches/cdom/code/src/utest/plugin/lsttokens/template/RepeatLevelTokenTest.java =================================================================== --- branches/cdom/code/src/utest/plugin/lsttokens/template/RepeatLevelTokenTest.java 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/src/utest/plugin/lsttokens/template/RepeatLevelTokenTest.java 2007-09-29 18:38:20 UTC (rev 4183) @@ -29,7 +29,7 @@ import pcgen.persistence.lst.LstObjectFileLoader; import pcgen.persistence.lst.PCTemplateLoader; import plugin.lsttokens.DrLst; -import plugin.lsttokens.SaLst; +import plugin.lsttokens.SabLst; import plugin.lsttokens.SrLst; import plugin.lsttokens.testsupport.AbstractTokenTestCase; import plugin.lsttokens.testsupport.TokenRegistration; @@ -51,7 +51,7 @@ TokenRegistration.register(new CrToken()); TokenRegistration.register(new DrLst()); TokenRegistration.register(new SrLst()); - TokenRegistration.register(new SaLst()); + TokenRegistration.register(new SabLst()); classSetUpFired = true; } @@ -109,35 +109,35 @@ @Test public void testInvalidEmptyStartLevel() throws PersistenceLayerException { - assertFalse(parse("1|2|20::SA:Stuff")); + assertFalse(parse("1|2|20::SAB:Stuff")); assertNoSideEffects(); } @Test public void testInvalidBadStartLevel() throws PersistenceLayerException { - assertFalse(parse("1|2|20:StartLevel:SA:Stuff")); + assertFalse(parse("1|2|20:StartLevel:SAB:Stuff")); assertNoSideEffects(); } @Test public void testInvalidBadIncrementLevel() throws PersistenceLayerException { - assertFalse(parse("IncrLevel|2|20:5:SA:Stuff")); + assertFalse(parse("IncrLevel|2|20:5:SAB:Stuff")); assertNoSideEffects(); } @Test public void testInvalidBadSkipLevel() throws PersistenceLayerException { - assertFalse(parse("1|SkipLevel|20:5:SA:Stuff")); + assertFalse(parse("1|SkipLevel|20:5:SAB:Stuff")); assertNoSideEffects(); } @Test public void testInvalidBadMaxLevel() throws PersistenceLayerException { - assertFalse(parse("1|2|MaxLevel:5:SA:Stuff")); + assertFalse(parse("1|2|MaxLevel:5:SAB:Stuff")); assertNoSideEffects(); } @@ -145,7 +145,7 @@ public void testInvalidNegativeStartLevel() throws PersistenceLayerException { - assertFalse(parse("1|2|20:-4:SA:Stuff")); + assertFalse(parse("1|2|20:-4:SAB:Stuff")); assertNoSideEffects(); } @@ -153,21 +153,21 @@ public void testInvalidNegativeIncrementLevel() throws PersistenceLayerException { - assertFalse(parse("-1|2|20:5:SA:Stuff")); + assertFalse(parse("-1|2|20:5:SAB:Stuff")); assertNoSideEffects(); } @Test public void testInvalidNegativeSkipLevel() throws PersistenceLayerException { - assertFalse(parse("1|-2|20:5:SA:Stuff")); + assertFalse(parse("1|-2|20:5:SAB:Stuff")); assertNoSideEffects(); } @Test public void testInvalidEmptyMaxLevel() throws PersistenceLayerException { - assertFalse(parse("1|2|:5:SA:Stuff")); + assertFalse(parse("1|2|:5:SAB:Stuff")); assertNoSideEffects(); } @@ -181,56 +181,56 @@ @Test public void testInvalidNegativeMaxLevel() throws PersistenceLayerException { - assertFalse(parse("1|2|-5:5:SA:Stuff")); + assertFalse(parse("1|2|-5:5:SAB:Stuff")); assertNoSideEffects(); } @Test public void testInvalidTooManyColons() throws PersistenceLayerException { - assertFalse(parse("1|2|20:4:5:SA:Stuff")); + assertFalse(parse("1|2|20:4:5:SAB:Stuff")); assertNoSideEffects(); } @Test public void testInvalidTooManyBars() throws PersistenceLayerException { - assertFalse(parse("1|2|20|40:5:SA:Stuff")); + assertFalse(parse("1|2|20|40:5:SAB:Stuff")); assertNoSideEffects(); } @Test public void testInvalidNoMaxLevel() throws PersistenceLayerException { - assertFalse(parse("1|2:5:SA:Stuff")); + assertFalse(parse("1|2:5:SAB:Stuff")); assertNoSideEffects(); } @Test public void testInvalidNoFirstToken() throws PersistenceLayerException { - assertFalse(parse(":5:SA:Stuff")); + assertFalse(parse(":5:SAB:Stuff")); assertNoSideEffects(); } @Test public void testInvalidNoSkipLevel() throws PersistenceLayerException { - assertFalse(parse("1||20:5:SA:Stuff")); + assertFalse(parse("1||20:5:SAB:Stuff")); assertNoSideEffects(); } @Test public void testInvalidNoIncrementLevel() throws PersistenceLayerException { - assertFalse(parse("|3|20:5:SA:Stuff")); + assertFalse(parse("|3|20:5:SAB:Stuff")); assertNoSideEffects(); } @Test public void testInvalidNoSubcommandArgs() throws PersistenceLayerException { - assertFalse(parse("1|2|20:5:SA:")); + assertFalse(parse("1|2|20:5:SAB:")); assertNoSideEffects(); } @@ -238,21 +238,21 @@ public void testInvalidStartGreaterThanEnd() throws PersistenceLayerException { - assertFalse(parse("1|2|20:50:SA:Stuff")); + assertFalse(parse("1|2|20:50:SAB:Stuff")); assertNoSideEffects(); } @Test public void testInvalidNoIncrement() throws PersistenceLayerException { - assertFalse(parse("10|2|20:15:SA:Stuff")); + assertFalse(parse("10|2|20:15:SAB:Stuff")); assertNoSideEffects(); } @Test public void testInvalidNoSkipUse() throws PersistenceLayerException { - assertFalse(parse("5|4|20:5:SA:Stuff")); + assertFalse(parse("5|4|20:5:SAB:Stuff")); assertNoSideEffects(); } @@ -267,41 +267,41 @@ public void testRoundRobinZeroConsecutive() throws PersistenceLayerException { - runRoundRobin("5|0|10:5:SA:Sample Spec Abil"); + runRoundRobin("5|0|10:5:SAB:Sample Spec Abil"); } @Test public void testRoundRobinNoIncrementBorderCase() throws PersistenceLayerException { - runRoundRobin("5|1|10:5:SA:Sample Spec Abil"); + runRoundRobin("5|1|10:5:SAB:Sample Spec Abil"); } @Test public void testRoundRobinNoSkipBorderCase() throws PersistenceLayerException { - runRoundRobin("5|3|20:5:SA:Sample Spec Abil"); + runRoundRobin("5|3|20:5:SAB:Sample Spec Abil"); } @Test public void testRoundRobinSimple() throws PersistenceLayerException { - runRoundRobin("1|2|20:5:SA:Sample Spec Abil"); + runRoundRobin("1|2|20:5:SAB:Sample Spec Abil"); } @Test public void testRoundRobinComplex() throws PersistenceLayerException { - runRoundRobin("1|2|20:5:SA:Sample Spec Abil", - "2|4|20:5:SA:Sample Spec Abil"); + runRoundRobin("1|2|20:5:SAB:Sample Spec Abil", + "2|4|20:5:SAB:Sample Spec Abil"); } @Test public void testRoundRobinMultipleSame() throws PersistenceLayerException { runRoundRobin("1|2|20:5:CR:Formula", - "1|2|20:5:SA:Special Ability, Man!"); + "1|2|20:5:SAB:Special Ability, Man!"); } } Modified: branches/cdom/code/testsuite/csheets/BarJack.xml =================================================================== --- branches/cdom/code/testsuite/csheets/BarJack.xml 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/testsuite/csheets/BarJack.xml 2007-09-29 18:38:20 UTC (rev 4183) @@ -44,7 +44,7 @@ <followeralignment></followeralignment> <holyitem>None</holyitem> <pantheonlist></pantheonlist> - <source>Wizards of the Coast - System Reference Document, srdbasiccharacterclassesi.rtf</source> + <source>System Reference Document, srdbasiccharacterclassesi.rtf</source> <special_abilities></special_abilities> </deity> <description> @@ -1379,7 +1379,7 @@ </school> <source> <sourcelevel>Clr2, Drd2, Rgr1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellss.rtf</source> + <source>System Reference Document, srdspellss.rtf</source> <sourcepage>srdspellss.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1407,7 +1407,7 @@ </school> <source> <sourcelevel>Brd0, Sor0, Wiz0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsd.rtf</source> + <source>System Reference Document, srdspellsd.rtf</source> <sourcepage>srdspellsd.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1435,7 +1435,7 @@ </school> <source> <sourcelevel>Adp0, Asn1, Brd0, Sor0, Wiz0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsg.rtf</source> + <source>System Reference Document, srdspellsg.rtf</source> <sourcepage>srdspellsg.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1463,7 +1463,7 @@ </school> <source> <sourcelevel>Brd0, Sor0, Wiz0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsp.rtf</source> + <source>System Reference Document, srdspellsp.rtf</source> <sourcepage>srdspellsp.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1510,7 +1510,7 @@ </school> <source> <sourcelevel>Clr2, Drd2, Rgr1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellss.rtf</source> + <source>System Reference Document, srdspellss.rtf</source> <sourcepage>srdspellss.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1538,7 +1538,7 @@ </school> <source> <sourcelevel>Brd0, Sor0, Wiz0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsd.rtf</source> + <source>System Reference Document, srdspellsd.rtf</source> <sourcepage>srdspellsd.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1566,7 +1566,7 @@ </school> <source> <sourcelevel>Adp0, Asn1, Brd0, Sor0, Wiz0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsg.rtf</source> + <source>System Reference Document, srdspellsg.rtf</source> <sourcepage>srdspellsg.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1594,7 +1594,7 @@ </school> <source> <sourcelevel>Brd0, Sor0, Wiz0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsp.rtf</source> + <source>System Reference Document, srdspellsp.rtf</source> <sourcepage>srdspellsp.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> Modified: branches/cdom/code/testsuite/csheets/BrdJoe.xml =================================================================== --- branches/cdom/code/testsuite/csheets/BrdJoe.xml 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/testsuite/csheets/BrdJoe.xml 2007-09-29 18:38:20 UTC (rev 4183) @@ -1207,7 +1207,7 @@ </school> <source> <sourcelevel>Brd0, Drd0, Sor0, Wiz0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsf.rtf</source> + <source>System Reference Document, srdspellsf.rtf</source> <sourcepage>srdspellsf.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1235,7 +1235,7 @@ </school> <source> <sourcelevel>Adp0, Asn1, Brd0, Sor0, Wiz0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsg.rtf</source> + <source>System Reference Document, srdspellsg.rtf</source> <sourcepage>srdspellsg.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1263,7 +1263,7 @@ </school> <source> <sourcelevel>Adp0, Brd0, Clr0, Drd0, Sor0, Wiz0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsjkl.rtf</source> + <source>System Reference Document, srdspellsjkl.rtf</source> <sourcepage>srdspellsjkl.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1291,7 +1291,7 @@ </school> <source> <sourcelevel>Brd0, Sor0, Wiz0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsm.rtf</source> + <source>System Reference Document, srdspellsm.rtf</source> <sourcepage>srdspellsm.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> Modified: branches/cdom/code/testsuite/csheets/CleElf.xml =================================================================== --- branches/cdom/code/testsuite/csheets/CleElf.xml 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/testsuite/csheets/CleElf.xml 2007-09-29 18:38:20 UTC (rev 4183) @@ -44,7 +44,7 @@ <followeralignment></followeralignment> <holyitem>None</holyitem> <pantheonlist></pantheonlist> - <source>Wizards of the Coast - System Reference Document, srdbasiccharacterclassesi.rtf</source> + <source>System Reference Document, srdbasiccharacterclassesi.rtf</source> <special_abilities></special_abilities> </deity> <description> @@ -1568,7 +1568,7 @@ </school> <source> <sourcelevel>Adp0, Clr0, Drd0, Pal1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsc.rtf</source> + <source>System Reference Document, srdspellsc.rtf</source> <sourcepage>srdspellsc.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1596,7 +1596,7 @@ </school> <source> <sourcelevel>Adp0, Clr0, Drd0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsc.rtf</source> + <source>System Reference Document, srdspellsc.rtf</source> <sourcepage>srdspellsc.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1624,7 +1624,7 @@ </school> <source> <sourcelevel>Adp0, Brd0, Clr0, Drd0, Sor0, Wiz0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsd.rtf</source> + <source>System Reference Document, srdspellsd.rtf</source> <sourcepage>srdspellsd.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1652,7 +1652,7 @@ </school> <source> <sourcelevel>Asn1, Clr0, Drd0, Pal1, Sor0, Wiz0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsd.rtf</source> + <source>System Reference Document, srdspellsd.rtf</source> <sourcepage>srdspellsd.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1680,7 +1680,7 @@ </school> <source> <sourcelevel>Adp0, Clr0, Drd0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsg.rtf</source> + <source>System Reference Document, srdspellsg.rtf</source> <sourcepage>srdspellsg.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1708,7 +1708,7 @@ </school> <source> <sourcelevel>Clr0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsi.rtf</source> + <source>System Reference Document, srdspellsi.rtf</source> <sourcepage>srdspellsi.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1736,7 +1736,7 @@ </school> <source> <sourcelevel>Adp0, Brd0, Clr0, Drd0, Sor0, Wiz0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsjkl.rtf</source> + <source>System Reference Document, srdspellsjkl.rtf</source> <sourcepage>srdspellsjkl.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1764,7 +1764,7 @@ </school> <source> <sourcelevel>Adp0, Brd0, Clr0, Drd0, Sor0, Wiz0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsm.rtf</source> + <source>System Reference Document, srdspellsm.rtf</source> <sourcepage>srdspellsm.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1792,7 +1792,7 @@ </school> <source> <sourcelevel>Adp0, Clr0, Drd0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsp.rtf</source> + <source>System Reference Document, srdspellsp.rtf</source> <sourcepage>srdspellsp.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1820,7 +1820,7 @@ </school> <source> <sourcelevel>Adp0, Brd0, Clr0, Drd0, Pal1, Rgr1, Sor0, Wiz0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsqr.rtf</source> + <source>System Reference Document, srdspellsqr.rtf</source> <sourcepage>srdspellsqr.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1848,7 +1848,7 @@ </school> <source> <sourcelevel>Brd0, Clr0, Drd0, Pal1, Sor0, Wiz0</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsqr.rtf</source> + <source>System Reference Document, srdspellsqr.rtf</source> <sourcepage>srdspellsqr.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1876,7 +1876,7 @@ </school> <source> <sourcelevel>Clr0, Drd0, Pal1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsuvwxyz.rtf</source> + <source>System Reference Document, srdspellsuvwxyz.rtf</source> <sourcepage>srdspellsuvwxyz.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1906,7 +1906,7 @@ </school> <source> <sourcelevel>Clr1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsb.rtf</source> + <source>System Reference Document, srdspellsb.rtf</source> <sourcepage>srdspellsb.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1934,7 +1934,7 @@ </school> <source> <sourcelevel>Clr1, Pal1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsb.rtf</source> + <source>System Reference Document, srdspellsb.rtf</source> <sourcepage>srdspellsb.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1962,7 +1962,7 @@ </school> <source> <sourcelevel>Clr1, Pal1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsb.rtf</source> + <source>System Reference Document, srdspellsb.rtf</source> <sourcepage>srdspellsb.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -1990,7 +1990,7 @@ </school> <source> <sourcelevel>Adp1, Bgd1, Brd1, Clr1, Death1, Sor1, Wiz1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsc.rtf</source> + <source>System Reference Document, srdspellsc.rtf</source> <sourcepage>srdspellsc.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2018,7 +2018,7 @@ </school> <source> <sourcelevel>Adp1, Clr1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsc.rtf</source> + <source>System Reference Document, srdspellsc.rtf</source> <sourcepage>srdspellsc.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2046,7 +2046,7 @@ </school> <source> <sourcelevel>Adp1, Clr1, Sor1, Wiz1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsc.rtf</source> + <source>System Reference Document, srdspellsc.rtf</source> <sourcepage>srdspellsc.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2074,7 +2074,7 @@ </school> <source> <sourcelevel>Adp1, Bgd1, Brd1, Clr1, Drd1, Healing1, Pal1, Rgr2</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsc.rtf</source> + <source>System Reference Document, srdspellsc.rtf</source> <sourcepage>srdspellsc.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2102,7 +2102,7 @@ </school> <source> <sourcelevel>Clr1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsd.rtf</source> + <source>System Reference Document, srdspellsd.rtf</source> <sourcepage>srdspellsd.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2130,7 +2130,7 @@ </school> <source> <sourcelevel>Adp1, Clr1, Rgr2</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsd.rtf</source> + <source>System Reference Document, srdspellsd.rtf</source> <sourcepage>srdspellsd.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2158,7 +2158,7 @@ </school> <source> <sourcelevel>Adp1, Clr1, Rgr2</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsd.rtf</source> + <source>System Reference Document, srdspellsd.rtf</source> <sourcepage>srdspellsd.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2186,7 +2186,7 @@ </school> <source> <sourcelevel>Adp1, Clr1, Rgr2</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsd.rtf</source> + <source>System Reference Document, srdspellsd.rtf</source> <sourcepage>srdspellsd.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2214,7 +2214,7 @@ </school> <source> <sourcelevel>Adp1, Clr1, Rgr2</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsd.rtf</source> + <source>System Reference Document, srdspellsd.rtf</source> <sourcepage>srdspellsd.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2242,7 +2242,7 @@ </school> <source> <sourcelevel>Clr1, Pal1, Sor1, Wiz1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsd.rtf</source> + <source>System Reference Document, srdspellsd.rtf</source> <sourcepage>srdspellsd.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2270,7 +2270,7 @@ </school> <source> <sourcelevel>Clr1, Pal1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsd.rtf</source> + <source>System Reference Document, srdspellsd.rtf</source> <sourcepage>srdspellsd.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2298,7 +2298,7 @@ </school> <source> <sourcelevel>Bgd1, Clr1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsd.rtf</source> + <source>System Reference Document, srdspellsd.rtf</source> <sourcepage>srdspellsd.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2326,7 +2326,7 @@ </school> <source> <sourcelevel>Adp1, Clr1, Drd1, Pal1, Sor1, Strength1, Sun1, Wiz1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellse.rtf</source> + <source>System Reference Document, srdspellse.rtf</source> <sourcepage>srdspellse.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2354,7 +2354,7 @@ </school> <source> <sourcelevel>Clr1, Luck1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellse.rtf</source> + <source>System Reference Document, srdspellse.rtf</source> <sourcepage>srdspellse.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2382,7 +2382,7 @@ </school> <source> <sourcelevel>Bgd1, Clr1, Destruction1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsi.rtf</source> + <source>System Reference Document, srdspellsi.rtf</source> <sourcepage>srdspellsi.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2410,7 +2410,7 @@ </school> <source> <sourcelevel>Clr1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsi.rtf</source> + <source>System Reference Document, srdspellsi.rtf</source> <sourcepage>srdspellsi.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2438,7 +2438,7 @@ </school> <source> <sourcelevel>Clr1, Earth1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsm.rtf</source> + <source>System Reference Document, srdspellsm.rtf</source> <sourcepage>srdspellsm.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2466,7 +2466,7 @@ </school> <source> <sourcelevel>Bgd1, Brd1, Clr1, Pal1, Sor1, War1, Wiz1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsm.rtf</source> + <source>System Reference Document, srdspellsm.rtf</source> <sourcepage>srdspellsm.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2494,7 +2494,7 @@ </school> <source> <sourcelevel>Adp1, Air1, Asn1, Clr1, Drd1, Sor1, Water1, Wiz1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsno.rtf</source> + <source>System Reference Document, srdspellsno.rtf</source> <sourcepage>srdspellsno.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2522,7 +2522,7 @@ </school> <source> <sourcelevel>Adp1, Brd1, Clr1, Law1, Sor1, Wiz1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsp.rtf</source> + <source>System Reference Document, srdspellsp.rtf</source> <sourcepage>srdspellsp.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2550,7 +2550,7 @@ </school> <source> <sourcelevel>Adp1, Brd1, Clr1, Law1, Sor1, Wiz1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsp.rtf</source> + <source>System Reference Document, srdspellsp.rtf</source> <sourcepage>srdspellsp.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2578,7 +2578,7 @@ </school> <source> <sourcelevel>Adp1, Brd1, Clr1, Good1, Pal1, Sor1, Wiz1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsp.rtf</source> + <source>System Reference Document, srdspellsp.rtf</source> <sourcepage>srdspellsp.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2606,7 +2606,7 @@ </school> <source> <sourcelevel>Clr1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsqr.rtf</source> + <source>System Reference Document, srdspellsqr.rtf</source> <sourcepage>srdspellsqr.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2634,7 +2634,7 @@ </school> <source> <sourcelevel>Clr1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellsqr.rtf</source> + <source>System Reference Document, srdspellsqr.rtf</source> <sourcepage>srdspellsqr.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2662,7 +2662,7 @@ </school> <source> <sourcelevel>Clr1, Protection1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellss.rtf</source> + <source>System Reference Document, srdspellss.rtf</source> <sourcepage>srdspellss.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2690,7 +2690,7 @@ </school> <source> <sourcelevel>Clr1, Protection1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellss.rtf</source> + <source>System Reference Document, srdspellss.rtf</source> <sourcepage>srdspellss.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2718,7 +2718,7 @@ </school> <source> <sourcelevel>Clr1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellss.rtf</source> + <source>System Reference Document, srdspellss.rtf</source> <sourcepage>srdspellss.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> @@ -2746,7 +2746,7 @@ </school> <source> <sourcelevel>Bgd1, Brd1, Clr1, Sor1, Wiz1</sourcelevel> - <source>Wizards of the Coast - System Reference Document, srdspellss.rtf</source> + <source>System Reference Document, srdspellss.rtf</source> <sourcepage>srdspellss.rtf</sourcepage> <sourceshort>SRD</sourceshort> </source> Modified: branches/cdom/code/testsuite/csheets/CloudGiantHalfDragon.xml =================================================================== --- branches/cdom/code/testsuite/csheets/CloudGiantHalfDragon.xml 2007-09-29 18:37:52 UTC (rev 4182) +++ branches/cdom/code/testsuite/csheets/CloudGiantHalfDragon.xml 2007-09-29 18:38:20 UTC (rev 4183) @@ -1519,7 +1519,7 @@ </school> <source> <sourcelevel>Drd2, Sor2, Water2, Wiz2</sourcelevel> - <source>Wizards of the Coast - Revised (v.3.5) System Reference Document, SpellsF-G.rtf</source> + <source>Revised (v.3.5) System Reference Document, SpellsF-G.rtf</source> <sourcepage>SpellsF-G.rtf</sourcepage> <sourceshort>RSRD</sourceshort> </source> @@ -1547,7 +1547,7 @@ </school> <source> <sourcelevel></sourcelevel> - <source>Wizards of the Coast - Revised (v.3.5) System Reference Document, SpellsH-L.rtf</source> + <source>Revised (v.3.5) System Reference Document, SpellsH-L.rtf</source> <sourcepage>SpellsH-L.rtf</sourcepage> <sourceshort>RSRD</sourceshort> </source> @@ -1575,7 +1575,7 @@ </school> <source> <sourcelevel>Adp1, Air1, Asn1, Clr1, Drd1, Sor1, Water1, Wiz1</sourcelevel> - <source>Wizards of the Coast - Revised (v.3.5) System Reference Document, SpellsM-O.rtf</source> + <source>Revised (v.3.5) System Reference Document, SpellsM-O.rtf</source> <sourcepage>SpellsM-O.rtf</sourcepage> <sourceshort>RSRD</sourceshort> </source> @@ -1622,7 +1622,7 @@ </school> <source> <sourcelevel>Drd2, Sor2, Water2, Wiz2</sourcelevel> - <source>Wizards of the Coast - Revised (v.3.5) System Reference Document, SpellsF-G.rtf</source> + <source>Revised (v.3.5) System Reference Document, SpellsF-G.rtf</source> <sourcepage>SpellsF-G.rtf</sourcepage> <sourceshort>RSRD</sourceshort> </source> @@ -1650,7 +1650,7 @@ </school> <source> <sourcelevel></sourcelevel> - <source>Wizards of the Coast - Revised (v.3.5) System Reference Document, SpellsH-L.rtf</source> + ... [truncated message content] |