testSetUnits_validate_options

Author: adriangibbons

src/php-FIT-File-Analysis.php

@@ -1065,22 +1065,32 @@ public function sport() {
 	 * Transform the values read from the FIT file into the units requested by the user.
 	 */
 	private function set_units($options) {
-		$units = '';
-		
-		if(isset($options['units'])) {
+		if(!empty($options['units'])) {
 			// Handle $options['units'] not being passed as array and/or not in lowercase.
 			$units = strtolower((is_array($options['units'])) ? $options['units'][0] : $options['units']);
 		}
+		else {
+			$units = 'metric';
+		}
 
 		//  Handle $options['pace'] being pass as array and/or boolean vs string and/or lowercase.
 		$bPace = false;
 		if(isset($options['pace'])) {
 			$pace = is_array($options['pace']) ? $options['pace'][0] : $options['pace'];
-			if(is_bool($options['pace'])) {
+			if(is_bool($pace)) {
 				$bPace = $pace;
 			}
-			else if(is_string($options['pace'])) {
-				$bPace = (strtolower($pace) === 'true') ? true : false;
+			else if(is_string($pace)) {
+				$pace = strtolower($pace);
+				if($pace === 'true' || $pace === 'false') {
+					$bPace = $pace;
+				}
+				else {
+					throw new Exception('phpFITFileAnalysis->set_units(): pace option not valid!');
+				}
+			}
+			else {
+				throw new Exception('phpFITFileAnalysis->set_units(): pace option not valid!');
 			}
 		}
 
@@ -1160,12 +1170,12 @@ private function set_units($options) {
 			case 'raw':
 				// Do nothing - leave values as read from file.
 				break;
-			default:  // Assume 'metric'.
+			case 'metric':
 				if(isset($this->data_mesgs['record']['speed'])) {  // convert  meters per second to kilometers per hour
 					if(is_array($this->data_mesgs['record']['speed'])) {
 						foreach($this->data_mesgs['record']['speed'] as &$value) {
 							if($bPace) {
-								$value = round(60 / 3.6 / $value, 3);
+								$value = ($value != 0) ? round(60 / 3.6 / $value, 3) : 0;
 							}
 							else {
 								$value = round($value * 3.6, 3);
@@ -1212,6 +1222,9 @@ private function set_units($options) {
 					}
 				}
 				break;
+			default:
+				throw new Exception('phpFITFileAnalysis->set_units(): units option not valid!');
+				break;
 		}
 	}
 

tests/pFFA-Set_Units-Test.php

@@ -0,0 +1,59 @@
+<?php
+error_reporting(E_ALL);
+require __DIR__ . '/../src/php-FIT-File-Analysis.php';
+
+class FitTest extends PHPUnit_Framework_TestCase
+{
+	private $base_dir;
+	private $filename = 'road-cycling.fit';
+	
+	public function setUp()
+	{
+		$this->base_dir = __DIR__ . '/../demo/fit_files/';
+	}
+	
+	public function testSetUnits_validate_options_pass()
+	{
+		$valid_options = ['raw', 'statute', 'metric'];
+		foreach($valid_options as $valid_option) {
+			$pFFA = new phpFITFileAnalysis($this->base_dir . $this->filename, ['units' => $valid_option]);
+			
+			if($valid_option === 'raw') {
+				$this->assertEquals(1.286, reset($pFFA->data_mesgs['record']['speed']));
+			}
+			if($valid_option === 'statute') {
+				$this->assertEquals(2.877, reset($pFFA->data_mesgs['record']['speed']));
+			}
+			if($valid_option === 'metric') {
+				$this->assertEquals(4.63, reset($pFFA->data_mesgs['record']['speed']));
+			}
+		}
+	}
+	
+	/**
+	 * @expectedException Exception
+	 */
+	public function testSetUnits_validate_options_fail()
+	{
+		$pFFA = new phpFITFileAnalysis($this->base_dir . $this->filename, ['units' => 'INVALID']);
+	}
+	
+	public function testSetUnits_validate_pace_option_pass()
+	{
+		$valid_options = [true, false];
+		foreach($valid_options as $valid_option) {
+			$pFFA = new phpFITFileAnalysis($this->base_dir . $this->filename, ['units' => 'raw', 'pace' => $valid_option]);
+			
+			$this->assertEquals(1.286, reset($pFFA->data_mesgs['record']['speed']));
+		}
+	}
+	
+	/**
+	 * @expectedException Exception
+	 */
+	public function testSetUnits_validate_pace_option_fail()
+	{
+		$pFFA = new phpFITFileAnalysis($this->base_dir . $this->filename, ['pace' => 'INVALID']);
+	}
+}
+?>