From: <th...@us...> - 2007-08-23 01:27:15
|
Revision: 3865 http://pcgen.svn.sourceforge.net/pcgen/?rev=3865&view=rev Author: thpr Date: 2007-08-22 18:27:17 -0700 (Wed, 22 Aug 2007) Log Message: ----------- CDOM: Updates to test cases Modified Paths: -------------- branches/cdom/code/src/utest/plugin/lsttokens/deity/AlignTokenTest.java branches/cdom/code/src/utest/plugin/lsttokens/deity/DomainsTokenTest.java branches/cdom/code/src/utest/plugin/lsttokens/domain/FeatTokenTest.java branches/cdom/code/src/utest/plugin/lsttokens/race/CRTokenTest.java branches/cdom/code/src/utest/plugin/lsttokens/race/FaceTokenTest.java branches/cdom/code/src/utest/plugin/lsttokens/race/FeatTokenTest.java branches/cdom/code/src/utest/plugin/lsttokens/race/HitDiceAdvancementTokenTest.java branches/cdom/code/src/utest/plugin/lsttokens/race/HitDieTokenTest.java branches/cdom/code/src/utest/plugin/lsttokens/race/MonsterClassTokenTest.java branches/cdom/code/src/utest/plugin/lsttokens/race/SizeTokenTest.java branches/cdom/code/src/utest/plugin/lsttokens/race/StartFeatsTokenTest.java Modified: branches/cdom/code/src/utest/plugin/lsttokens/deity/AlignTokenTest.java =================================================================== --- branches/cdom/code/src/utest/plugin/lsttokens/deity/AlignTokenTest.java 2007-08-23 01:26:32 UTC (rev 3864) +++ branches/cdom/code/src/utest/plugin/lsttokens/deity/AlignTokenTest.java 2007-08-23 01:27:17 UTC (rev 3865) @@ -88,29 +88,29 @@ @Test public void testInvalidEmpty() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("")); + assertNoSideEffects(); } @Test public void testInvalidFormula() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "1+3")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("1+3")); + assertNoSideEffects(); } @Test public void testInvalidInteger() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "4")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("4")); + assertNoSideEffects(); } @Test public void testInvalidString() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "String")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("String")); + assertNoSideEffects(); } @Test Modified: branches/cdom/code/src/utest/plugin/lsttokens/deity/DomainsTokenTest.java =================================================================== --- branches/cdom/code/src/utest/plugin/lsttokens/deity/DomainsTokenTest.java 2007-08-23 01:26:32 UTC (rev 3864) +++ branches/cdom/code/src/utest/plugin/lsttokens/deity/DomainsTokenTest.java 2007-08-23 01:27:17 UTC (rev 3865) @@ -121,9 +121,8 @@ @Test public void testInvalidOnlyPre() throws PersistenceLayerException { - assertFalse(getToken() - .parse(primaryContext, primaryProf, "!PRELEVEL:3")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("!PRELEVEL:3")); + assertNoSideEffects(); } @Test @@ -131,9 +130,8 @@ { construct(primaryContext, "TestWP1"); construct(primaryContext, "TestWP2"); - assertFalse(getToken().parse(primaryContext, primaryProf, - "TestWP1|!PRELEVEL:3|TestWP2")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("TestWP1|!PRELEVEL:3|TestWP2")); + assertNoSideEffects(); } @Test @@ -141,9 +139,8 @@ { construct(primaryContext, "TestWP1"); construct(primaryContext, "TestWP2"); - assertFalse(getToken().parse(primaryContext, primaryProf, - "TestWP1,TestWP2|PREFOO:3")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("TestWP1,TestWP2|PREFOO:3")); + assertNoSideEffects(); } @Test @@ -151,9 +148,8 @@ { construct(primaryContext, "TestWP1"); construct(primaryContext, "TestWP2"); - assertFalse(getToken().parse(primaryContext, primaryProf, - "TestWP1,TestWP2|!PREFOO:3")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("TestWP1,TestWP2|!PREFOO:3")); + assertNoSideEffects(); } @Test @@ -161,9 +157,8 @@ { construct(primaryContext, "TestWP1"); construct(primaryContext, "TestWP2"); - assertFalse(getToken().parse(primaryContext, primaryProf, - "TestWP1|PRELEVEL:4|TestWP2")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("TestWP1|PRELEVEL:4|TestWP2")); + assertNoSideEffects(); } @Test Modified: branches/cdom/code/src/utest/plugin/lsttokens/domain/FeatTokenTest.java =================================================================== --- branches/cdom/code/src/utest/plugin/lsttokens/domain/FeatTokenTest.java 2007-08-23 01:26:32 UTC (rev 3864) +++ branches/cdom/code/src/utest/plugin/lsttokens/domain/FeatTokenTest.java 2007-08-23 01:27:17 UTC (rev 3865) @@ -123,7 +123,7 @@ public void testInvalidInputEmpty() { assertFalse(token.parse(primaryContext, primaryProf, "")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test @@ -132,7 +132,7 @@ construct(primaryContext, "TestWP1"); assertFalse(token.parse(primaryContext, primaryProf, "PRECLASS:1,Fighter=1")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test @@ -141,7 +141,7 @@ construct(primaryContext, "TestWP1"); assertFalse(token.parse(primaryContext, primaryProf, "TestWP1|PRECLASS:1,Fighter=1|TestWP2")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test @@ -150,7 +150,7 @@ construct(primaryContext, "TestWP1"); assertFalse(token.parse(primaryContext, primaryProf, "TestWP1||PRECLASS:1,Fighter=1")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test @@ -159,7 +159,7 @@ construct(primaryContext, "TestWP1"); assertFalse(token.parse(primaryContext, primaryProf, "TestWP1|PRECLASS:1,Fighter=1|")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test @@ -168,8 +168,6 @@ construct(primaryContext, "TestWP1"); construct(secondaryContext, "TestWP1"); runRoundRobin("TestWP1|PRECLASS:1,Fighter=1"); - assertTrue(primaryContext.ref.validate()); - assertTrue(secondaryContext.ref.validate()); } @Test @@ -178,8 +176,6 @@ construct(primaryContext, "TestWP1"); construct(secondaryContext, "TestWP1"); runRoundRobin("TestWP1|!PRERACE:1,Human|PRECLASS:1,Fighter=1"); - assertTrue(primaryContext.ref.validate()); - assertTrue(secondaryContext.ref.validate()); } @Test @@ -188,8 +184,6 @@ construct(primaryContext, "TestWP1"); construct(secondaryContext, "TestWP1"); runRoundRobin("TestWP1|!PRECLASS:1,Fighter=1"); - assertTrue(primaryContext.ref.validate()); - assertTrue(secondaryContext.ref.validate()); } @Test @@ -200,8 +194,6 @@ construct(secondaryContext, "TestWP1"); construct(secondaryContext, "TestWP2"); runRoundRobin("TestWP1|PRECLASS:1,Fighter=1", "TestWP2"); - assertTrue(primaryContext.ref.validate()); - assertTrue(secondaryContext.ref.validate()); } @Test @@ -209,8 +201,6 @@ construct(primaryContext, "TestWP1"); construct(secondaryContext, "TestWP1"); runRoundRobin("TestWP1|TestWP1"); - assertTrue(primaryContext.ref.validate()); - assertTrue(secondaryContext.ref.validate()); } @Test @@ -218,8 +208,6 @@ construct(primaryContext, "TestWP1"); construct(secondaryContext, "TestWP1"); runRoundRobin("TestWP1|TestWP1|PRERACE:1,Human"); - assertTrue(primaryContext.ref.validate()); - assertTrue(secondaryContext.ref.validate()); } @Test @@ -229,8 +217,6 @@ construct(primaryContext, "TestWP1"); construct(secondaryContext, "TestWP1"); runRoundRobin("TestWP1", "TestWP1|PRERACE:1,Human"); - assertTrue(primaryContext.ref.validate()); - assertTrue(secondaryContext.ref.validate()); } @Test @@ -242,7 +228,5 @@ construct(secondaryContext, "TestWP2"); runRoundRobin("TestWP1|TestWP1|PRERACE:1,Human", "TestWP2|TestWP2|PRERACE:1,Elf"); - assertTrue(primaryContext.ref.validate()); - assertTrue(secondaryContext.ref.validate()); } } Modified: branches/cdom/code/src/utest/plugin/lsttokens/race/CRTokenTest.java =================================================================== --- branches/cdom/code/src/utest/plugin/lsttokens/race/CRTokenTest.java 2007-08-23 01:26:32 UTC (rev 3864) +++ branches/cdom/code/src/utest/plugin/lsttokens/race/CRTokenTest.java 2007-08-23 01:27:17 UTC (rev 3865) @@ -55,14 +55,14 @@ { try { - boolean parse = getToken().parse(primaryContext, primaryProf, "-1"); + boolean parse = parse("-1"); assertFalse(parse); } catch (IllegalArgumentException e) { // OK } - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test Modified: branches/cdom/code/src/utest/plugin/lsttokens/race/FaceTokenTest.java =================================================================== --- branches/cdom/code/src/utest/plugin/lsttokens/race/FaceTokenTest.java 2007-08-23 01:26:32 UTC (rev 3864) +++ branches/cdom/code/src/utest/plugin/lsttokens/race/FaceTokenTest.java 2007-08-23 01:27:17 UTC (rev 3865) @@ -57,13 +57,13 @@ public void testInvalidInputUnset() throws PersistenceLayerException { internalTestInvalidInputs(null, null); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test public void testInvalidInputSet() throws PersistenceLayerException { - assertTrue(getToken().parse(primaryContext, primaryProf, "15,20")); + assertTrue(parse("15,20")); BigDecimal w = new BigDecimal(15); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); BigDecimal h = new BigDecimal(20); @@ -75,79 +75,77 @@ public void internalTestInvalidInputs(BigDecimal w, BigDecimal h) throws PersistenceLayerException { - //Always ensure get is unchanged + // Always ensure get is unchanged // since no invalid item should set or reset the value assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, "TestWP")); + assertFalse(parse("TestWP")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, "String")); + assertFalse(parse("String")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, - "TYPE=TestType")); + assertFalse(parse("TYPE=TestType")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, - "TYPE.TestType")); + assertFalse(parse("TYPE.TestType")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, "ALL")); + assertFalse(parse("ALL")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, "ANY")); + assertFalse(parse("ANY")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, "FIVE")); + assertFalse(parse("FIVE")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, "1/2")); + assertFalse(parse("1/2")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, "1+3")); + assertFalse(parse("1+3")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, "-1")); + assertFalse(parse("-1")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, "-2, 4")); + assertFalse(parse("-2, 4")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, "6, -3")); + assertFalse(parse("6, -3")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, "x, 4")); + assertFalse(parse("x, 4")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, "6, y")); + assertFalse(parse("6, y")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, "+, 4")); + assertFalse(parse("+, 4")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, "6, +")); + assertFalse(parse("6, +")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, " , 4")); + assertFalse(parse(" , 4")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, "6, ")); + assertFalse(parse("6, ")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, "1,")); + assertFalse(parse("1,")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, ",1")); + assertFalse(parse(",1")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, "1,2,3")); + assertFalse(parse("1,2,3")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, "1,2,")); + assertFalse(parse("1,2,")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertFalse(getToken().parse(primaryContext, primaryProf, ",2,3")); + assertFalse(parse(",2,3")); assertEquals(w, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(h, primaryProf.get(ObjectKey.FACE_HEIGHT)); } @@ -155,24 +153,26 @@ @Test public void testValidInputs() throws PersistenceLayerException { - assertTrue(getToken().parse(primaryContext, primaryProf, "5")); + assertTrue(parse("5")); assertEquals(new BigDecimal(5), primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(BigDecimal.ZERO, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertTrue(getToken().parse(primaryContext, primaryProf, "1")); + assertTrue(parse("1")); assertEquals(new BigDecimal(1), primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(BigDecimal.ZERO, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertTrue(getToken().parse(primaryContext, primaryProf, "0")); + assertTrue(parse("0")); assertEquals(BigDecimal.ZERO, primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(BigDecimal.ZERO, primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertTrue(getToken().parse(primaryContext, primaryProf, "5,10")); + assertTrue(parse("5,10")); assertEquals(new BigDecimal(5), primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(new BigDecimal(10), primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertTrue(getToken().parse(primaryContext, primaryProf, "10,7")); + assertTrue(parse("10,7")); assertEquals(new BigDecimal(10), primaryProf.get(ObjectKey.FACE_WIDTH)); assertEquals(new BigDecimal(7), primaryProf.get(ObjectKey.FACE_HEIGHT)); - assertTrue(getToken().parse(primaryContext, primaryProf, "18.1,45.2")); - assertEquals(new BigDecimal("18.1"), primaryProf.get(ObjectKey.FACE_WIDTH)); - assertEquals(new BigDecimal("45.2"), primaryProf.get(ObjectKey.FACE_HEIGHT)); + assertTrue(parse("18.1,45.2")); + assertEquals(new BigDecimal("18.1"), primaryProf + .get(ObjectKey.FACE_WIDTH)); + assertEquals(new BigDecimal("45.2"), primaryProf + .get(ObjectKey.FACE_HEIGHT)); } @Test @@ -215,13 +215,14 @@ runRoundRobin("0,5"); } - // Note: Can't do this because if Height is zero, then it is not written out. + // Note: Can't do this because if Height is zero, then it is not written + // out. // - Tom Parker 2/23/2007 - // @Test - // public void testRoundRobinZeroY() throws PersistenceLayerException - // { - // testRoundRobin("5,0"); - // } + // @Test + // public void testRoundRobinZeroY() throws PersistenceLayerException + // { + // testRoundRobin("5,0"); + // } @Test public void testRoundRobinDecimal() throws PersistenceLayerException Modified: branches/cdom/code/src/utest/plugin/lsttokens/race/FeatTokenTest.java =================================================================== --- branches/cdom/code/src/utest/plugin/lsttokens/race/FeatTokenTest.java 2007-08-23 01:26:32 UTC (rev 3864) +++ branches/cdom/code/src/utest/plugin/lsttokens/race/FeatTokenTest.java 2007-08-23 01:27:17 UTC (rev 3865) @@ -123,7 +123,7 @@ public void testInvalidInputEmpty() { assertFalse(token.parse(primaryContext, primaryProf, "")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test @@ -139,7 +139,7 @@ { // this is okay too :) } - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test @@ -148,7 +148,7 @@ construct(primaryContext, "TestWP1"); assertFalse(token.parse(primaryContext, primaryProf, "TestWP1|PRECLASS:1,Fighter=1|TestWP2")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test @@ -157,7 +157,7 @@ construct(primaryContext, "TestWP1"); assertFalse(token.parse(primaryContext, primaryProf, "TestWP1||PRECLASS:1,Fighter=1")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test @@ -166,7 +166,7 @@ construct(primaryContext, "TestWP1"); assertFalse(token.parse(primaryContext, primaryProf, "TestWP1|PRECLASS:1,Fighter=1|")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test @@ -208,8 +208,6 @@ construct(primaryContext, "TestWP1"); construct(secondaryContext, "TestWP1"); runRoundRobin("TestWP1|TestWP1"); - assertTrue(primaryContext.ref.validate()); - assertTrue(secondaryContext.ref.validate()); } @Test @@ -217,8 +215,6 @@ construct(primaryContext, "TestWP1"); construct(secondaryContext, "TestWP1"); runRoundRobin("TestWP1|TestWP1|PRERACE:1,Human"); - assertTrue(primaryContext.ref.validate()); - assertTrue(secondaryContext.ref.validate()); } @Test @@ -228,8 +224,6 @@ construct(primaryContext, "TestWP1"); construct(secondaryContext, "TestWP1"); runRoundRobin("TestWP1", "TestWP1|PRERACE:1,Human"); - assertTrue(primaryContext.ref.validate()); - assertTrue(secondaryContext.ref.validate()); } @Test @@ -241,7 +235,5 @@ construct(secondaryContext, "TestWP2"); runRoundRobin("TestWP1|TestWP1|PRERACE:1,Human", "TestWP2|TestWP2|PRERACE:1,Elf"); - assertTrue(primaryContext.ref.validate()); - assertTrue(secondaryContext.ref.validate()); } } Modified: branches/cdom/code/src/utest/plugin/lsttokens/race/HitDiceAdvancementTokenTest.java =================================================================== --- branches/cdom/code/src/utest/plugin/lsttokens/race/HitDiceAdvancementTokenTest.java 2007-08-23 01:26:32 UTC (rev 3864) +++ branches/cdom/code/src/utest/plugin/lsttokens/race/HitDiceAdvancementTokenTest.java 2007-08-23 01:27:17 UTC (rev 3865) @@ -54,7 +54,7 @@ public void testInvalidEmpty() throws PersistenceLayerException { assertFalse(token.parse(primaryContext, primaryProf, "")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } // @Test @@ -68,63 +68,63 @@ public void testInvalidEmptyValue1() throws PersistenceLayerException { assertFalse(token.parse(primaryContext, primaryProf, ",2,3,4")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test public void testInvalidEmptyValue2() throws PersistenceLayerException { assertFalse(token.parse(primaryContext, primaryProf, "1,,3,4")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test public void testInvalidEmptyValueLast() throws PersistenceLayerException { assertFalse(token.parse(primaryContext, primaryProf, "1,2,3,")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test public void testInvalidNegativeValue() throws PersistenceLayerException { assertFalse(token.parse(primaryContext, primaryProf, "-1,2,3")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test public void testInvalidDecreasingValue() throws PersistenceLayerException { assertFalse(token.parse(primaryContext, primaryProf, "5,3,8")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test public void testInvalidEmbeddedSplat() throws PersistenceLayerException { assertFalse(token.parse(primaryContext, primaryProf, "5,*,8")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test public void testInvalidNaN() throws PersistenceLayerException { assertFalse(token.parse(primaryContext, primaryProf, "5,N")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test public void testInvalidTooMuchSplat() throws PersistenceLayerException { assertFalse(token.parse(primaryContext, primaryProf, "5,8*")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test public void testInvalidTooMuchAfterSplat() throws PersistenceLayerException { assertFalse(token.parse(primaryContext, primaryProf, "5,*8")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test Modified: branches/cdom/code/src/utest/plugin/lsttokens/race/HitDieTokenTest.java =================================================================== --- branches/cdom/code/src/utest/plugin/lsttokens/race/HitDieTokenTest.java 2007-08-23 01:26:32 UTC (rev 3864) +++ branches/cdom/code/src/utest/plugin/lsttokens/race/HitDieTokenTest.java 2007-08-23 01:27:17 UTC (rev 3865) @@ -55,281 +55,275 @@ public void testInvalidInputTooManyLimits() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, - "15|CLASS=Fighter|CLASS.TYPE=Base")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("15|CLASS=Fighter|CLASS.TYPE=Base")); + assertNoSideEffects(); } @Test public void testInvalidInputNotALimit() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, - "15|PRECLASS:1,Fighter")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("15|PRECLASS:1,Fighter")); + assertNoSideEffects(); } @Test public void testInvalidInputEmptyLimit() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "15|CLASS=")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("15|CLASS=")); + assertNoSideEffects(); } @Test public void testInvalidInputEmptyTypeLimit() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, - "15|CLASS.TYPE=")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("15|CLASS.TYPE=")); + assertNoSideEffects(); } @Test public void testInvalidInputStartDotTypeLimit() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, - "15|CLASS.TYPE=.Strange")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("15|CLASS.TYPE=.Strange")); + assertNoSideEffects(); } @Test public void testInvalidInputEndDotTypeLimit() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, - "15|CLASS.TYPE=Strange.")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("15|CLASS.TYPE=Strange.")); + assertNoSideEffects(); } @Test public void testInvalidInputDoubleDotTypeLimit() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, - "15|CLASS.TYPE=Prestige..Strange")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("15|CLASS.TYPE=Prestige..Strange")); + assertNoSideEffects(); } @Test public void testValidInputDivideNegative() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%/-2")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%/-2")); + assertNoSideEffects(); } @Test public void testValidInputDivideZero() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%/0")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%/0")); + assertNoSideEffects(); } @Test public void testValidInputDivide() throws PersistenceLayerException { - assertTrue(getToken().parse(primaryContext, primaryProf, "%/4")); + assertTrue(parse("%/4")); } @Test public void testInvalidInputAddNegative() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%+-3")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%+-3")); + assertNoSideEffects(); } @Test public void testInvalidInputAddZero() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%+0")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%+0")); + assertNoSideEffects(); } @Test public void testValidInputAdd() throws PersistenceLayerException { - assertTrue(getToken().parse(primaryContext, primaryProf, "%+4")); + assertTrue(parse("%+4")); } @Test public void testInvalidInputMultiplyNegative() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%*-3")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%*-3")); + assertNoSideEffects(); } @Test public void testInvalidInputMultiplyZero() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%*0")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%*0")); + assertNoSideEffects(); } @Test public void testValidInputMultiply() throws PersistenceLayerException { - assertTrue(getToken().parse(primaryContext, primaryProf, "%*4")); + assertTrue(parse("%*4")); } @Test public void testInvalidInputSubtractNegative() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%--3")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%--3")); + assertNoSideEffects(); } @Test public void testInvalidInputSubtractZero() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%-0")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%-0")); + assertNoSideEffects(); } @Test public void testValidInputSubtract() throws PersistenceLayerException { - assertTrue(getToken().parse(primaryContext, primaryProf, "%-4")); + assertTrue(parse("%-4")); } @Test public void testInvalidInputUpNegative() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%up-3")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%up-3")); + assertNoSideEffects(); } @Test public void testInvalidInputUpZero() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%up0")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%up0")); + assertNoSideEffects(); } @Test public void testValidInputUp() throws PersistenceLayerException { - assertTrue(getToken().parse(primaryContext, primaryProf, "%up4")); + assertTrue(parse("%up4")); } @Test public void testInvalidInputUpTooBig() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%up5")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%up5")); + assertNoSideEffects(); } @Test public void testInvalidInputUpReallyTooBig() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%up15")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%up15")); + assertNoSideEffects(); } @Test public void testInvalidInputHUpNegative() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%Hup-3")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%Hup-3")); + assertNoSideEffects(); } @Test public void testInvalidInputHUpZero() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%Hup0")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%Hup0")); + assertNoSideEffects(); } @Test public void testValidInputHUp() throws PersistenceLayerException { - assertTrue(getToken().parse(primaryContext, primaryProf, "%Hup4")); + assertTrue(parse("%Hup4")); } @Test public void testInvalidInputDownNegative() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%down-3")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%down-3")); + assertNoSideEffects(); } @Test public void testInvalidInputDownZero() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%down0")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%down0")); + assertNoSideEffects(); } @Test public void testValidInputDown() throws PersistenceLayerException { - assertTrue(getToken().parse(primaryContext, primaryProf, "%down4")); + assertTrue(parse("%down4")); } @Test public void testInvalidInputHdownNegative() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%Hdown-3")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%Hdown-3")); + assertNoSideEffects(); } @Test public void testInvalidInputHdownZero() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%Hdown0")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%Hdown0")); + assertNoSideEffects(); } @Test public void testValidInputHdown() throws PersistenceLayerException { - assertTrue(getToken().parse(primaryContext, primaryProf, "%Hdown4")); + assertTrue(parse("%Hdown4")); } @Test public void testInvalidInputDownTooBig() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%down5")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%down5")); + assertNoSideEffects(); } @Test public void testInvalidInputDownReallyTooBig() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%down15")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%down15")); + assertNoSideEffects(); } @Test public void testInvalidInputNegative() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "-3")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("-3")); + assertNoSideEffects(); } @Test public void testInvalidInputZero() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "0")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("0")); + assertNoSideEffects(); } @Test public void testInvalidInputDecimal() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "3.5")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("3.5")); + assertNoSideEffects(); } @Test public void testInvalidInputMisspell() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "%upn5")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("%upn5")); + assertNoSideEffects(); } @Test Modified: branches/cdom/code/src/utest/plugin/lsttokens/race/MonsterClassTokenTest.java =================================================================== --- branches/cdom/code/src/utest/plugin/lsttokens/race/MonsterClassTokenTest.java 2007-08-23 01:26:32 UTC (rev 3864) +++ branches/cdom/code/src/utest/plugin/lsttokens/race/MonsterClassTokenTest.java 2007-08-23 01:27:17 UTC (rev 3865) @@ -54,44 +54,42 @@ @Test public void testInvalidNoColon() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "Fighter")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("Fighter")); + assertNoSideEffects(); } @Test public void testInvalidTwoColon() throws PersistenceLayerException { - assertFalse(getToken() - .parse(primaryContext, primaryProf, "Fighter:4:1")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("Fighter:4:1")); + assertNoSideEffects(); } @Test public void testInvalidLevelNegative() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "Fighter:-4")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("Fighter:-4")); + assertNoSideEffects(); } @Test public void testInvalidLevelZero() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, "Fighter:0")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("Fighter:0")); + assertNoSideEffects(); } @Test public void testInvalidLevelNaN() throws PersistenceLayerException { - assertFalse(getToken().parse(primaryContext, primaryProf, - "Fighter:Level")); - assertTrue(primaryGraph.isEmpty()); + assertFalse(parse("Fighter:Level")); + assertNoSideEffects(); } @Test public void testBadClass() throws PersistenceLayerException { - assertTrue(getToken().parse(primaryContext, primaryProf, "Fighter:4")); + assertTrue(parse("Fighter:4")); assertFalse(primaryContext.ref.validate()); } Modified: branches/cdom/code/src/utest/plugin/lsttokens/race/SizeTokenTest.java =================================================================== --- branches/cdom/code/src/utest/plugin/lsttokens/race/SizeTokenTest.java 2007-08-23 01:26:32 UTC (rev 3864) +++ branches/cdom/code/src/utest/plugin/lsttokens/race/SizeTokenTest.java 2007-08-23 01:27:17 UTC (rev 3865) @@ -83,7 +83,7 @@ public void testInvalidNotASize() { assertFalse(token.parse(primaryContext, primaryProf, "W")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test Modified: branches/cdom/code/src/utest/plugin/lsttokens/race/StartFeatsTokenTest.java =================================================================== --- branches/cdom/code/src/utest/plugin/lsttokens/race/StartFeatsTokenTest.java 2007-08-23 01:26:32 UTC (rev 3864) +++ branches/cdom/code/src/utest/plugin/lsttokens/race/StartFeatsTokenTest.java 2007-08-23 01:27:17 UTC (rev 3865) @@ -78,35 +78,35 @@ public void testInvalidZero() { assertFalse(token.parse(primaryContext, primaryProf, "0")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test public void testInvalidNegative() { assertFalse(token.parse(primaryContext, primaryProf, "-5")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test public void testInvalidEquation() { assertFalse(token.parse(primaryContext, primaryProf, "1+2")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test public void testInvalidString() { assertFalse(token.parse(primaryContext, primaryProf, "String")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test public void testInvalidDecimal() { assertFalse(token.parse(primaryContext, primaryProf, "4.0")); - assertTrue(primaryGraph.isEmpty()); + assertNoSideEffects(); } @Test This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |