Added missing tests.

Author: BluePsyduck

composer.lock

@@ -21,12 +21,7 @@
  */
 class UploadStep implements ProcessStepInterface
 {
-    /**
-     * The console.
-     * @var Console
-     */
-    protected $console;
-
+    protected Console $console;
     protected ExportDataService $exportDataService;
 
     /**
@@ -47,13 +42,6 @@ class UploadStep implements ProcessStepInterface
      */
     protected $ftpPassword;
 
-    /**
-     * Initializes the step.
-     * @param Console $console
-     * @param string $uploadFtpHost
-     * @param string $uploadFtpUsername
-     * @param string $uploadFtpPassword
-     */
     public function __construct(
         Console $console,
         ExportDataService $exportDataService,

src/Command/ProcessStep/UploadStep.php

@@ -50,7 +50,7 @@ public function map(object $source, object $destination): void
      * @param float $energyUsage
      * @return array{float, string}
      */
-    protected function convertEnergyUsage(float $energyUsage): array
+    private function convertEnergyUsage(float $energyUsage): array
     {
         $unit = EnergyUsageUnit::WATT;
         foreach (EnergyUsageUnit::ORDERED_UNITS as $currentUnit) {

src/Mapper/MachineMapper.php

@@ -38,5 +38,6 @@ public function map(object $source, object $destination): void
         $destination->name = $source->name;
         $destination->amountMin = $source->amountMin;
         $destination->amountMax = $source->amountMax;
+        $destination->probability = $source->probability;
     }
 }

src/Mapper/RecipeProductMapper.php

@@ -31,7 +31,7 @@ class IconParser implements ParserInterface
     /** @var array<string,array<string,ExportIcon>> */
     protected array $parsedIcons = [];
     /** @var array<string,ExportIcon> */
-    protected $usedIcons = [];
+    protected array $usedIcons = [];
 
     public function __construct(HashCalculator $hashCalculator, MapperManagerInterface $mapperManager)
     {

src/Parser/IconParser.php

@@ -8,7 +8,7 @@
 use BluePsyduck\FactorioTranslator\Translator;
 use FactorioItemBrowser\Export\Entity\Dump\Dump;
 use FactorioItemBrowser\Export\Mod\ModFileManager;
-use FactorioItemBrowser\ExportData\Collection\Translations;
+use FactorioItemBrowser\ExportData\Collection\DictionaryInterface;
 use FactorioItemBrowser\ExportData\ExportData;
 
 /**
@@ -49,12 +49,15 @@ public function validate(ExportData $exportData): void
     }
 
     /**
-     * @param Translations $translations
+     * @param DictionaryInterface $translations
      * @param mixed $localisedString
      * @param mixed|null $fallbackLocalisedString
      */
-    public function translate(Translations $translations, $localisedString, $fallbackLocalisedString = null): void
-    {
+    public function translate(
+        DictionaryInterface $translations,
+        $localisedString,
+        $fallbackLocalisedString = null
+    ): void {
         foreach ($this->translator->getAllLocales() as $locale) {
             $value = $this->translator->translate($locale, $localisedString);
             if ($value === '' && $fallbackLocalisedString !== null) {

src/Parser/TranslationParser.php

@@ -11,7 +11,6 @@
 use FactorioItemBrowser\Export\Entity\ProcessStepData;
 use FactorioItemBrowser\Export\Exception\ExportException;
 use FactorioItemBrowser\Export\Parser\ParserInterface;
-use FactorioItemBrowser\ExportData\Entity\Combination;
 use FactorioItemBrowser\ExportData\ExportData;
 use FactorioItemBrowser\ExportQueue\Client\Constant\JobStatus;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -29,24 +28,15 @@ class ParserStepTest extends TestCase
 {
     use ReflectionTrait;
 
-    /**
-     * The mocked console.
-     * @var Console&MockObject
-     */
-    protected $console;
+    /** @var Console&MockObject */
+    private $console;
 
-    /**
-     * Sets up the test case.
-     */
     protected function setUp(): void
     {
-        parent::setUp();
-
         $this->console = $this->createMock(Console::class);
     }
 
     /**
-     * Tests the constructing.
      * @throws ReflectionException
      * @covers ::__construct
      */
@@ -64,7 +54,6 @@ public function testConstruct(): void
     }
 
     /**
-     * Tests the getLabel method.
      * @covers ::getLabel
      */
     public function testGetLabel(): void
@@ -77,7 +66,6 @@ public function testGetLabel(): void
     }
 
     /**
-     * Tests the getExportJobStatus method.
      * @covers ::getExportJobStatus
      */
     public function testGetExportJobStatus(): void
@@ -90,50 +78,39 @@ public function testGetExportJobStatus(): void
     }
 
     /**
-     * Tests the run method.
      * @throws ExportException
      * @covers ::run
      */
     public function testRun(): void
     {
-        /* @var Dump&MockObject $dump */
         $dump = $this->createMock(Dump::class);
-        /* @var Combination&MockObject $combination */
-        $combination = $this->createMock(Combination::class);
-
-        /* @var ExportData&MockObject $exportData */
         $exportData = $this->createMock(ExportData::class);
-        $exportData->expects($this->any())
-                   ->method('getCombination')
-                   ->willReturn($combination);
 
         $data = new ProcessStepData();
         $data->setDump($dump)
              ->setExportData($exportData);
 
-        /* @var ParserInterface&MockObject $parser1 */
         $parser1 = $this->createMock(ParserInterface::class);
         $parser1->expects($this->once())
                 ->method('prepare')
                 ->with($this->identicalTo($dump));
         $parser1->expects($this->once())
                 ->method('parse')
-                ->with($this->identicalTo($dump), $this->identicalTo($combination));
+                ->with($this->identicalTo($dump), $this->identicalTo($exportData));
         $parser1->expects($this->once())
                 ->method('validate')
-                ->with($this->identicalTo($combination));
+                ->with($this->identicalTo($exportData));
 
-        /* @var ParserInterface&MockObject $parser2 */
         $parser2 = $this->createMock(ParserInterface::class);
         $parser2->expects($this->once())
                 ->method('prepare')
                 ->with($this->identicalTo($dump));
         $parser2->expects($this->once())
                 ->method('parse')
-                ->with($this->identicalTo($dump), $this->identicalTo($combination));
+                ->with($this->identicalTo($dump), $this->identicalTo($exportData));
         $parser2->expects($this->once())
                 ->method('validate')
-                ->with($this->identicalTo($combination));
+                ->with($this->identicalTo($exportData));
 
         $parsers = [$parser1, $parser2];