Skip to content

Commit 216ae03

Browse files
made code changes
1 parent be66a43 commit 216ae03

File tree

5 files changed

+25
-7
lines changed

5 files changed

+25
-7
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":802:{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:4;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:12:{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.031;s:28:"GameTest::testSkillsFunction";d:0.027;s:26:"GameTest::testLogsMessages";d:0.03;s:21:"MonsterTest::testHero";d:0;s:27:"MonsterTest::testHeroUpdate";d:0;s:24:"MonsterTest::testMonster";d:0;s:30:"MonsterTest::testMonsterUpdate";d:0;s:28:"HeroTest::testSkillsFunction";d:0.002;}}}
1+
C:30:"PHPUnit\Runner\TestResultCache":1048:{a:2:{s:7:"defects";a:12:{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:4;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:28:"MonsterTest::testLogInstance";i:4;s:27:"LoggerTest::testLogInstance";i:4;s:25:"GameTest::testMonsterCall";i:5;}s:5:"times";a:15:{s:7:"Warning";d:0.008;s:17:"HeroTest::testOne";d:0.008;s:18:"HeroTest::testHero";d:0.114;s:24:"HeroTest::testHeroUpdate";d:0;s:31:"GameTest::testFirstTurnFunction";d:0.035;s:28:"GameTest::testSkillsFunction";d:0.027;s:26:"GameTest::testLogsMessages";d:0.014;s:21:"MonsterTest::testHero";d:0;s:27:"MonsterTest::testHeroUpdate";d:0;s:24:"MonsterTest::testMonster";d:0;s:30:"MonsterTest::testMonsterUpdate";d:0;s:28:"HeroTest::testSkillsFunction";d:0.846;s:28:"MonsterTest::testLogInstance";d:0.035;s:27:"LoggerTest::testLogInstance";d:0.005;s:25:"GameTest::testMonsterCall";d:0.013;}}}

class/gameEngineClass.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@ public function __construct()
1313

1414
public function hero()
1515
{
16-
$buildHero = new PlayerFactory;
17-
return $buildHero->createPlayer('hero');
16+
$build_hero = new PlayerFactory;
17+
return $build_hero->createPlayer('hero');
1818
}
1919

2020
public function monster()
2121
{
22-
// $monsterEncounter = (new DataBase)->runQuery('SELECT `id` FROM `monster` ORDER BY RAND() LIMIT 0,1;');
23-
$monsterEncounter = (new DataBase)->runQuery('SELECT `id` FROM `monster` where id = 1');
24-
$buildMonster = new PlayerFactory;
25-
return $buildMonster->createPlayer('monster', $monsterEncounter[0]['id']);
22+
$build_monster = new PlayerFactory;
23+
return $build_monster->createPlayer('monster');
2624
}
2725

2826
public function figth($hero, $monster, $turn, $turnCounter = 1, $log_pass = '')

class/playerFactory.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ public function createPlayer($player, $player_id=1)
77
$player_obj = new Hero();
88
} elseif ($player === "monster") {
99
$player_obj = new Monster();
10+
$monster_encounter = (new DataBase)->runQuery('SELECT `id` FROM `monster` ORDER BY RAND() LIMIT 0,1;'); // for random id's
11+
$player_id = $monster_encounter[0]['id'];
1012
}
1113

1214
$player_obj = $this->getDBResults($player_obj, $player, $player_id);

tests/GameTest.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,9 @@ public function testLogsMessages()
5959
$results = $engine->figth($this->populateHero(), $this->populateMonster(), [], 1, Logger::getInstance());
6060
$this->assertStringContainsString('Damage', $results[5]->getLog());
6161
}
62+
63+
public function testMonsterCall(){
64+
$engine = new engine;
65+
var_dump($engine->monster());
66+
}
6267
}

tests/LoggerTest.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
include_once 'class/logger.php';
3+
4+
use PHPUnit\Framework\TestCase;
5+
6+
final class LoggerTest extends TestCase
7+
{
8+
public function testLogInstance(){
9+
$log = new Logger;
10+
$this->assertNotNull($log->getLog());
11+
}
12+
}
13+
?>

0 commit comments

Comments
 (0)