Skip to content

Commit 28b4e5d

Browse files
committed
Remove useless code
1 parent 4fb494a commit 28b4e5d

6 files changed

+22
-85
lines changed

Diff for: test/Asset/CgiExerciseInterface.php

-10
This file was deleted.

Diff for: test/Asset/CliExerciseImpl.php

+7-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
class CliExerciseImpl implements ExerciseInterface, CliExercise
1313
{
1414
private string $name;
15+
private string $problemFile = 'problem-file.md';
1516
private SolutionInterface $solution;
1617
private CliScenario $scenario;
1718

@@ -43,7 +44,12 @@ public function getSolution(): SolutionInterface
4344

4445
public function getProblem(): string
4546
{
46-
// TODO: Implement getProblem() method.
47+
return $this->problemFile;
48+
}
49+
50+
public function setProblem(string $problemFile): void
51+
{
52+
$this->problemFile = $problemFile;
4753
}
4854

4955
public function tearDown(): void

Diff for: test/Asset/CliExerciseInterface.php

-10
This file was deleted.

Diff for: test/Asset/DatabaseExerciseInterface.php

-11
This file was deleted.

Diff for: test/Command/PrintCommandTest.php

+4-15
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
namespace PhpSchool\PhpWorkshopTest\Command;
44

55
use PhpSchool\PhpWorkshop\Command\PrintCommand;
6-
use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
76
use PhpSchool\PhpWorkshop\UserState\UserState;
8-
use PhpSchool\PhpWorkshopTest\Asset\CliExerciseInterface;
7+
use PhpSchool\PhpWorkshopTest\Asset\CliExerciseImpl;
98
use PHPUnit\Framework\TestCase;
109
use PhpSchool\PhpWorkshop\ExerciseRepository;
1110
use PhpSchool\PhpWorkshop\MarkdownRenderer;
@@ -18,23 +17,13 @@ public function testExerciseIsPrintedIfAssigned(): void
1817
$file = tempnam(sys_get_temp_dir(), 'pws');
1918
file_put_contents($file, '### Exercise 1');
2019

21-
$exercise = $this->createMock(CliExerciseInterface::class);
22-
$exercise
23-
->method('getProblem')
24-
->willReturn($file);
25-
26-
$exercise
27-
->method('getType')
28-
->willReturn(ExerciseType::CLI());
29-
30-
$exercise
31-
->method('getName')
32-
->willReturn('some-exercise');
20+
$exercise = new CliExerciseImpl();
21+
$exercise->setProblem($file);
3322

3423
$repo = new ExerciseRepository([$exercise]);
3524

3625
$state = new UserState();
37-
$state->setCurrentExercise('some-exercise');
26+
$state->setCurrentExercise('my-exercise');
3827

3928
$output = $this->createMock(OutputInterface::class);
4029
$renderer = $this->createMock(MarkdownRenderer::class);

Diff for: test/UserState/LocalJsonSerializerTest.php

+11-38
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,18 @@
88
use PhpSchool\PhpWorkshop\UserState\UserState;
99
use PhpSchool\PhpWorkshop\Utils\Path;
1010
use PhpSchool\PhpWorkshop\Utils\System;
11-
use PhpSchool\PhpWorkshopTest\Asset\CliExerciseInterface;
11+
use PhpSchool\PhpWorkshopTest\Asset\CliExerciseImpl;
1212
use PhpSchool\PhpWorkshopTest\BaseTest;
1313
use Yoast\PHPUnitPolyfills\Polyfills\AssertionRenames;
1414

1515
class LocalJsonSerializerTest extends BaseTest
1616
{
1717
use AssertionRenames;
1818

19-
/**
20-
* @var string
21-
*/
22-
private $tmpDir;
23-
24-
/**
25-
* @var string
26-
*/
27-
private $tmpFile;
28-
29-
/**
30-
* @var string
31-
*/
32-
private $workshopName = 'My Workshop';
33-
34-
/**
35-
* @var ExerciseRepository
36-
*/
37-
private $exerciseRepository;
19+
private string $tmpDir;
20+
private string $tmpFile;
21+
private string $workshopName = 'My Workshop';
22+
private ExerciseRepository $exerciseRepository;
3823

3924
public function setUp(): void
4025
{
@@ -201,12 +186,8 @@ public function deserializerProvider(): array
201186

202187
public function testOldDataWillBeMigratedWhenInCorrectWorkshop(): void
203188
{
204-
$exercise1 = $this->createMock(CliExerciseInterface::class);
205-
$exercise2 = $this->createMock(CliExerciseInterface::class);
206-
$exercise1->method('getType')->willReturn(ExerciseType::CLI());
207-
$exercise2->method('getType')->willReturn(ExerciseType::CLI());
208-
$exercise1->method('getName')->willReturn('Exercise 1');
209-
$exercise2->method('getName')->willReturn('Exercise 2');
189+
$exercise1 = new CliExerciseImpl('Exercise 1');
190+
$exercise2 = new CliExerciseImpl('Exercise 2');
210191

211192
$oldData = [
212193
'current_exercise' => 'Exercise 3',
@@ -246,12 +227,8 @@ public function testOldDataWillBeMigratedWhenInCorrectWorkshop(): void
246227

247228
public function testOldDataWillNotBeMigratedWhenNotInCorrectWorkshop(): void
248229
{
249-
$exercise1 = $this->createMock(CliExerciseInterface::class);
250-
$exercise2 = $this->createMock(CliExerciseInterface::class);
251-
$exercise1->method('getType')->willReturn(ExerciseType::CLI());
252-
$exercise2->method('getType')->willReturn(ExerciseType::CLI());
253-
$exercise1->method('getName')->willReturn('Exercise 1');
254-
$exercise2->method('getName')->willReturn('Exercise 2');
230+
$exercise1 = new CliExerciseImpl('Exercise 1');
231+
$exercise2 = new CliExerciseImpl('Exercise 2');
255232

256233
$exercises = [
257234
$exercise1,
@@ -279,12 +256,8 @@ public function testOldDataWillNotBeMigratedWhenNotInCorrectWorkshop(): void
279256

280257
public function testOldDataWillNotBeMigratedWhenNotInCorrectWorkshopWithOtherWorkshop(): void
281258
{
282-
$exercise1 = $this->createMock(CliExerciseInterface::class);
283-
$exercise2 = $this->createMock(CliExerciseInterface::class);
284-
$exercise1->method('getType')->willReturn(ExerciseType::CLI());
285-
$exercise2->method('getType')->willReturn(ExerciseType::CLI());
286-
$exercise1->method('getName')->willReturn('Exercise 1');
287-
$exercise2->method('getName')->willReturn('Exercise 2');
259+
$exercise1 = new CliExerciseImpl('Exercise 1');
260+
$exercise2 = new CliExerciseImpl('Exercise 2');
288261

289262
$oldData = [
290263
'current_exercise' => 'Exercise 3',

0 commit comments

Comments
 (0)