Skip to content

Commit fb49e3e

Browse files
LunguGeorgeProgramatorLunguGeorgeProgramator
committed
updated tests
1 parent f7c3721 commit fb49e3e

File tree

10 files changed

+59
-38
lines changed

10 files changed

+59
-38
lines changed

‎.phpunit.result.cache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
C:30:"PHPUnit\Runner\TestResultCache":567:{a:2:{s:7:"defects";a:6:{s:7:"Warning";i:6;s:17:"HeroTest::testOne";i:3;s:18:"HeroTest::testHero";i:4;s:31:"GameTest::testFirstTurnFunction";i:5;s:28:"GameTest::testSkillsFunction";i:3;s:26:"GameTest::testLogsMessages";i:3;}s:5:"times";a:9:{s:7:"Warning";d:0.008;s:17:"HeroTest::testOne";d:0.008;s:18:"HeroTest::testHero";d:0;s:24:"HeroTest::testHeroUpdate";d:0;s:31:"GameTest::testFirstTurnFunction";d:0.015;s:28:"GameTest::testSkillsFunction";d:0.02;s:26:"GameTest::testLogsMessages";d:0.009;s:21:"MonsterTest::testHero";d:0;s:27:"MonsterTest::testHeroUpdate";d:0;}}}
1+
C:30:"PHPUnit\Runner\TestResultCache":680:{a:2:{s:7:"defects";a:9:{s:7:"Warning";i:6;s:17:"HeroTest::testOne";i:3;s:18:"HeroTest::testHero";i:4;s:31:"GameTest::testFirstTurnFunction";i:4;s:28:"GameTest::testSkillsFunction";i:3;s:26:"GameTest::testLogsMessages";i:4;s:24:"HeroTest::testHeroUpdate";i:4;s:21:"MonsterTest::testHero";i:4;s:27:"MonsterTest::testHeroUpdate";i:4;}s:5:"times";a:9:{s:7:"Warning";d:0.008;s:17:"HeroTest::testOne";d:0.008;s:18:"HeroTest::testHero";d:0.001;s:24:"HeroTest::testHeroUpdate";d:0;s:31:"GameTest::testFirstTurnFunction";d:0.044;s:28:"GameTest::testSkillsFunction";d:0.009;s:26:"GameTest::testLogsMessages";d:0.019;s:21:"MonsterTest::testHero";d:0;s:27:"MonsterTest::testHeroUpdate";d:0;}}}

‎database.php‎ renamed to ‎class/database.php‎

File renamed without changes.

‎gameEngineClass.php‎ renamed to ‎class/gameEngineClass.php‎

File renamed without changes.

‎hero.php‎ renamed to ‎class/hero.php‎

File renamed without changes.

‎logger.php‎ renamed to ‎class/logger.php‎

File renamed without changes.

‎monster.php‎ renamed to ‎class/monster.php‎

File renamed without changes.

‎index.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<LINK REL=StyleSheet HREF="custom.css" TITLE="Contemporary">
22
<?php
3-
include 'database.php';
4-
include 'hero.php';
5-
include 'monster.php';
6-
include 'gameEngineClass.php';
7-
include 'logger.php';
3+
include 'class/database.php';
4+
include 'class/hero.php';
5+
include 'class/monster.php';
6+
include 'class/gameEngineClass.php';
7+
include 'class/logger.php';
88
session_start();
99
// session_destroy();
1010
?>

‎tests/GameTest.php‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
11
<?php
22

3-
include_once 'database.php';
4-
include_once 'hero.php';
5-
include_once 'monster.php';
6-
include_once 'gameEngineClass.php';
3+
include_once 'class/database.php';
4+
include_once 'class/hero.php';
5+
include_once 'class/monster.php';
6+
include_once 'class/gameEngineClass.php';
7+
include_once 'class/logger.php';
78

89
use PHPUnit\Framework\TestCase;
910

