Menu
▾
▴
[pcgen-commit-svn] SF.net SVN: pcgen:[9517] Trunk/pcgen/code/src/utest/plugin/lsttokens
|
From: <th...@us...> - 2009-02-27 03:11:14
|
Revision: 9517
http://pcgen.svn.sourceforge.net/pcgen/?rev=9517&view=rev
Author: thpr
Date: 2009-02-27 03:11:08 +0000 (Fri, 27 Feb 2009)
Log Message:
-----------
Add tests for consolidation behavior, part 2
Modified Paths:
--------------
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/AbstractCritMultTokenTestCase.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/AbstractCritRangeTokenTestCase.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/AbstractDamageTokenTestCase.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/AbstractEqModTokenTestCase.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/ContainsTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/CostTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/ModsTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/ProficiencyTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/QualityTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/SizeTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/WieldTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/WtTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/ArmortypeTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/ChargesTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/FormatcatTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/ItypeTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/NameoptTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/ReplacesTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/VisibleTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/kit/startpack/ApplyTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/kit/startpack/VisibleTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/AbbTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/AttackCycleTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/BonusSpellStatTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/DeityTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/ExClassTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/ExchangeLevelTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/HDTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/LevelsPerFeatTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/MonNonSkillTHDTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/MonSkillTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/ProhibitedTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/ProhibitspellTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/RaceTypeTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/SkillListTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/SpellListTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/SpellStatTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/VisibleTokenTest.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/level/AbstractPCClassLevelTokenTestCase.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/level/AbstractSpellCastingTokenTestCase.java
Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/level/HitDieTokenTest.java
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/AbstractCritMultTokenTestCase.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/AbstractCritMultTokenTestCase.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/AbstractCritMultTokenTestCase.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -24,6 +24,7 @@
import pcgen.rules.persistence.CDOMLoader;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public abstract class AbstractCritMultTokenTestCase extends
AbstractTokenTestCase<Equipment>
@@ -145,4 +146,22 @@
{
runRoundRobin("-");
}
+
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "-";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "x2";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/AbstractCritRangeTokenTestCase.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/AbstractCritRangeTokenTestCase.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/AbstractCritRangeTokenTestCase.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -24,6 +24,7 @@
import pcgen.rules.persistence.CDOMLoader;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public abstract class AbstractCritRangeTokenTestCase extends
AbstractTokenTestCase<Equipment>
@@ -111,4 +112,22 @@
{
runRoundRobin("5");
}
+
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "5";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "2";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/AbstractDamageTokenTestCase.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/AbstractDamageTokenTestCase.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/AbstractDamageTokenTestCase.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -24,6 +24,7 @@
import pcgen.rules.persistence.CDOMLoader;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public abstract class AbstractDamageTokenTestCase extends
AbstractTokenTestCase<Equipment>
@@ -129,4 +130,22 @@
{
runRoundRobin("-");
}
+
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "-";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "1d2";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/AbstractEqModTokenTestCase.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/AbstractEqModTokenTestCase.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/AbstractEqModTokenTestCase.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -234,4 +234,14 @@
{
return false;
}
+
+ @Test
+ public void testOverwriteDamageWeightAdd() throws PersistenceLayerException
+ {
+ parse("_DAMAGE|4d6");
+ validateUnparsed(primaryContext, primaryProf, "_DAMAGE|4d6");
+ parse("_WEIGHTADD|9500");
+ validateUnparsed(primaryContext, primaryProf, getConsolidationRule()
+ .getAnswer("_DAMAGE|4d6", "_WEIGHTADD|9500"));
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/ContainsTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/ContainsTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/ContainsTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -25,6 +25,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class ContainsTokenTest extends AbstractTokenTestCase<Equipment>
{
@@ -488,8 +489,26 @@
{
this.runRoundRobin("UNLIM|Total=10|Paper=10|Scroll=10");
}
+
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "UNLIM|Any=100";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "500|Potions=50";
+ }
// CONSIDER Optional Input methods
// this.runRoundRobin("UNLIM|Total=10|Paper=10|Scroll=UNLIM");
// this.runRoundRobin("UNLIM|Paper=10|Scroll=UNLIM");
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/CostTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/CostTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/CostTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -28,6 +28,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class CostTokenTest extends AbstractTokenTestCase<Equipment>
{
@@ -130,4 +131,21 @@
runRoundRobin("3.5");
}
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "1";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "3.5";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/ModsTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/ModsTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/ModsTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -25,6 +25,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class ModsTokenTest extends AbstractTokenTestCase<Equipment>
{
@@ -88,4 +89,22 @@
{
runRoundRobin("REQUIRED");
}
+
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "REQUIRED";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "YES";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/ProficiencyTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/ProficiencyTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/ProficiencyTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -30,6 +30,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class ProficiencyTokenTest extends AbstractTokenTestCase<Equipment>
{
@@ -525,4 +526,21 @@
return false;
}
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "ARMOR|TestWP2";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "ARMOR|TestWP1";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/QualityTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/QualityTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/QualityTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -25,6 +25,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class QualityTokenTest extends AbstractTokenTestCase<Equipment>
{
@@ -123,4 +124,21 @@
runRoundRobin("Languedoc-Roussillon Quality|Languedoc-Roussillon");
}
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "First Quality|Nieder\xF6sterreich";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "First Quality|Languedoc-Roussillon";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/SizeTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/SizeTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/SizeTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -29,6 +29,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class SizeTokenTest extends AbstractTokenTestCase<Equipment>
{
@@ -97,4 +98,21 @@
runRoundRobin("M");
}
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "S";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "M";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/WieldTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/WieldTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/WieldTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -25,6 +25,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class WieldTokenTest extends AbstractTokenTestCase<Equipment>
{
@@ -88,4 +89,22 @@
{
runRoundRobin("TwoHanded");
}
+
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "TwoHanded";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "Light";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/WtTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/WtTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipment/WtTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -28,6 +28,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class WtTokenTest extends AbstractTokenTestCase<Equipment>
{
@@ -130,4 +131,21 @@
runRoundRobin("3.5");
}
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "1";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "3.5";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/ArmortypeTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/ArmortypeTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/ArmortypeTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -25,6 +25,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class ArmortypeTokenTest extends
AbstractTokenTestCase<EquipmentModifier>
@@ -112,4 +113,22 @@
{
runRoundRobin("Medium|Light");
}
+
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "Medium|Light";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "Heavy|Medium";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.SEPARATE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/ChargesTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/ChargesTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/ChargesTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -25,6 +25,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class ChargesTokenTest extends AbstractTokenTestCase<EquipmentModifier>
{
@@ -118,4 +119,22 @@
{
runRoundRobin("10|10");
}
+
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "6|15";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "4|7";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/FormatcatTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/FormatcatTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/FormatcatTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -27,6 +27,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class FormatcatTokenTest extends
AbstractTokenTestCase<EquipmentModifier>
@@ -117,4 +118,22 @@
{
runRoundRobin("PARENS");
}
+
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "FRONT";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "PARENS";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/ItypeTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/ItypeTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/ItypeTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -26,6 +26,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTypeSafeListTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class ItypeTokenTest extends
AbstractTypeSafeListTestCase<EquipmentModifier>
@@ -111,4 +112,10 @@
{
return false;
}
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/NameoptTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/NameoptTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/NameoptTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -25,6 +25,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class NameoptTokenTest extends AbstractTokenTestCase<EquipmentModifier>
{
@@ -121,4 +122,21 @@
runRoundRobin("TEXT=This is the text");
}
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "SPELL";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "TEXT=This is the text";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/ReplacesTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/ReplacesTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/ReplacesTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -24,6 +24,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTypeSafeListTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class ReplacesTokenTest extends
AbstractTypeSafeListTestCase<EquipmentModifier>
@@ -103,4 +104,10 @@
{
return true;
}
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/VisibleTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/VisibleTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/equipmentmodifier/VisibleTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -27,6 +27,7 @@
import pcgen.util.enumeration.Visibility;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class VisibleTokenTest extends AbstractTokenTestCase<EquipmentModifier>
{
@@ -126,4 +127,22 @@
{
runRoundRobin("NO");
}
+
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "QUALIFY";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "NO";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/kit/startpack/ApplyTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/kit/startpack/ApplyTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/kit/startpack/ApplyTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -27,6 +27,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class ApplyTokenTest extends AbstractTokenTestCase<Kit>
{
@@ -108,4 +109,21 @@
runRoundRobin("INSTANT");
}
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "PERMANENT";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "INSTANT";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/kit/startpack/VisibleTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/kit/startpack/VisibleTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/kit/startpack/VisibleTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -27,6 +27,7 @@
import pcgen.util.enumeration.Visibility;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class VisibleTokenTest extends AbstractTokenTestCase<Kit>
{
@@ -125,4 +126,21 @@
runRoundRobin("NO");
}
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "QUALIFY";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "NO";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/AbbTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/AbbTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/AbbTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -25,6 +25,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class AbbTokenTest extends AbstractTokenTestCase<PCClass>
{
@@ -118,4 +119,22 @@
{
runRoundRobin("Yarra Valley");
}
+
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "Languedoc-Roussillon";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "Yarra Valley";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/AttackCycleTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/AttackCycleTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/AttackCycleTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -25,6 +25,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class AttackCycleTokenTest extends AbstractTokenTestCase<PCClass>
{
@@ -161,4 +162,22 @@
{
runRoundRobin("BAB|3|RAB|4|UAB|5");
}
+
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "BAB|4";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "BAB|2";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/BonusSpellStatTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/BonusSpellStatTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/BonusSpellStatTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -29,6 +29,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class BonusSpellStatTokenTest extends AbstractTokenTestCase<PCClass>
{
@@ -115,4 +116,31 @@
runRoundRobin("NONE");
}
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "NONE";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "STR";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
+
+ @Test
+ public void testOverwriteNoneStr() throws PersistenceLayerException
+ {
+ parse("NONE");
+ validateUnparsed(primaryContext, primaryProf, "NONE");
+ parse("STR");
+ validateUnparsed(primaryContext, primaryProf, getConsolidationRule()
+ .getAnswer("STR"));
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/DeityTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/DeityTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/DeityTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -25,6 +25,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractListTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class DeityTokenTest extends AbstractListTokenTestCase<PCClass, Deity>
{
@@ -98,4 +99,10 @@
{
return false;
}
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/ExClassTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/ExClassTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/ExClassTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -25,6 +25,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class ExClassTokenTest extends AbstractTokenTestCase<PCClass>
{
@@ -104,4 +105,21 @@
runRoundRobin("Yarra Valley");
}
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "Languedoc-Roussillon";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "Yarra Valley";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/ExchangeLevelTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/ExchangeLevelTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/ExchangeLevelTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -25,6 +25,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class ExchangeLevelTokenTest extends AbstractTokenTestCase<PCClass>
{
@@ -249,4 +250,22 @@
secondaryContext.ref.constructCDOMObject(PCClass.class, "Paladin");
runRoundRobin("Paladin|5|10|1");
}
+
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "Paladin|5|10|1";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "Paladin|10|10|0";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/HDTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/HDTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/HDTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -27,6 +27,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class HDTokenTest extends AbstractTokenTestCase<PCClass>
{
@@ -138,4 +139,22 @@
{
runRoundRobin("5");
}
+
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "4";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "2";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/LevelsPerFeatTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/LevelsPerFeatTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/LevelsPerFeatTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -29,6 +29,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class LevelsPerFeatTokenTest extends AbstractTokenTestCase<PCClass>
{
@@ -176,4 +177,21 @@
runRoundRobin("3|LEVELTYPE=Foo");
}
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "4";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "3|LEVELTYPE=Foo";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/MonNonSkillTHDTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/MonNonSkillTHDTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/MonNonSkillTHDTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -28,6 +28,7 @@
import plugin.bonustokens.MonNonSkillHD;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
import plugin.lsttokens.testsupport.TokenRegistration;
import plugin.pretokens.parser.PreRaceParser;
import plugin.pretokens.writer.PreRaceWriter;
@@ -131,4 +132,22 @@
{
runRoundRobin("VARIABLE1|PRERACE:1,HUMAN", "VARIABLE2|PRERACE:1,HUMAN");
}
+
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "VARIABLE2";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "VARIABLE1|PRERACE:1,HUMAN";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.SEPARATE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/MonSkillTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/MonSkillTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/MonSkillTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -28,6 +28,7 @@
import plugin.bonustokens.MonSkillPts;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
import plugin.lsttokens.testsupport.TokenRegistration;
import plugin.pretokens.parser.PreLevelMaxParser;
import plugin.pretokens.parser.PreRaceParser;
@@ -135,4 +136,21 @@
runRoundRobin("VARIABLE1|PRERACE:1,HUMAN", "VARIABLE2|PRERACE:1,HUMAN");
}
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "VARIABLE2";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "VARIABLE1|PRERACE:1,HUMAN";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.SEPARATE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/ProhibitedTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/ProhibitedTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/ProhibitedTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -28,6 +28,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
import plugin.lsttokens.testsupport.TokenRegistration;
import plugin.pretokens.parser.PreClassParser;
import plugin.pretokens.parser.PreRaceParser;
@@ -118,4 +119,21 @@
runRoundRobin("Fear,Fire");
}
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "Fire";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "Fear";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return new ConsolidationRule.AppendingConsolidation(',');
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/ProhibitspellTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/ProhibitspellTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/ProhibitspellTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -28,6 +28,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
import plugin.lsttokens.testsupport.TokenRegistration;
import plugin.pretokens.parser.PreClassParser;
import plugin.pretokens.parser.PreRaceParser;
@@ -308,4 +309,21 @@
"SUBSCHOOL.Subsch");
}
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "SUBSCHOOL.Subsch";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "SPELL.Fireball,Lightning Bolt|PRECLASS:1,Fighter=1";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.SEPARATE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/RaceTypeTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/RaceTypeTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/RaceTypeTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -25,6 +25,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class RaceTypeTokenTest extends AbstractTokenTestCase<PCClass>
{
@@ -87,4 +88,22 @@
{
runRoundRobin("Yarra Valley");
}
+
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "Languedoc-Roussillon";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "Yarra Valley";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/SkillListTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/SkillListTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/SkillListTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -27,6 +27,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class SkillListTokenTest extends AbstractTokenTestCase<PCClass>
{
@@ -269,4 +270,21 @@
loadContext.ref.constructCDOMObject(ClassSkillList.class, one);
}
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "2|TestWP1|TestWP3";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "1|TestWP1|TestWP2";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/SpellListTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/SpellListTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/SpellListTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -28,6 +28,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class SpellListTokenTest extends AbstractTokenTestCase<PCClass>
{
@@ -327,4 +328,21 @@
loadContext.ref.constructCDOMObject(DomainSpellList.class, one);
}
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "2|TestWP1|TestWP3";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "1|TestWP1|TestWP2";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/SpellStatTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/SpellStatTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/SpellStatTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -29,6 +29,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class SpellStatTokenTest extends AbstractTokenTestCase<PCClass>
{
@@ -119,4 +120,63 @@
{
runRoundRobin("OTHER");
}
+
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "OTHER";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "STR";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
+
+ @Test
+ public void testOverwriteStrSpell() throws PersistenceLayerException
+ {
+ parse("STR");
+ validateUnparsed(primaryContext, primaryProf, "STR");
+ parse("SPELL");
+ validateUnparsed(primaryContext, primaryProf, getConsolidationRule()
+ .getAnswer("STR", "SPELL"));
+ }
+
+ @Test
+ public void testOverwriteSpellOther() throws PersistenceLayerException
+ {
+ parse("SPELL");
+ validateUnparsed(primaryContext, primaryProf, "SPELL");
+ parse("OTHER");
+ validateUnparsed(primaryContext, primaryProf, getConsolidationRule()
+ .getAnswer("SPELL", "OTHER"));
+ }
+
+ @Test
+ public void testOverwriteSpellStr() throws PersistenceLayerException
+ {
+ parse("SPELL");
+ validateUnparsed(primaryContext, primaryProf, "SPELL");
+ parse("STR");
+ validateUnparsed(primaryContext, primaryProf, getConsolidationRule()
+ .getAnswer("SPELL", "STR"));
+ }
+
+ @Test
+ public void testOverwriteOtherStr() throws PersistenceLayerException
+ {
+ parse("OTHER");
+ validateUnparsed(primaryContext, primaryProf, "OTHER");
+ parse("STR");
+ validateUnparsed(primaryContext, primaryProf, getConsolidationRule()
+ .getAnswer("OTHER", "STR"));
+ }
+
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/VisibleTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/VisibleTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/VisibleTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -27,6 +27,7 @@
import pcgen.util.enumeration.Visibility;
import plugin.lsttokens.testsupport.AbstractTokenTestCase;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class VisibleTokenTest extends AbstractTokenTestCase<PCClass>
{
@@ -137,4 +138,21 @@
runRoundRobin("NO");
}
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "YES";
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "NO";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/level/AbstractPCClassLevelTokenTestCase.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/level/AbstractPCClassLevelTokenTestCase.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/level/AbstractPCClassLevelTokenTestCase.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -24,6 +24,7 @@
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Test;
import pcgen.cdom.base.CDOMObject;
import pcgen.cdom.inst.PCClassLevel;
@@ -40,6 +41,7 @@
import pcgen.rules.persistence.token.CDOMPrimaryToken;
import pcgen.util.Logging;
import plugin.lsttokens.testsupport.CDOMTokenLoader;
+import plugin.lsttokens.testsupport.ConsolidationRule;
import plugin.lsttokens.testsupport.TokenRegistration;
public abstract class AbstractPCClassLevelTokenTestCase extends TestCase
@@ -145,8 +147,18 @@
// Doesn't pollute other levels
assertNull(getToken().unparse(secondaryContext, secondaryProf1));
assertNull(getToken().unparse(secondaryContext, secondaryProf3));
- String[] sUnparsed = getToken().unparse(secondaryContext,
- secondaryProf2);
+ validateUnparsed(secondaryContext, secondaryProf2, unparsed);
+ assertTrue(primaryContext.ref.validate(null));
+ assertTrue(secondaryContext.ref.validate(null));
+ assertEquals(0, primaryContext.getWriteMessageCount());
+ assertEquals(0, secondaryContext.getWriteMessageCount());
+ }
+
+ private void validateUnparsed(LoadContext sc, PCClassLevel sp,
+ String... unparsed)
+ {
+ String[] sUnparsed = getToken().unparse(sc,
+ sp);
assertEquals(unparsed.length, sUnparsed.length);
for (int i = 0; i < unparsed.length; i++)
@@ -154,10 +166,6 @@
assertEquals("Expected " + i + " item to be equal", unparsed[i],
sUnparsed[i]);
}
- assertTrue(primaryContext.ref.validate(null));
- assertTrue(secondaryContext.ref.validate(null));
- assertEquals(0, primaryContext.getWriteMessageCount());
- assertEquals(0, secondaryContext.getWriteMessageCount());
}
public abstract CDOMPrimaryToken<PCClassLevel> getToken();
@@ -208,4 +216,22 @@
}
return b;
}
+
+ @Test
+ public void testOverwrite() throws PersistenceLayerException
+ {
+ parse(getLegalValue(), 1);
+ validateUnparsed(primaryContext, primaryProf.getClassLevel(1),
+ getLegalValue());
+ parse(getAlternateLegalValue(), 1);
+ validateUnparsed(primaryContext, primaryProf.getClassLevel(1),
+ getConsolidationRule().getAnswer(getLegalValue(),
+ getAlternateLegalValue()));
+ }
+
+ protected abstract String getLegalValue();
+
+ protected abstract String getAlternateLegalValue();
+
+ protected abstract ConsolidationRule getConsolidationRule();
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/level/AbstractSpellCastingTokenTestCase.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/level/AbstractSpellCastingTokenTestCase.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/level/AbstractSpellCastingTokenTestCase.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -20,6 +20,7 @@
import org.junit.Test;
import pcgen.persistence.PersistenceLayerException;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public abstract class AbstractSpellCastingTokenTestCase extends
AbstractPCClassLevelTokenTestCase
@@ -137,4 +138,21 @@
runRoundRobin("Form,Form2+Form3,1");
}
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "Form,Form2+Form3,1";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "3,2,1";
+ }
}
Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/level/HitDieTokenTest.java
===================================================================
--- Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/level/HitDieTokenTest.java 2009-02-27 03:08:30 UTC (rev 9516)
+++ Trunk/pcgen/code/src/utest/plugin/lsttokens/pcclass/level/HitDieTokenTest.java 2009-02-27 03:11:08 UTC (rev 9517)
@@ -22,6 +22,7 @@
import pcgen.cdom.inst.PCClassLevel;
import pcgen.persistence.PersistenceLayerException;
import pcgen.rules.persistence.token.CDOMPrimaryToken;
+import plugin.lsttokens.testsupport.ConsolidationRule;
public class HitDieTokenTest extends AbstractPCClassLevelTokenTestCase
{
@@ -338,4 +339,22 @@
{
runRoundRobin("%Hdown2");
}
+
+ @Override
+ protected String getAlternateLegalValue()
+ {
+ return "%down2";
+ }
+
+ @Override
+ protected ConsolidationRule getConsolidationRule()
+ {
+ return ConsolidationRule.OVERWRITE;
+ }
+
+ @Override
+ protected String getLegalValue()
+ {
+ return "%Hup2";
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|