BUG: Refs #0283. Fixed AssetstoreModelTest failures by adding type juggling.

Pgsql and Mysql have different behaviors related to the type of data, so
in order to use compareDao in these tests across the two db systems I added
an option to MIDASModel to compare dao objects with typejuggling, leaving
the default behavior to not type juggle.  These tests call compareDao with
typejuggling.

Author: Michael Grauer

core/models/MIDASModel.php

@@ -376,7 +376,7 @@ public function getCountAll()
    * @param $dao2
    * @return True ifthey are the same one
    */
-  public function compareDao($dao1, $dao2)
+  public function compareDao($dao1, $dao2, $juggleTypes = false)
     {
     if(!is_object($dao1) || !is_object($dao2))
       {
@@ -386,10 +386,20 @@ public function compareDao($dao1, $dao2)
       {
       if($data['type'] == MIDAS_DATA)
         {
-        if($dao1->get($name) !== $dao2->get($name))
+        if($juggleTypes)
           {
-          return false;
+          if($dao1->get($name) != $dao2->get($name))
+            {
+            return false;
+            }
           }
+        else
+          {
+          if($dao1->get($name) !== $dao2->get($name))
+            {
+            return false;
+            }
+          }  
         }
       }
     return true;

core/tests/models/base/AssetstoreModelTest.php

@@ -94,17 +94,15 @@ 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));
+    $this->assertTrue($this->Assetstore->compareDao($assetstoreDao3, $savedDao, true));
 
     // Incorrect Create Tests
 
@@ -153,9 +151,7 @@ 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->assertTrue($this->Assetstore->compareDao($foundDao, $assetstoreDao1, true));
     $this->assertEquals($foundDao->getName(), $newName);
     $assetstoreDao1->setName($savedName);
 
@@ -169,9 +165,7 @@ 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->assertTrue($this->Assetstore->compareDao($foundDao, $assetstoreDao1, true));
     $this->assertEquals($foundDao->getPath(), $newPath);
     $assetstoreDao1->setPath($savedPath);