Skip to content

Commit da7afd8

Browse files
krulis-martinkrulis-martin
committed
Fixing tests.
1 parent 2319314 commit da7afd8

3 files changed

Lines changed: 111 additions & 53 deletions

File tree

‎tests/Console/ListExamEvents.phpt‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use App\Model\Repository\Users;
1010
use App\Model\Repository\Groups;
1111
use App\Model\Repository\GroupExams;
1212
use App\Model\Repository\GroupExamLocks;
13+
use App\Model\GroupExamLockType;
1314
use Doctrine\ORM\EntityManagerInterface;
1415
use Tester\Assert;
1516

@@ -102,7 +103,12 @@ class ListExamEventsTest extends Tester\TestCase
102103
$now = (new DateTime())->getTimestamp();
103104
$begin = $now - 3600;
104105
$end = $now - 1800;
105-
$exam = new GroupExam($group, DateTime::createFromFormat('U', $begin), DateTime::createFromFormat('U', $end), true);
106+
$exam = new GroupExam(
107+
$group,
108+
DateTime::createFromFormat('U', $begin),
109+
DateTime::createFromFormat('U', $end),
110+
GroupExamLockType::Restricted
111+
);
106112
$this->exams->persist($exam);
107113

108114
$lock = new GroupExamLock($exam, $user, '127.0.0.1');
@@ -143,7 +149,7 @@ class ListExamEventsTest extends Tester\TestCase
143149
$group,
144150
DateTime::createFromFormat('U', $now - 100000),
145151
DateTime::createFromFormat('U', $now - 98000),
146-
true
152+
GroupExamLockType::Restricted
147153
);
148154
$this->exams->persist($exam);
149155
$lock = new GroupExamLock($exam, $user, '127.0.0.1');
@@ -155,7 +161,7 @@ class ListExamEventsTest extends Tester\TestCase
155161
$group,
156162
DateTime::createFromFormat('U', $now - 3000),
157163
DateTime::createFromFormat('U', $now),
158-
true
164+
GroupExamLockType::Restricted
159165
);
160166
$this->exams->persist($exam);
161167
$lock = new GroupExamLock($exam, $user, '127.0.0.1');
@@ -167,7 +173,7 @@ class ListExamEventsTest extends Tester\TestCase
167173
$group,
168174
DateTime::createFromFormat('U', $now - 7200),
169175
DateTime::createFromFormat('U', $now - 3600),
170-
true
176+
GroupExamLockType::Restricted
171177
);
172178
$this->exams->persist($exam);
173179
$lock = new GroupExamLock($exam, $user, '127.0.0.1');

‎tests/Presenters/GroupsPresenter.phpt‎

Lines changed: 71 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use App\Model\Entity\GroupExamLock;
1010
use App\Model\Entity\Instance;
1111
use App\Model\Entity\User;
1212
use App\Model\Repository\Users;
13+
use App\Model\GroupExamLockType;
1314
use App\Helpers\FileStorageManager;
1415
use App\Helpers\TmpFilesHelper;
1516
use App\Helpers\FileStorage\LocalFileStorage;
@@ -1464,7 +1465,7 @@ class TestGroupsPresenter extends Tester\TestCase
14641465
'V1:Groups',
14651466
'POST',
14661467
['action' => 'setExamPeriod', 'id' => $group->getId()],
1467-
['begin' => $begin, 'end' => $end, 'strict' => true]
1468+
['begin' => $begin, 'end' => $end, 'type' => 'restricted']
14681469
);
14691470

14701471
Assert::equal($group->getId(), $payload['id']);
@@ -1493,7 +1494,7 @@ class TestGroupsPresenter extends Tester\TestCase
14931494
'V1:Groups',
14941495
'POST',
14951496
['action' => 'setExamPeriod', 'id' => $group->getId()],
1496-
['begin' => $begin, 'end' => $end, 'strict' => true]
1497+
['begin' => $begin, 'end' => $end, 'type' => 'restricted']
14971498
);
14981499
},
14991500
BadRequestException::class
@@ -1507,7 +1508,11 @@ class TestGroupsPresenter extends Tester\TestCase
15071508
$now = (new DateTime())->getTimestamp();
15081509
$begin = $now + 3600;
15091510
$end = $now + 7200;
1510-
$group->setExamPeriod(DateTime::createFromFormat('U', $begin), DateTime::createFromFormat('U', $end), true);
1511+
$group->setExamPeriod(
1512+
DateTime::createFromFormat('U', $begin),
1513+
DateTime::createFromFormat('U', $end),
1514+
GroupExamLockType::Restricted
1515+
);
15111516
$this->presenter->groups->persist($group);
15121517
Assert::true($group->isExamLockStrict());
15131518

@@ -1519,7 +1524,7 @@ class TestGroupsPresenter extends Tester\TestCase
15191524
'V1:Groups',
15201525
'POST',
15211526
['action' => 'setExamPeriod', 'id' => $group->getId()],
1522-
['begin' => $begin, 'end' => $end, 'strict' => false]
1527+
['begin' => $begin, 'end' => $end, 'type' => 'visible']
15231528
);
15241529

15251530
Assert::equal($group->getId(), $payload['id']);
@@ -1541,7 +1546,11 @@ class TestGroupsPresenter extends Tester\TestCase
15411546
$now = (new DateTime())->getTimestamp();
15421547
$begin = $now - 3600;
15431548
$end = $now + 3600;
1544-
$group->setExamPeriod(DateTime::createFromFormat('U', $begin), DateTime::createFromFormat('U', $end));
1549+
$group->setExamPeriod(
1550+
DateTime::createFromFormat('U', $begin),
1551+
DateTime::createFromFormat('U', $end),
1552+
GroupExamLockType::Visible
1553+
);
15451554
$this->presenter->groups->persist($group);
15461555
$end += 3600; // let's give it another hour
15471556

@@ -1570,7 +1579,11 @@ class TestGroupsPresenter extends Tester\TestCase
15701579
$now = (new DateTime())->getTimestamp();
15711580
$begin = $now - 3600;
15721581
$end = $now + 3600;
1573-
$group->setExamPeriod(DateTime::createFromFormat('U', $begin), DateTime::createFromFormat('U', $end));
1582+
$group->setExamPeriod(
1583+
DateTime::createFromFormat('U', $begin),
1584+
DateTime::createFromFormat('U', $end),
1585+
GroupExamLockType::Visible
1586+
);
15741587
$this->presenter->groups->persist($group);
15751588
$end = $now; // truncate the rest of the exam
15761589

@@ -1598,7 +1611,11 @@ class TestGroupsPresenter extends Tester\TestCase
15981611
$now = (new DateTime())->getTimestamp();
15991612
$begin = $now - 3600;
16001613
$end = $now + 3600;
1601-
$group->setExamPeriod(DateTime::createFromFormat('U', $begin), DateTime::createFromFormat('U', $end));
1614+
$group->setExamPeriod(
1615+
DateTime::createFromFormat('U', $begin),
1616+
DateTime::createFromFormat('U', $end),
1617+
GroupExamLockType::Visible
1618+
);
16021619
$this->presenter->groups->persist($group);
16031620

16041621
$exam = $this->presenter->groupExams->findOrCreate($group);
@@ -1634,7 +1651,11 @@ class TestGroupsPresenter extends Tester\TestCase
16341651
$now = (new DateTime())->getTimestamp();
16351652
$begin = $now - 3600;
16361653
$end = $now + 3600;
1637-
$group->setExamPeriod(DateTime::createFromFormat('U', $begin), DateTime::createFromFormat('U', $end));
1654+
$group->setExamPeriod(
1655+
DateTime::createFromFormat('U', $begin),
1656+
DateTime::createFromFormat('U', $end),
1657+
GroupExamLockType::Visible
1658+
);
16381659
$this->presenter->groups->persist($group);
16391660

16401661
$begin += 100;
@@ -1661,7 +1682,11 @@ class TestGroupsPresenter extends Tester\TestCase
16611682
$now = (new DateTime())->getTimestamp();
16621683
$begin = $now - 3600;
16631684
$end = $now + 3600;
1664-
$group->setExamPeriod(DateTime::createFromFormat('U', $begin), DateTime::createFromFormat('U', $end), true);
1685+
$group->setExamPeriod(
1686+
DateTime::createFromFormat('U', $begin),
1687+
DateTime::createFromFormat('U', $end),
1688+
GroupExamLockType::Restricted
1689+
);
16651690
$this->presenter->groups->persist($group);
16661691

16671692
$end += 100;
@@ -1673,7 +1698,7 @@ class TestGroupsPresenter extends Tester\TestCase
16731698
'V1:Groups',
16741699
'POST',
16751700
['action' => 'setExamPeriod', 'id' => $group->getId()],
1676-
['end' => $end, 'strict' => false]
1701+
['end' => $end, 'type' => 'visible']
16771702
);
16781703
},
16791704
BadRequestException::class
@@ -1687,7 +1712,11 @@ class TestGroupsPresenter extends Tester\TestCase
16871712
$now = (new DateTime())->getTimestamp();
16881713
$begin = $now - 7200;
16891714
$end = $now - 3600;
1690-
$group->setExamPeriod(DateTime::createFromFormat('U', $begin), DateTime::createFromFormat('U', $end));
1715+
$group->setExamPeriod(
1716+
DateTime::createFromFormat('U', $begin),
1717+
DateTime::createFromFormat('U', $end),
1718+
GroupExamLockType::Visible
1719+
);
16911720
$this->presenter->groups->persist($group);
16921721

16931722
$end = $now;
@@ -1713,7 +1742,11 @@ class TestGroupsPresenter extends Tester\TestCase
17131742
$now = (new DateTime())->getTimestamp();
17141743
$begin = $now + 3600;
17151744
$end = $now + 7200;
1716-
$group->setExamPeriod(DateTime::createFromFormat('U', $begin), DateTime::createFromFormat('U', $end));
1745+
$group->setExamPeriod(
1746+
DateTime::createFromFormat('U', $begin),
1747+
DateTime::createFromFormat('U', $end),
1748+
GroupExamLockType::Visible
1749+
);
17171750
$this->presenter->groups->persist($group);
17181751

17191752
$payload = PresenterTestHelper::performPresenterRequest(
@@ -1737,7 +1770,11 @@ class TestGroupsPresenter extends Tester\TestCase
17371770
$now = (new DateTime())->getTimestamp();
17381771
$begin = $now - 3600;
17391772
$end = $now + 3600;
1740-
$group->setExamPeriod(DateTime::createFromFormat('U', $begin), DateTime::createFromFormat('U', $end));
1773+
$group->setExamPeriod(
1774+
DateTime::createFromFormat('U', $begin),
1775+
DateTime::createFromFormat('U', $end),
1776+
GroupExamLockType::Visible
1777+
);
17411778
$this->presenter->groups->persist($group);
17421779

17431780
Assert::exception(
@@ -1760,7 +1797,11 @@ class TestGroupsPresenter extends Tester\TestCase
17601797
$now = (new DateTime())->getTimestamp();
17611798
$begin = $now - 7200;
17621799
$end = $now - 3600;
1763-
$group->setExamPeriod(DateTime::createFromFormat('U', $begin), DateTime::createFromFormat('U', $end));
1800+
$group->setExamPeriod(
1801+
DateTime::createFromFormat('U', $begin),
1802+
DateTime::createFromFormat('U', $end),
1803+
GroupExamLockType::Visible
1804+
);
17641805
$this->presenter->groups->persist($group);
17651806

17661807
Assert::exception(
@@ -1784,10 +1825,19 @@ class TestGroupsPresenter extends Tester\TestCase
17841825
$now = (new DateTime())->getTimestamp();
17851826
$begin = $now - 7200;
17861827
$end = $now - 3600;
1787-
$group->setExamPeriod(DateTime::createFromFormat('U', $begin), DateTime::createFromFormat('U', $end));
1828+
$group->setExamPeriod(
1829+
DateTime::createFromFormat('U', $begin),
1830+
DateTime::createFromFormat('U', $end),
1831+
GroupExamLockType::Visible
1832+
);
17881833
$this->presenter->groups->persist($group);
17891834

1790-
$exam = new GroupExam($group, DateTime::createFromFormat('U', $begin), DateTime::createFromFormat('U', $end), false);
1835+
$exam = new GroupExam(
1836+
$group,
1837+
DateTime::createFromFormat('U', $begin),
1838+
DateTime::createFromFormat('U', $end),
1839+
GroupExamLockType::Visible
1840+
);
17911841
$this->presenter->groupExams->persist($exam);
17921842

17931843
$lock = new GroupExamLock($exam, $student, '1.2.3.4');
@@ -1930,7 +1980,11 @@ class TestGroupsPresenter extends Tester\TestCase
19301980
$now = (new DateTime())->getTimestamp();
19311981
$begin = $now + 3600;
19321982
$end = $now + 7200;
1933-
$group->setExamPeriod(DateTime::createFromFormat('U', $begin), DateTime::createFromFormat('U', $end));
1983+
$group->setExamPeriod(
1984+
DateTime::createFromFormat('U', $begin),
1985+
DateTime::createFromFormat('U', $end),
1986+
GroupExamLockType::Visible
1987+
);
19341988
$this->presenter->groups->persist($group);
19351989

19361990
Assert::exception(

0 commit comments

Comments
 (0)