[ogs-changes] dist/c++/test AbilitiesTest.cpp,1.1,1.2 CombatTest01.cpp,1.3,1.4 ModifiersTest.cpp,1.1,1.2

[<ele...@us...>]

Update of /cvsroot/ogs/dist/c++/test
In directory sc8-pr-cvs1:/tmp/cvs-serv10658

Modified Files:
	AbilitiesTest.cpp CombatTest01.cpp ModifiersTest.cpp 
Log Message:
See C++ ChangeLog (Apr 13) for details.


Index: AbilitiesTest.cpp
===================================================================
RCS file: /cvsroot/ogs/dist/c++/test/AbilitiesTest.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbilitiesTest.cpp	8 Apr 2003 21:43:15 -0000	1.1
--- AbilitiesTest.cpp	13 Apr 2003 05:31:13 -0000	1.2
***************
*** 199,204 ****
    Abilities::PartialMethod::Value cha (Ability::CHA, 15);
    Abilities::PartialMethod::Value values [] = { dex, intl, wis, cha };
! /*
!   Abilities::PartialMethod partialMethod (& values [0], & values [3]);
    Abilities wraithAbilities (partialMethod);
  
--- 199,203 ----
    Abilities::PartialMethod::Value cha (Ability::CHA, 15);
    Abilities::PartialMethod::Value values [] = { dex, intl, wis, cha };
!   Abilities::PartialMethod partialMethod (& values [0], & values [4]);
    Abilities wraithAbilities (partialMethod);
  
***************
*** 213,217 ****
    assert (wraithAbilities [Ability::CHA]);
    assert (wraithAbilities [Ability::CHA]->getCurrentScore () == 15);
! */
    cout << endl;
  }
--- 212,228 ----
    assert (wraithAbilities [Ability::CHA]);
    assert (wraithAbilities [Ability::CHA]->getCurrentScore () == 15);
! 
!   Abilities abilitiesCopy (wraithAbilities);
!   assert (! abilitiesCopy [Ability::STR]);
!   assert (abilitiesCopy [Ability::DEX]);
!   assert (abilitiesCopy [Ability::DEX]->getCurrentScore () == 16);
!   assert (! abilitiesCopy [Ability::CON]);
!   assert (abilitiesCopy [Ability::INT]);
!   assert (abilitiesCopy [Ability::INT]->getCurrentScore () == 14);
!   assert (abilitiesCopy [Ability::WIS]);
!   assert (abilitiesCopy [Ability::WIS]->getCurrentScore () == 14);
!   assert (abilitiesCopy [Ability::CHA]);
!   assert (abilitiesCopy [Ability::CHA]->getCurrentScore () == 15);
! 
    cout << endl;
  }

Index: CombatTest01.cpp
===================================================================
RCS file: /cvsroot/ogs/dist/c++/test/CombatTest01.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CombatTest01.cpp	29 Mar 2003 02:31:34 -0000	1.3
--- CombatTest01.cpp	13 Apr 2003 05:31:14 -0000	1.4
***************
*** 31,35 ****
  #include <ogs/creatures/humanoids/Human.h>
  #include <ogs/cclasses/Fighter.h>
! //#include <ogs/items/Dagger.h>
  #include <ogs/core/Character.h>
  
--- 31,35 ----
  #include <ogs/creatures/humanoids/Human.h>
  #include <ogs/cclasses/Fighter.h>
! //#include <ogs/items/weapons/Dagger.h>
  #include <ogs/core/Character.h>
  
***************
*** 137,142 ****
   */
  void revive (Creature& c1, Creature& c2) {
!   c1.setCurrentHealth (c1.getMaximumHealth ());
!   c2.setCurrentHealth (c2.getMaximumHealth ());
  }
  
--- 137,147 ----
   */
  void revive (Creature& c1, Creature& c2) {
!   Entity::Health health = c1.getHealth ();
!   health.first = health.second;
!   c1.setHealth (health);
! 
!   health = c2.getHealth ();
!   health.first = health.second;
!   c2.setHealth (health);
  }
  

Index: ModifiersTest.cpp
===================================================================
RCS file: /cvsroot/ogs/dist/c++/test/ModifiersTest.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ModifiersTest.cpp	8 Apr 2003 21:43:18 -0000	1.1
--- ModifiersTest.cpp	13 Apr 2003 05:31:14 -0000	1.2
***************
*** 166,169 ****
--- 166,173 ----
  }
  
+ void testDefense () {
+   // TODO: Add some Defense tests.
+ }
+ 
  /**
   * Run various tests on modifiers.
***************
*** 176,179 ****
--- 180,184 ----
    testModifier ();
    testModifiers ();
+   testDefense ();
  
    cout << "END: " TEST_DRIVER "\n";