1011
final class GameTest extends TestCase
1112
{
1213

1314
private function populateHero(){
14-
return new Hero(1, 2, 333, 'XXXX', 12, 32, 54, 23, 1);
15+
$hero = new Hero();
16+
$hero->setId(1);
17+
$hero->setLevel(5);
18+
$hero->setExperience(333);
19+
$hero->setName('XXXX');
20+
$hero->setHealth(12);
21+
$hero->setStrength(32);
22+
$hero->setDefence(54);
23+
$hero->setSpeed(23);
24+
$hero->setLuck(1);
25+
return $hero;
1526
}
1627

1728
private function populateMonster(){
@@ -41,8 +52,8 @@ function testSkillsFunction(){
4152

4253
function testLogsMessages(){
4354
$engine = new engine;
44-
$results = $engine->figth($this->populateHero(), $this->populateMonster(), [], '', 1);
45-
$this->assertStringContainsString('Damage', $results[4]);
55+
$results = $engine->figth($this->populateHero(), $this->populateMonster(), [], 1, Logger::getInstance());
56+
$this->assertStringContainsString('Damage', $results[5]->getLog());
4657

4758
}
4859

‎tests/HeroTest.php‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
11
<?php
22

3-
include_once 'hero.php';
3+
include_once 'class/hero.php';
44

55
use PHPUnit\Framework\TestCase;
66

77
final class HeroTest extends TestCase
88
{
99
private function populateHero(){
10-
return new Hero(1, 2, 333, 'XXXX', 12, 32, 54, 23, 1);
10+
$hero = new Hero();
11+
$hero->setId(1);
12+
$hero->setLevel(2);
13+
$hero->setExperience(333);
14+
$hero->setName('XXXX');
15+
$hero->setHealth(12);
16+
$hero->setStrength(32);
17+
$hero->setDefence(54);
18+
$hero->setSpeed(23);
19+
$hero->setLuck(1);
20+
return $hero;
1121
}
1222

1323
public function testHero()
@@ -16,15 +26,15 @@ public function testHero()
1626

1727
$this->assertInstanceOf(Hero::class, $hero);
1828

19-
$this->assertSame($hero->id, 1);
20-
$this->assertSame($hero->level, 2);
21-
$this->assertSame($hero->experience, 333);
22-
$this->assertSame($hero->name, 'XXXX');
23-
$this->assertSame($hero->health, 12);
24-
$this->assertSame($hero->strength, 32);
25-
$this->assertSame($hero->defence, 54);
26-
$this->assertSame($hero->speed, 23);
27-
$this->assertSame($hero->luck, 1);
29+
$this->assertSame($hero->getId(), 1);
30+
$this->assertSame($hero->getLevel(), 2);
31+
$this->assertSame($hero->getExperience(), 333);
32+
$this->assertSame($hero->getName(), 'XXXX');
33+
$this->assertSame($hero->getHealth(), 12);
34+
$this->assertSame($hero->getStrength(), 32);
35+
$this->assertSame($hero->getDefence(), 54);
36+
$this->assertSame($hero->getSpeed(), 23);
37+
$this->assertSame($hero->getLuck(), 1);
2838
$this->assertNotEmpty($hero);
2939
}
3040

@@ -34,8 +44,8 @@ public function testHeroUpdate()
3444
$hero->setName('YYY');
3545
$hero->setLevel(5);
3646

37-
$this->assertSame($hero->level, 5);
38-
$this->assertSame($hero->name, 'YYY');
47+
$this->assertSame($hero->getLevel(), 5);
48+
$this->assertSame($hero->getName(), 'YYY');
3949
}
4050

4151
}

‎tests/MonsterTest.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
include_once 'monster.php';
3+
include_once 'class/monster.php';
44

55
use PHPUnit\Framework\TestCase;
66

@@ -16,15 +16,15 @@ function testHero()
1616

1717
$this->assertInstanceOf(Monster::class, $monster);
1818

19-
$this->assertSame($monster->id, 1);
20-
$this->assertSame($monster->level, 2);
21-
$this->assertSame($monster->experience, 333);
22-
$this->assertSame($monster->name, 'ttt');
23-
$this->assertSame($monster->health, 12);
24-
$this->assertSame($monster->strength, 32);
25-
$this->assertSame($monster->defence, 54);
26-
$this->assertSame($monster->speed, 23);
27-
$this->assertSame($monster->luck, 1);
19+
$this->assertSame($monster->getId(), 1);
20+
$this->assertSame($monster->getLevel(), 2);
21+
$this->assertSame($monster->getExperience(), 333);
22+
$this->assertSame($monster->getName(), 'ttt');
23+
$this->assertSame($monster->getHealth(), 12);
24+
$this->assertSame($monster->getStrength(), 32);
25+
$this->assertSame($monster->getDefence(), 54);
26+
$this->assertSame($monster->getSpeed(), 23);
27+
$this->assertSame($monster->getLuck(), 1);
2828
$this->assertNotEmpty($monster);
2929
}
3030

@@ -34,8 +34,8 @@ function testHeroUpdate()
3434
$monster->setName('BUC');
3535
$monster->setLevel(5);
3636

37-
$this->assertSame($monster->level, 5);
38-
$this->assertSame($monster->name, 'BUC');
37+
$this->assertSame($monster->getLevel(), 5);
38+
$this->assertSame($monster->getName(), 'BUC');
3939
}
4040

4141
}

0 commit comments

Comments
 (0)