BUG: Refs #0283. Fixed AssetstoreModelTest failures created by these changes.

Author: Michael Grauer

core/tests/models/base/AssetstoreModelTest.php

@@ -94,14 +94,16 @@ public function testSave()
 
     // create new ones with a different path from existing ones
 
-    $assetstoreDao1 = $this->validSaveTestcase('test_assetstore_1', '/testassetstore1/path', '0');
-    $assetstoreDao2 = $this->validSaveTestcase('test_assetstore_2', '/testassetstore2/path', '1');
-    $assetstoreDao3 = $this->validSaveTestcase('test_assetstore_3', '/testassetstore3/path', '2');
+    $assetstoreDao1 = $this->validSaveTestcase('test_assetstore_1', '/testassetstore1/path', 0);
+    $assetstoreDao2 = $this->validSaveTestcase('test_assetstore_2', '/testassetstore2/path', 1);
+    $assetstoreDao3 = $this->validSaveTestcase('test_assetstore_3', '/testassetstore3/path', 2);
 
     // make sure one got saved
     $found = $this->Assetstore->findBy('name', 'test_assetstore_3');
     $this->assertNotEmpty($found);
     $savedDao = $found[0];
+    // explicit cast to get around differences in mysql vs pgsql type handling
+    $savedDao->type = (int)$savedDao->type;
     $this->assertTrue($this->Assetstore->compareDao($assetstoreDao3, $savedDao));
 
     // Incorrect Create Tests
@@ -151,6 +153,8 @@ public function testSave()
     $found = $this->Assetstore->findBy('name', $newName);
     $this->assertNotEmpty($found);
     $foundDao = $found[0];
+    // explicit cast to get around differences in mysql vs pgsql type handling
+    $foundDao->type = (int)$foundDao->type;
     $this->assertTrue($this->Assetstore->compareDao($foundDao, $assetstoreDao1));
     $this->assertEquals($foundDao->getName(), $newName);
     $assetstoreDao1->setName($savedName);
@@ -165,6 +169,8 @@ public function testSave()
     $found = $this->Assetstore->findBy('path', $newPath);
     $this->assertNotEmpty($found);
     $foundDao = $found[0];
+    // explicit cast to get around differences in mysql vs pgsql type handling
+    $foundDao->type = (int)$foundDao->type;
     $this->assertTrue($this->Assetstore->compareDao($foundDao, $assetstoreDao1));
     $this->assertEquals($foundDao->getPath(), $newPath);
     $assetstoreDao1->setPath($savedPath);
@@ -175,4 +181,4 @@ public function testSave()
     $this->Assetstore->delete($assetstoreDao3);
     }
 
-  }
+  }