A free open source IT asset/license management system
Updated tests
snipee50e0f0e3406
diff --git a/tests/Unit/Helpers/HelperTest.php b/tests/Unit/Helpers/HelperTest.phpindex c87fddabb5..c3f6424348 100644--- a/tests/Unit/Helpers/HelperTest.php+++ b/tests/Unit/Helpers/HelperTest.php@@ -21,11 +21,15 @@ class HelperTest extends TestCasepublic function test_parse_currency_method(){- $this->settings->set(['default_currency' => 'USD']);+ $this->settings->set(['default_currency' => 'USD', 'digit_separator' => '1,234.56']);$this->assertSame(12.34, Helper::ParseCurrency('USD 12.34'));+ $this->assertSame(8888.0, Helper::ParseCurrency('8,888.00')); // US thousands comma+ $this->assertSame(8888.0, Helper::ParseCurrency('8888.00')); // US plain$this->settings->set(['digit_separator' => '1.234,56']);$this->assertSame(12.34, Helper::ParseCurrency('12,34'));+ $this->assertSame(8888.0, Helper::ParseCurrency('8.888,00')); // EU thousands dot+ $this->assertSame(8888.0, Helper::ParseCurrency('8888,00')); // EU plain}public function test_get_redirect_option_method()diff --git a/tests/Unit/SnipeModelTest.php b/tests/Unit/SnipeModelTest.phpindex 1874e96ea7..7626f6c064 100644--- a/tests/Unit/SnipeModelTest.php+++ b/tests/Unit/SnipeModelTest.php@@ -23,13 +23,42 @@ class SnipeModelTest extends TestCase{$c = new SnipeModel;$c->purchase_cost = '';- $this->assertTrue($c->purchase_cost == null);+ $this->assertNull($c->purchase_cost);+ $c->purchase_cost = null;+ $this->assertNull($c->purchase_cost);$c->purchase_cost = '0.00';- $this->assertTrue($c->purchase_cost == 0.00);+ $this->assertSame(0.0, (float) $c->purchase_cost);$c->purchase_cost = '9.54';- $this->assertTrue($c->purchase_cost == 9.54);- $c->purchase_cost = '9.50';- $this->assertTrue($c->purchase_cost == 9.5);+ $this->assertSame(9.54, (float) $c->purchase_cost);+ $c->purchase_cost = 12.34; // already a float — no ParseCurrency needed+ $this->assertSame(12.34, (float) $c->purchase_cost);+ }++ public function test_sets_purchase_cost_from_us_format_with_thousands()+ {+ $this->settings->set(['digit_separator' => '1,234.56']);+ $c = new SnipeModel;++ $c->purchase_cost = '8,888.00';+ $this->assertSame(8888.0, (float) $c->purchase_cost);++ $c->purchase_cost = '8888.00';+ $this->assertSame(8888.0, (float) $c->purchase_cost);+ }++ public function test_sets_purchase_cost_from_eu_format_with_thousands()+ {+ $this->settings->set(['digit_separator' => '1.234,56']);+ $c = new SnipeModel;++ $c->purchase_cost = '8.888,00';+ $this->assertSame(8888.0, (float) $c->purchase_cost);++ $c->purchase_cost = '8888,00';+ $this->assertSame(8888.0, (float) $c->purchase_cost);++ $c->purchase_cost = '12,34';+ $this->assertSame(12.34, (float) $c->purchase_cost);}public function test_nulls_blank_location_ids_but_not_others()