From: <th...@us...> - 2012-12-16 20:12:28
|
Revision: 18693 http://sourceforge.net/p/pcgen/code/18693 Author: thpr Date: 2012-12-16 20:12:24 +0000 (Sun, 16 Dec 2012) Log Message: ----------- Fix: Negated CHOOSE:ANY is not unparsed correctly Underlying mistake was that there were two systems identifying whether a token was negateable, and they mismatched in their answer for ANY :/ Similar issue with the WeaponProf Qualifier SPELLCASTER, but thankfully that was just a test mistake and not a problem in the runtime code. This fixes ANY as well as rewriting the test system to have only one method of identifying whether a token can be negated Issue#: CODE-1926 Modified Paths: -------------- Trunk/pcgen/code/src/java/plugin/qualifier/pobject/AnyToken.java Trunk/pcgen/code/src/utest/plugin/lsttokens/testsupport/AbstractPCQualifierTokenTestCase.java Trunk/pcgen/code/src/utest/plugin/lsttokens/testsupport/AbstractQualifierTokenTestCase.java Trunk/pcgen/code/src/utest/plugin/qualifier/armorprof/EquipmentQualifierTokenTest.java Trunk/pcgen/code/src/utest/plugin/qualifier/pobject/AnyQualifierTokenTest.java Trunk/pcgen/code/src/utest/plugin/qualifier/pobject/QualifiedQualifierTokenTest.java Trunk/pcgen/code/src/utest/plugin/qualifier/shieldprof/EquipmentQualifierTokenTest.java Trunk/pcgen/code/src/utest/plugin/qualifier/skill/ClassQualifierTokenTest.java Trunk/pcgen/code/src/utest/plugin/qualifier/skill/CrossClassQualifierTokenTest.java Trunk/pcgen/code/src/utest/plugin/qualifier/skill/ExclusiveQualifierTokenTest.java Trunk/pcgen/code/src/utest/plugin/qualifier/skill/NoRankQualifierTokenTest.java Trunk/pcgen/code/src/utest/plugin/qualifier/skill/RanksQualifierTokenTest.java Trunk/pcgen/code/src/utest/plugin/qualifier/weaponprof/EquipmentQualifierTokenTest.java Trunk/pcgen/code/src/utest/plugin/qualifier/weaponprof/SpellcasterQualifierTokenTest.java Modified: Trunk/pcgen/code/src/java/plugin/qualifier/pobject/AnyToken.java =================================================================== --- Trunk/pcgen/code/src/java/plugin/qualifier/pobject/AnyToken.java 2012-12-16 19:36:55 UTC (rev 18692) +++ Trunk/pcgen/code/src/java/plugin/qualifier/pobject/AnyToken.java 2012-12-16 20:12:24 UTC (rev 18693) @@ -94,6 +94,10 @@ public String getLSTformat(boolean useAny) { StringBuilder sb = new StringBuilder(); + if (negated) + { + sb.append('!'); + } sb.append(getTokenName()); if (wasRestricted) { Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/testsupport/AbstractPCQualifierTokenTestCase.java =================================================================== --- Trunk/pcgen/code/src/utest/plugin/lsttokens/testsupport/AbstractPCQualifierTokenTestCase.java 2012-12-16 19:36:55 UTC (rev 18692) +++ Trunk/pcgen/code/src/utest/plugin/lsttokens/testsupport/AbstractPCQualifierTokenTestCase.java 2012-12-16 20:12:24 UTC (rev 18693) @@ -39,7 +39,7 @@ public AbstractPCQualifierTokenTestCase() { - super("PC", null, true); + super("PC", null); } @Override Modified: Trunk/pcgen/code/src/utest/plugin/lsttokens/testsupport/AbstractQualifierTokenTestCase.java =================================================================== --- Trunk/pcgen/code/src/utest/plugin/lsttokens/testsupport/AbstractQualifierTokenTestCase.java 2012-12-16 19:36:55 UTC (rev 18692) +++ Trunk/pcgen/code/src/utest/plugin/lsttokens/testsupport/AbstractQualifierTokenTestCase.java 2012-12-16 20:12:24 UTC (rev 18693) @@ -62,9 +62,8 @@ private final String qualifier; private final String target; private final String token; - private final boolean negate; - protected AbstractQualifierTokenTestCase(String tok, String tgt, boolean allowNegation) + protected AbstractQualifierTokenTestCase(String tok, String tgt) { token = tok; target = tgt; @@ -76,7 +75,6 @@ { qualifier = token + "=" + target; } - negate = allowNegation; } public String getSubTokenName() @@ -443,7 +441,7 @@ @Test public void testNegatedQualifierPipe() throws PersistenceLayerException { - if (!negate) + if (!allowsNotQualifier()) { assertFalse(parse(getSubTokenName() + "|!" + qualifier + "[TYPE=Bar|TYPE=Goo]|" + qualifier @@ -455,7 +453,7 @@ @Test public void testNegatedQualifierPrim() throws PersistenceLayerException { - if (!negate) + if (!allowsNotQualifier()) { construct(primaryContext, getTargetClass(), "TestWP1"); construct(secondaryContext, getTargetClass(), "TestWP1"); @@ -469,7 +467,7 @@ public void testNegatedQualifierParenPrim() throws PersistenceLayerException { - if (!negate) + if (!allowsNotQualifier()) { construct(primaryContext, getTargetClass(), "TestWP1 (Test)"); construct(secondaryContext, getTargetClass(), "TestWP1 (Test)"); @@ -482,7 +480,7 @@ @Test public void testNegatedQualifierAll() throws PersistenceLayerException { - if (!negate) + if (!allowsNotQualifier()) { assertFalse(parse(getSubTokenName() + "|!" + qualifier + "[ALL]")); assertNoSideEffects(); @@ -1756,8 +1754,6 @@ public void testRoundRobinTestNotQualifierAll() throws PersistenceLayerException { - construct(primaryContext, getTargetClass(), "TestWP1"); - construct(secondaryContext, getTargetClass(), "TestWP1"); if (allowsNotQualifier()) { runRoundRobin(getSubTokenName() + "|!" + qualifier + "[ALL]"); @@ -1780,8 +1776,6 @@ public void testRoundRobinTestQualifierRaw() throws PersistenceLayerException { - construct(primaryContext, getTargetClass(), "TestWP1"); - construct(secondaryContext, getTargetClass(), "TestWP1"); if (allowsLoneQualifier()) { runRoundRobin(getSubTokenName() + '|' + qualifier); Modified: Trunk/pcgen/code/src/utest/plugin/qualifier/armorprof/EquipmentQualifierTokenTest.java =================================================================== --- Trunk/pcgen/code/src/utest/plugin/qualifier/armorprof/EquipmentQualifierTokenTest.java 2012-12-16 19:36:55 UTC (rev 18692) +++ Trunk/pcgen/code/src/utest/plugin/qualifier/armorprof/EquipmentQualifierTokenTest.java 2012-12-16 20:12:24 UTC (rev 18693) @@ -56,7 +56,7 @@ public EquipmentQualifierTokenTest() { - super("EQUIPMENT", null, false); + super("EQUIPMENT", null); } @Override Modified: Trunk/pcgen/code/src/utest/plugin/qualifier/pobject/AnyQualifierTokenTest.java =================================================================== --- Trunk/pcgen/code/src/utest/plugin/qualifier/pobject/AnyQualifierTokenTest.java 2012-12-16 19:36:55 UTC (rev 18692) +++ Trunk/pcgen/code/src/utest/plugin/qualifier/pobject/AnyQualifierTokenTest.java 2012-12-16 20:12:24 UTC (rev 18693) @@ -51,7 +51,7 @@ public AnyQualifierTokenTest() { - super("ANY", null, true); + super("ANY", null); } @Override @@ -94,7 +94,7 @@ @Override protected boolean allowsNotQualifier() { - return false; + return true; } @Override @@ -156,4 +156,26 @@ primaryContext.ref.importObject(s3); primaryContext.unconditionallyProcess(s3, "TYPE", "Masterful"); } + + @Override + @Test + public void testRoundRobinTestNotQualifierAll() + throws PersistenceLayerException + { + //Not any is empty, so the loader should reject + assertFalse(parse(getSubTokenName() + "|!" + "ANY" + "[ALL]")); + assertNoSideEffects(); + } + + @Override + @Test + public void testRoundRobinTestNotQualifierRaw() + throws PersistenceLayerException + { + //Not any is empty, so the loader should reject + assertFalse(parse(getSubTokenName() + "|!" + "ANY")); + assertNoSideEffects(); + } + + } Modified: Trunk/pcgen/code/src/utest/plugin/qualifier/pobject/QualifiedQualifierTokenTest.java =================================================================== --- Trunk/pcgen/code/src/utest/plugin/qualifier/pobject/QualifiedQualifierTokenTest.java 2012-12-16 19:36:55 UTC (rev 18692) +++ Trunk/pcgen/code/src/utest/plugin/qualifier/pobject/QualifiedQualifierTokenTest.java 2012-12-16 20:12:24 UTC (rev 18693) @@ -51,7 +51,7 @@ public QualifiedQualifierTokenTest() { - super("QUALIFIED", null, true); + super("QUALIFIED", null); } @Override Modified: Trunk/pcgen/code/src/utest/plugin/qualifier/shieldprof/EquipmentQualifierTokenTest.java =================================================================== --- Trunk/pcgen/code/src/utest/plugin/qualifier/shieldprof/EquipmentQualifierTokenTest.java 2012-12-16 19:36:55 UTC (rev 18692) +++ Trunk/pcgen/code/src/utest/plugin/qualifier/shieldprof/EquipmentQualifierTokenTest.java 2012-12-16 20:12:24 UTC (rev 18693) @@ -57,7 +57,7 @@ public EquipmentQualifierTokenTest() { - super("EQUIPMENT", null, false); + super("EQUIPMENT", null); } @Override Modified: Trunk/pcgen/code/src/utest/plugin/qualifier/skill/ClassQualifierTokenTest.java =================================================================== --- Trunk/pcgen/code/src/utest/plugin/qualifier/skill/ClassQualifierTokenTest.java 2012-12-16 19:36:55 UTC (rev 18692) +++ Trunk/pcgen/code/src/utest/plugin/qualifier/skill/ClassQualifierTokenTest.java 2012-12-16 20:12:24 UTC (rev 18693) @@ -53,7 +53,7 @@ public ClassQualifierTokenTest() { - super("CLASS", null, true); + super("CLASS", null); } @Override Modified: Trunk/pcgen/code/src/utest/plugin/qualifier/skill/CrossClassQualifierTokenTest.java =================================================================== --- Trunk/pcgen/code/src/utest/plugin/qualifier/skill/CrossClassQualifierTokenTest.java 2012-12-16 19:36:55 UTC (rev 18692) +++ Trunk/pcgen/code/src/utest/plugin/qualifier/skill/CrossClassQualifierTokenTest.java 2012-12-16 20:12:24 UTC (rev 18693) @@ -53,7 +53,7 @@ public CrossClassQualifierTokenTest() { - super("CROSSCLASS", null, true); + super("CROSSCLASS", null); } @Override Modified: Trunk/pcgen/code/src/utest/plugin/qualifier/skill/ExclusiveQualifierTokenTest.java =================================================================== --- Trunk/pcgen/code/src/utest/plugin/qualifier/skill/ExclusiveQualifierTokenTest.java 2012-12-16 19:36:55 UTC (rev 18692) +++ Trunk/pcgen/code/src/utest/plugin/qualifier/skill/ExclusiveQualifierTokenTest.java 2012-12-16 20:12:24 UTC (rev 18693) @@ -53,7 +53,7 @@ public ExclusiveQualifierTokenTest() { - super("EXCLUSIVE", null, true); + super("EXCLUSIVE", null); } @Override Modified: Trunk/pcgen/code/src/utest/plugin/qualifier/skill/NoRankQualifierTokenTest.java =================================================================== --- Trunk/pcgen/code/src/utest/plugin/qualifier/skill/NoRankQualifierTokenTest.java 2012-12-16 19:36:55 UTC (rev 18692) +++ Trunk/pcgen/code/src/utest/plugin/qualifier/skill/NoRankQualifierTokenTest.java 2012-12-16 20:12:24 UTC (rev 18693) @@ -53,7 +53,7 @@ public NoRankQualifierTokenTest() { - super("NORANK", null, false); + super("NORANK", null); } @Override Modified: Trunk/pcgen/code/src/utest/plugin/qualifier/skill/RanksQualifierTokenTest.java =================================================================== --- Trunk/pcgen/code/src/utest/plugin/qualifier/skill/RanksQualifierTokenTest.java 2012-12-16 19:36:55 UTC (rev 18692) +++ Trunk/pcgen/code/src/utest/plugin/qualifier/skill/RanksQualifierTokenTest.java 2012-12-16 20:12:24 UTC (rev 18693) @@ -53,7 +53,7 @@ public RanksQualifierTokenTest() { - super("RANKS", "4", true); + super("RANKS", "4"); } @Override Modified: Trunk/pcgen/code/src/utest/plugin/qualifier/weaponprof/EquipmentQualifierTokenTest.java =================================================================== --- Trunk/pcgen/code/src/utest/plugin/qualifier/weaponprof/EquipmentQualifierTokenTest.java 2012-12-16 19:36:55 UTC (rev 18692) +++ Trunk/pcgen/code/src/utest/plugin/qualifier/weaponprof/EquipmentQualifierTokenTest.java 2012-12-16 20:12:24 UTC (rev 18693) @@ -56,7 +56,7 @@ public EquipmentQualifierTokenTest() { - super("EQUIPMENT", null, false); + super("EQUIPMENT", null); } @Override Modified: Trunk/pcgen/code/src/utest/plugin/qualifier/weaponprof/SpellcasterQualifierTokenTest.java =================================================================== --- Trunk/pcgen/code/src/utest/plugin/qualifier/weaponprof/SpellcasterQualifierTokenTest.java 2012-12-16 19:36:55 UTC (rev 18692) +++ Trunk/pcgen/code/src/utest/plugin/qualifier/weaponprof/SpellcasterQualifierTokenTest.java 2012-12-16 20:12:24 UTC (rev 18693) @@ -51,7 +51,7 @@ public SpellcasterQualifierTokenTest() { - super("SPELLCASTER", null, true); + super("SPELLCASTER", null); } @Override This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |