fix tests and MessageList

sportlog · Feb 23, 2021 · 6c62e32 · 6c62e32
1 parent 7c870f5
commit 6c62e32
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/src/Profile/MessageList.php b/src/Profile/MessageList.php
@@ -15,6 +15,7 @@
 use Sportlog\FIT\Profile\Messages\FileIdMessage;
 use IteratorAggregate;
 use RecursiveArrayIterator;
+use Sportlog\FIT\Profile\Types\MesgNum;
 use Traversable;
 
 /**
@@ -37,7 +38,7 @@ class MessageList implements IteratorAggregate, Countable
      */
     public function getFileType(): ?int
     {
-        $messages = $this->getMessages(MessageNumber::FileId);
+        $messages = $this->getMessages(MesgNum::FILE_ID);
         if (count($messages) !== 1) {
             return null;
         }

diff --git a/tests/TestCase/Decoder/DecodeActivityTruncatedTest.php b/tests/TestCase/Decoder/DecodeActivityTruncatedTest.php
@@ -17,6 +17,7 @@
 use Sportlog\FIT\Test\TestCase\FilePath;
 use PHPUnit\Framework\TestCase;
 use Sportlog\FIT\Profile\MessageNumber;
+use Sportlog\FIT\Profile\Types\MesgNum;
 
 /**
  * Decodes the file 'activity_truncated.fit'
@@ -30,11 +31,11 @@ public function testDecodeFile(): void {
         $this->assertNotNull($messages);
         $this->assertCount(16, $messages);
         //$this->assertEquals(FileType::Activity, $messages->getFileType());
-        $this->assertCount(1, $messages->getMessages(MessageNumber::FileId));
-        $this->assertCount(1, $messages->getMessages(MessageNumber::Event));
-        $this->assertCount(14, $messages->getMessages(MessageNumber::Record));
+        $this->assertCount(1, $messages->getMessages(MesgNum::FILE_ID));
+        $this->assertCount(1, $messages->getMessages(MesgNum::EVENT));
+        $this->assertCount(14, $messages->getMessages(MesgNum::RECORD));
 
-        $recMessages = $messages->getMessages(MessageNumber::Record);
+        $recMessages = $messages->getMessages(MesgNum::RECORD);
         /** @var RecordMessage $lastRecordMessage */
         $lastRecordMessage = $recMessages[count($recMessages)-1];
         $this->assertEquals(5.73, $lastRecordMessage->getDistance());

diff --git a/tests/TestCase/Decoder/DecodeDeveloperDataTest.php b/tests/TestCase/Decoder/DecodeDeveloperDataTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Sportlog\FIT\Profile\Message\RecordMessage;
 use Sportlog\FIT\Profile\MessageNumber;
+use Sportlog\FIT\Profile\Types\MesgNum;
 
 /**
  * Decodes the file 'DeveloperData.fit'
@@ -27,7 +28,7 @@ public function testDecodeFile(): void {
         $this->assertNotNull($messages);
         $this->assertCount(6, $messages);
 
-        $recordMessages = $messages->getMessages(MessageNumber::Record);
+        $recordMessages = $messages->getMessages(MesgNum::RECORD);
         $this->assertEquals(3, count($recordMessages));
 
         $this->assertSame(1, $recordMessages[0]->getFieldValue('doughnuts_earned'));

diff --git a/tests/TestCase/Decoder/DecodeMonitoringTest.php b/tests/TestCase/Decoder/DecodeMonitoringTest.php
@@ -16,6 +16,7 @@
 use Sportlog\FIT\Test\TestCase\FilePath;
 use PHPUnit\Framework\TestCase;
 use Sportlog\FIT\Profile\MessageNumber;
+use Sportlog\FIT\Profile\Types\MesgNum;
 
 /**
  * Decodes the file 'MonitoringFile.fit'
@@ -30,10 +31,10 @@ public function testDecodeFile(): void
 
         $this->assertNotNull($messages);
 
-        $monitoringMessages = $messages->getMessages(MessageNumber::Monitoring);
+        $monitoringMessages = $messages->getMessages(MesgNum::MONITORING);
         $this->assertCount(337, $monitoringMessages);
 
-        $monitoringInfoMessages = $messages->getMessages(MessageNumber::MonitoringInfo);
+        $monitoringInfoMessages = $messages->getMessages(MesgNum::MONITORING_INFO);
         /** @var MonitoringInfoMessage $lastMonitoringInfoMessage */
         $lastMonitoringInfoMessage = $monitoringInfoMessages[count($monitoringInfoMessages) - 1];
         $this->assertEquals(2042, $lastMonitoringInfoMessage->getRestingMetabolicRate());

diff --git a/tests/TestCase/Decoder/DecodeSettingsTest.php b/tests/TestCase/Decoder/DecodeSettingsTest.php
@@ -15,6 +15,7 @@
 use Sportlog\FIT\Test\TestCase\FilePath;
 use PHPUnit\Framework\TestCase;
 use Sportlog\FIT\Profile\MessageNumber;
+use Sportlog\FIT\Profile\Types\MesgNum;
 
 /**
  * Decodes the file 'Settings.fit'
@@ -27,17 +28,17 @@ public function testDecodeFile(): void {
 
         $this->assertNotNull($messages);
         $this->assertCount(3, $messages);
-        $this->assertCount(1, $messages->getMessages(MessageNumber::FileId));
+        $this->assertCount(1, $messages->getMessages(MesgNum::FILE_ID));
         // $this->assertEquals(FileType::Settings, $messages->getFileType());
-        $this->assertCount(1, $messages->getMessages(MessageNumber::UserProfile));
-        $this->assertCount(1, $messages->getMessages(MessageNumber::HrmProfile));
+        $this->assertCount(1, $messages->getMessages(MesgNum::USER_PROFILE));
+        $this->assertCount(1, $messages->getMessages(MesgNum::HRM_PROFILE));
 
-        $hrmMessages = $messages->getMessages(MessageNumber::HrmProfile);
+        $hrmMessages = $messages->getMessages(MesgNum::HRM_PROFILE);
         /** @var HrmProfileMessage $lastRecordMessage */
         $lastHrmProfileMessage = $hrmMessages[count($hrmMessages)-1];
         $this->assertEquals(100, $lastHrmProfileMessage->getHrmAntId());
 
-        $userProfileMessages = $messages->getMessages(MessageNumber::UserProfile);
+        $userProfileMessages = $messages->getMessages(MesgNum::USER_PROFILE);
         /** @var UserProfileMessage $lastUserProfileMessage */
         $lastUserProfileMessage = $userProfileMessages[count($userProfileMessages)-1];
         $this->assertEquals(90, $lastUserProfileMessage->getWeight());