Updating tests to cover latest changes in views, fixing bugs.

Author: krulis-martin

app/model/entity/Assignment.php

@@ -23,6 +23,20 @@ class Assignment extends AssignmentBase implements IExercise
 {
     use ExerciseData;
 
+    /**
+     * @ORM\OneToMany(targetEntity="ExerciseFileLink", mappedBy="assignment", cascade={"persist"})
+     * @var Collection<ExerciseFileLink>
+     */
+    protected $fileLinks;
+
+    /**
+     * @return Collection<ExerciseFileLink>
+     */
+    public function getFileLinks(): Collection
+    {
+        return $this->fileLinks;
+    }
+
     private function __construct(
         DateTime $firstDeadline,
         int $maxPointsBeforeFirstDeadline,
@@ -79,12 +93,6 @@ private function __construct(
         $this->fileLinks = new ArrayCollection();
         $this->solutionFilesLimit = $exercise->getSolutionFilesLimit();
         $this->solutionSizeLimit = $exercise->getSolutionSizeLimit();
-
-        // copy file links from exercise
-        foreach ($exercise->getFileLinks() as $link) {
-            $newLink = ExerciseFileLink::copyForAssignment($link, $this);
-            $this->fileLinks->add($newLink);
-        }
     }
 
     public static function assignToGroup(
@@ -113,6 +121,12 @@ public static function assignToGroup(
 
         $group->addAssignment($assignment);
 
+        // copy file links from exercise
+        foreach ($exercise->getFileLinks() as $link) {
+            $newLink = ExerciseFileLink::copyForAssignment($link, $assignment);
+            $assignment->fileLinks->add($newLink);
+        }
+
         return $assignment;
     }
 
@@ -620,6 +634,9 @@ public function setSubmissionsCountLimit(int $submissionsCountLimit): void
         $this->submissionsCountLimit = $submissionsCountLimit;
     }
 
+    /**
+     * @return Collection<AssignmentSolution>
+     */
     public function getAssignmentSolutions(): Collection
     {
         return $this->assignmentSolutions;
@@ -755,7 +772,7 @@ public function getPlagiarismBatch(): ?PlagiarismDetectionBatch
         return $this->plagiarismBatch;
     }
 
-    public function setPlagiarismBatch(?PlagiarismDetectionBatch $batch = null)
+    public function setPlagiarismBatch(?PlagiarismDetectionBatch $batch = null): void
     {
         $this->plagiarismBatch = $batch;
     }

app/model/entity/AssignmentSolution.php

@@ -343,6 +343,9 @@ public function setOverriddenPoints(?int $overriddenPoints): void
         $this->overriddenPoints = $overriddenPoints;
     }
 
+    /**
+     * @return Collection<AssignmentSolutionSubmission>
+     */
     public function getSubmissions(): Collection
     {
         return $this->submissions;

app/model/entity/Exercise.php

@@ -111,6 +111,20 @@ class Exercise implements IExercise
      */
     protected $archivedAt = null;
 
+    /**
+     * @ORM\OneToMany(targetEntity="ExerciseFileLink", mappedBy="exercise", cascade={"persist"})
+     * @var Collection<ExerciseFileLink>
+     */
+    protected $fileLinks;
+
+    /**
+     * @return Collection<ExerciseFileLink>
+     */
+    public function getFileLinks(): Collection
+    {
+        return $this->fileLinks;
+    }
+
     /**
      * Constructor
      * @param int $version
@@ -390,6 +404,9 @@ public function setAuthor(User $author): void
         $this->author = $author;
     }
 
+    /**
+     * @return ReadableCollection<User>
+     */
     public function getAdmins(): ReadableCollection
     {
         return $this->admins->filter(

app/model/entity/ExerciseFileLink.php

@@ -59,7 +59,7 @@ class ExerciseFileLink implements JsonSerializable
     protected $exercise;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Assignment", inversedBy="fileLinks")
+     * @ORM\ManyToOne(targetEntity="Assignment")
      * @ORM\JoinColumn(onDelete="CASCADE")
      */
     protected $assignment;

app/model/entity/Group.php

@@ -474,7 +474,7 @@ public function removeMembership(GroupMembership $membership): bool
     /**
      * Get all members of the group of given type
      * @param string[] ...$types
-     * @return ReadableCollection
+     * @return ReadableCollection<User>
      */
     public function getMembers(...$types): ReadableCollection
     {
@@ -505,12 +505,18 @@ function (GroupMembership $membership) {
         )->getValues();
     }
 
-    public function getStudents()
+    /**
+     * @return ReadableCollection<User>
+     */
+    public function getStudents(): ReadableCollection
     {
         return $this->getMembers(GroupMembership::TYPE_STUDENT);
     }
 
-    public function getStudentsIds()
+    /**
+     * @return string[] ids
+     */
+    public function getStudentsIds(): array
     {
         return $this->getMembersIds(GroupMembership::TYPE_STUDENT);
     }

app/model/entity/Solution.php

@@ -74,7 +74,7 @@ public function __construct(User $author, RuntimeEnvironment $runtimeEnvironment
         $this->subdir = $this->createdAt->format('Y-m');
     }
 
-    public function addFile(SolutionFile $file)
+    public function addFile(SolutionFile $file): void
     {
         $this->files->add($file);
     }
@@ -97,7 +97,7 @@ public function getSolutionParams(): SolutionParams
         return new SolutionParams(Yaml::parse($this->solutionParams));
     }
 
-    public function setSolutionParams(SolutionParams $params)
+    public function setSolutionParams(SolutionParams $params): void
     {
         $dumped = Yaml::dump($params->toArray());
         $this->solutionParams = $dumped ?: "";
@@ -137,6 +137,9 @@ public function getAuthorId(): ?string
         return $this->author->isDeleted() ? null : $this->author->getId();
     }
 
+    /**
+     * @return Collection<SolutionFile>
+     */
     public function getFiles(): Collection
     {
         return $this->files;

app/model/entity/base/ExerciseData.php

@@ -364,30 +364,6 @@ function (AttachmentFile $file) {
         )->getValues();
     }
 
-    /**
-     * @ORM\OneToMany(targetEntity="ExerciseFileLink", mappedBy="exerciseFile", cascade={"persist"})
-     * @var Collection<ExerciseFileLink>
-     */
-    protected $fileLinks;
-
-    /**
-     * @return Collection<ExerciseFileLink>
-     */
-    public function getFileLinks(): Collection
-    {
-        return $this->fileLinks;
-    }
-
-    public function addFileLink(ExerciseFileLink $fileLink): void
-    {
-        $this->fileLinks->add($fileLink);
-    }
-
-    public function removeFileLink(ExerciseFileLink $fileLink): bool
-    {
-        return $this->fileLinks->removeElement($fileLink);
-    }
-
     /**
      * @ORM\Column(type="integer", nullable=true)
      * How many files may one submit in a solution.

fixtures/demo/25-exercises.neon

@@ -216,6 +216,31 @@ App\Model\Entity\ExerciseFile:
             - "shahash"
             - @demoAdmin
             - @demoExercise
+    linkedExerciseFile:
+        __construct:
+            - "lib.py"
+            - "<dateTimeBetween('-3 years', '-1 years')>"
+            - 42
+            - "hashmash"
+            - @demoAdmin
+            - @demoExercise
+
+App\Model\Entity\ExerciseFileLink:
+    demoExerciseFileLink1:
+        __construct:
+            createForExercise:
+                - "LIB"
+                - @linkedExerciseFile
+                - @demoExercise
+                - "student"
+                - "thelib.py"
+
+    demoExerciseFileLink2:
+        __construct:
+            createForExercise:
+                - "ORIG"
+                - @linkedExerciseFile
+                - @demoExercise
 
 App\Model\Entity\ExerciseTag:
     demoTag1:

tests/Presenters/AssignmentsPresenter.phpt

@@ -76,7 +76,7 @@ class TestAssignmentsPresenter extends Tester\TestCase
         $this->hardwareGroups = $container->getByType(HardwareGroups::class);
         $this->assignmentSolutionViewFactory = $container->getByType(AssignmentSolutionViewFactory::class);
 
-        // patch container, since we cannot create actual file storage manarer
+        // patch container, since we cannot create actual file storage manager
         $fsName = current($this->container->findByType(FileStorageManager::class));
         $this->container->removeService($fsName);
         $this->container->addService($fsName, new FileStorageManager(
@@ -234,8 +234,7 @@ class TestAssignmentsPresenter extends Tester\TestCase
 
         /** @var Mockery\Mock | AssignmentEmailsSender $mockAssignmentEmailsSender */
         $mockAssignmentEmailsSender = Mockery::mock(JobConfig\JobConfig::class);
-        $mockAssignmentEmailsSender->shouldReceive()->never(
-        ); // this is the main assertion of this test (no mail is sent)
+        $mockAssignmentEmailsSender->shouldReceive()->never(); // this is the main assertion of this test (no mail is sent)
         $this->presenter->assignmentEmailsSender = $mockAssignmentEmailsSender;
 
         $mockEvaluations = Mockery::mock(SolutionEvaluations::class);
@@ -619,32 +618,39 @@ class TestAssignmentsPresenter extends Tester\TestCase
     {
         PresenterTestHelper::loginDefaultAdmin($this->container);
 
+        $exercises = array_filter(
+            $this->presenter->exercises->findAll(),
+            function (Exercise $e) {
+                return !$e->getFileLinks()->isEmpty(); // select the exercise with file links
+            }
+        );
+        Assert::count(1, $exercises);
         /** @var Exercise $exercise */
-        $exercise = $this->presenter->exercises->findAll()[0];
+        $exercise = array_pop($exercises);
+
         /** @var Group $group */
         $group = $this->presenter->groups->findAll()[0];
 
-        $request = new Nette\Application\Request(
+        $payload = PresenterTestHelper::performPresenterRequest(
+            $this->presenter,
             'V1:Assignments',
             'POST',
             ['action' => 'create'],
             ['exerciseId' => $exercise->getId(), 'groupId' => $group->getId()]
         );
 
-        $response = $this->presenter->run($request);
-        Assert::type(Nette\Application\Responses\JsonResponse::class, $response);
-
-        $result = $response->getPayload();
-        Assert::equal(200, $result['code']);
-
         /** @var AssignmentViewFactory $viewFactory */
         $viewFactory = $this->container->getByType(AssignmentViewFactory::class);
 
         // Make sure the assignment was persisted
         Assert::same(
-            $viewFactory->getAssignment($this->presenter->assignments->findOneBy(['id' => $result['payload']["id"]])),
-            $result['payload']
+            $viewFactory->getAssignment($this->presenter->assignments->findOneBy(['id' => $payload["id"]])),
+            $payload
         );
+        Assert::count(2, $payload['localizedTextsLinks']);
+        $keys = array_keys($payload['localizedTextsLinks']);
+        sort($keys);
+        Assert::same(['LIB', 'ORIG'], $keys);
     }
 
     public function testCreateAssignmentFromLockedExercise()

tests/Presenters/ExerciseFilesPresenter.phpt

@@ -57,7 +57,7 @@ class TestExerciseFilesPresenter extends Tester\TestCase
         $this->exercises = $container->getByType(App\Model\Repository\Exercises::class);
         $this->attachmentFiles = $container->getByType(\App\Model\Repository\AttachmentFiles::class);
 
-        // patch container, since we cannot create actual file storage manarer
+        // patch container, since we cannot create actual file storage manager
         $fsName = current($this->container->findByType(FileStorageManager::class));
         $this->container->removeService($fsName);
         $this->container->addService($fsName, new FileStorageManager(