Menu
▾
▴
[pcgen-commit-svn] SF.net SVN: pcgen:[8759] Trunk/pcgen/code/src/test/pcgen/core
|
From: <th...@us...> - 2008-12-31 19:40:55
|
Revision: 8759
http://pcgen.svn.sourceforge.net/pcgen/?rev=8759&view=rev
Author: thpr
Date: 2008-12-31 19:40:49 +0000 (Wed, 31 Dec 2008)
Log Message:
-----------
missing items for test from previous SVN
Modified Paths:
--------------
Trunk/pcgen/code/src/test/pcgen/core/PCClassTest.java
Trunk/pcgen/code/src/test/pcgen/core/PlayerCharacterTest.java
Trunk/pcgen/code/src/test/pcgen/core/bonus/BonusTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/ArmorProfChoiceManagerTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/FeatAddChoiceManagerTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/FeatListChoiceManagerTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/HPChoiceManagerTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/MiscChoiceManagerTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/ProficiencyChoiceManagerTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/SAListChoiceManagerTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillListNonClassChoiceManagerTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillsChoiceManagerTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillsNamedChoiceManagerTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillsNamedToCCSkillChoiceManagerTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillsNamedToCSkillChoiceManagerTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/SpellClassesChoiceManagerTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/SpellLevelChoiceManagerTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/SpellListChoiceManagerTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/SpellsChoiceManagerTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/StatChoiceManagerTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/WeaponFocusChoiceManagerTest.java
Trunk/pcgen/code/src/test/pcgen/core/chooser/WeaponProfChoiceManagerTest.java
Modified: Trunk/pcgen/code/src/test/pcgen/core/PCClassTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/PCClassTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/PCClassTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -38,7 +38,6 @@
import junit.framework.TestSuite;
import pcgen.AbstractCharacterTestCase;
import pcgen.PCGenTestCase;
-import pcgen.base.formula.Formula;
import pcgen.base.lang.UnreachableError;
import pcgen.cdom.base.AssociatedPrereqObject;
import pcgen.cdom.base.CDOMReference;
@@ -266,7 +265,7 @@
final PCClass aNqClass = new PCClass();
aNqClass.setName("NonQualClass");
aNqClass.put(StringKey.KEY_NAME, "KEY_NonQualClass");
- aNqClass.put(VariableKey.getConstant("Foo"), Formula.ONE);
+ aNqClass.put(VariableKey.getConstant("Foo"), FormulaFactory.ONE);
aNqClass.getClassLevel(2).put(VariableKey.getConstant("Foo"),
FormulaFactory.getFormulaFor(2));
@@ -344,7 +343,7 @@
final PCClass aNqClass = new PCClass();
aNqClass.setName("NonQualClass");
aNqClass.put(StringKey.KEY_NAME, "KEY_NonQualClass");
- aNqClass.put(VariableKey.getConstant("Foo"), Formula.ONE);
+ aNqClass.put(VariableKey.getConstant("Foo"), FormulaFactory.ONE);
aNqClass.getClassLevel(2).put(VariableKey.getConstant("Foo"),
FormulaFactory.getFormulaFor(2));
@@ -914,7 +913,7 @@
nqClass = new PCClass();
nqClass.setName("NonQualClass");
nqClass.put(StringKey.KEY_NAME, "KEY_NonQualClass");
- nqClass.put(VariableKey.getConstant("Foo"), Formula.ONE);
+ nqClass.put(VariableKey.getConstant("Foo"), FormulaFactory.ONE);
nqClass.getClassLevel(2).put(VariableKey.getConstant("Foo"),
FormulaFactory.getFormulaFor(2));
}
Modified: Trunk/pcgen/code/src/test/pcgen/core/PlayerCharacterTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/PlayerCharacterTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/PlayerCharacterTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -38,7 +38,6 @@
import junit.framework.TestSuite;
import junit.textui.TestRunner;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
import pcgen.cdom.base.CDOMReference;
import pcgen.cdom.base.Constants;
import pcgen.cdom.base.FormulaFactory;
@@ -348,12 +347,12 @@
{
//Logging.setDebugMode(true);
Logging.debugPrint("\n\n\ntestGetVariableValue1()");
- giantRace.put(VariableKey.getConstant("GiantVar1"), Formula.ZERO);
+ giantRace.put(VariableKey.getConstant("GiantVar1"), FormulaFactory.ZERO);
final BonusObj raceBonus = Bonus.newBonus("1|VAR|GiantVar1|7+HD");
giantClass.addToListFor(ListKey.BONUS, raceBonus);
giantClass.getClassLevel(1).put(VariableKey.getConstant("GiantClass1"),
- Formula.ZERO);
+ FormulaFactory.ZERO);
final BonusObj babClassBonus =
Bonus.newBonus("1|VAR|GiantClass1|CL=Giant");
giantClass.addToListFor(ListKey.BONUS, babClassBonus);
Modified: Trunk/pcgen/code/src/test/pcgen/core/bonus/BonusTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/bonus/BonusTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/bonus/BonusTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -27,7 +27,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.ListKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.cdom.enumeration.Type;
@@ -127,7 +127,7 @@
Globals.setCurrentPC(pc);
// Create a variable
- dummyFeat.put(VariableKey.getConstant("NegLevels"), Formula.ZERO);
+ dummyFeat.put(VariableKey.getConstant("NegLevels"), FormulaFactory.ZERO);
// Create a bonus to it
Ability dummyFeat2 = new Ability();
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/ArmorProfChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/ArmorProfChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/ArmorProfChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -30,7 +30,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.Equipment;
@@ -64,7 +64,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "ARMORPROF|TYPE=Light");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING), strEq("ARMORPROF|TYPE=Light"));
PlayerCharacter aPC = getCharacter();
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/FeatAddChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/FeatAddChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/FeatAddChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -29,7 +29,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.PObject;
@@ -61,7 +61,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "FEATADD|choice");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING), strEq("FEATADD|choice"));
PlayerCharacter aPC = getCharacter();
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/FeatListChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/FeatListChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/FeatListChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -29,7 +29,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.PObject;
@@ -61,7 +61,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "FEATLIST|Wellie Throwing|Sheep Shearing|Synchronised Mincing");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(
pObj.getSafe(StringKey.CHOICE_STRING),
strEq("FEATLIST|Wellie Throwing|Sheep Shearing|Synchronised Mincing"));
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/HPChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/HPChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/HPChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -29,7 +29,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.PObject;
@@ -61,7 +61,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "HP|Foo|Bar|Baz");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING), strEq("HP|Foo|Bar|Baz"));
PlayerCharacter aPC = getCharacter();
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/MiscChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/MiscChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/MiscChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -31,7 +31,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.PObject;
@@ -63,7 +63,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "Foo|Bar|Baz");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING), strEq("Foo|Bar|Baz"));
PlayerCharacter aPC = getCharacter();
@@ -104,7 +104,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "Foo|Bar|Baz");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING), strEq("Foo|Bar|Baz"));
PlayerCharacter aPC = getCharacter();
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/ProficiencyChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/ProficiencyChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/ProficiencyChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -29,7 +29,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.PObject;
@@ -61,7 +61,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "PROFICIENCY|WEAPON|UNIQUE|TYPE=Martial");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING),
strEq("PROFICIENCY|WEAPON|UNIQUE|TYPE=Martial"));
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/SAListChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/SAListChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/SAListChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -29,7 +29,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.PObject;
@@ -61,7 +61,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "SALIST|Foo|Bar|Baz");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING), strEq("SALIST|Foo|Bar|Baz"));
PlayerCharacter aPC = getCharacter();
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillListNonClassChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillListNonClassChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillListNonClassChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -29,7 +29,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.PObject;
@@ -62,7 +62,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "NONCLASSSKILLLIST|Foo,Bar,Baz,Qux");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING),
strEq("NONCLASSSKILLLIST|Foo,Bar,Baz,Qux"));
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillsChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillsChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillsChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -29,7 +29,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.PObject;
@@ -61,7 +61,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "SKILLS|Foo|Bar|Baz");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING), strEq("SKILLS|Foo|Bar|Baz"));
PlayerCharacter aPC = getCharacter();
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillsNamedChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillsNamedChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillsNamedChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -29,7 +29,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.PObject;
@@ -61,7 +61,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "SKILLSNAMED|Foo|Bar|Baz");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING),
strEq("SKILLSNAMED|Foo|Bar|Baz"));
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillsNamedToCCSkillChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillsNamedToCCSkillChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillsNamedToCCSkillChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -29,7 +29,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.PObject;
@@ -62,7 +62,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "SKILLSNAMEDTOCCSKILL|Foo|Bar|Baz");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING),
strEq("SKILLSNAMEDTOCCSKILL|Foo|Bar|Baz"));
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillsNamedToCSkillChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillsNamedToCSkillChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/SkillsNamedToCSkillChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -29,7 +29,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.PObject;
@@ -62,7 +62,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "SKILLSNAMEDTOCSKILL|Foo|Bar|Baz");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING),
strEq("SKILLSNAMEDTOCSKILL|Foo|Bar|Baz"));
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/SpellClassesChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/SpellClassesChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/SpellClassesChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -29,7 +29,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.PObject;
@@ -61,7 +61,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "SPELLCLASSES|Foo|Bar|Baz");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING),
strEq("SPELLCLASSES|Foo|Bar|Baz"));
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/SpellLevelChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/SpellLevelChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/SpellLevelChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -29,7 +29,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.PObject;
@@ -62,7 +62,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "SPELLLEVEL|Foo|Bar|Baz");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING), strEq("SPELLLEVEL|Foo|Bar|Baz"));
PlayerCharacter aPC = getCharacter();
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/SpellListChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/SpellListChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/SpellListChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -29,7 +29,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.PObject;
@@ -61,7 +61,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "SPELLLIST|Foo|Bar|Baz");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING), strEq("SPELLLIST|Foo|Bar|Baz"));
PlayerCharacter aPC = getCharacter();
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/SpellsChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/SpellsChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/SpellsChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -29,7 +29,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.PObject;
@@ -61,7 +61,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "SPELLS|Foo|Bar|Baz");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING), strEq("SPELLS|Foo|Bar|Baz"));
PlayerCharacter aPC = getCharacter();
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/StatChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/StatChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/StatChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -29,7 +29,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.PObject;
@@ -61,7 +61,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "STAT|Foo|Bar|Baz");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING), strEq("STAT|Foo|Bar|Baz"));
PlayerCharacter aPC = getCharacter();
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/WeaponFocusChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/WeaponFocusChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/WeaponFocusChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -29,7 +29,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.PObject;
@@ -61,7 +61,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "WEAPONFOCUS|Foo");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING),
strEq("WEAPONFOCUS|Foo"));
Modified: Trunk/pcgen/code/src/test/pcgen/core/chooser/WeaponProfChoiceManagerTest.java
===================================================================
--- Trunk/pcgen/code/src/test/pcgen/core/chooser/WeaponProfChoiceManagerTest.java 2008-12-31 18:51:51 UTC (rev 8758)
+++ Trunk/pcgen/code/src/test/pcgen/core/chooser/WeaponProfChoiceManagerTest.java 2008-12-31 19:40:49 UTC (rev 8759)
@@ -29,7 +29,7 @@
import java.util.List;
import pcgen.AbstractCharacterTestCase;
-import pcgen.base.formula.Formula;
+import pcgen.cdom.base.FormulaFactory;
import pcgen.cdom.enumeration.FormulaKey;
import pcgen.cdom.enumeration.StringKey;
import pcgen.core.PObject;
@@ -61,7 +61,7 @@
PObject pObj = new PObject();
pObj.setName("My PObject");
pObj.put(StringKey.CHOICE_STRING, "WEAPONPROFS|Foo|Bar|Baz");
- pObj.put(FormulaKey.NUMCHOICES, Formula.ONE);
+ pObj.put(FormulaKey.NUMCHOICES, FormulaFactory.ONE);
is(pObj.getSafe(StringKey.CHOICE_STRING),
strEq("WEAPONPROFS|Foo|Bar|Baz"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
