tweak(update tests) fixing and adding logs

Author: paulmhh

tests/tine20/Timetracker/JsonTest.php

@@ -1430,6 +1430,8 @@ public function testTimesheetInvoiceId()
      */
     public function testUpdateClosedTimeaccount()
     {
+        Timetracker_Controller_Timesheet::getInstance()->doContainerACLChecks(true);
+
         $timeaccountData = $this->_saveTimeaccountWithGrants();
         $timeaccountData['is_open'] = 0;
         $timeaccount = $this->_json->saveTimeaccount($timeaccountData);

tests/tine20/Tinebase/AccountTest.php

@@ -46,16 +46,18 @@ public function testAddAccount()
      */
     public function testGetAccounts()
     {
+        $count = Tinebase_User::getInstance()->getUsers('phpunit', 'accountStatus')->count();
+
         $this->testAddAccount();
 
         $accounts = Tinebase_User::getInstance()->getUsers('phpunit', 'accountStatus');
 
-        $this->assertEquals(1, count($accounts));
+        $this->assertEquals($count + 1, count($accounts));
 
         // test with sort dir
         $accounts = Tinebase_User::getInstance()->getFullUsers('phpunit', 'accountStatus', 'DESC');
 
-        $this->assertEquals(1, count($accounts));
+        $this->assertEquals($count + 1, count($accounts));
     }
 
     /**
@@ -64,16 +66,18 @@ public function testGetAccounts()
      */
     public function testGetFullAccounts()
     {
+        $count = Tinebase_User::getInstance()->getUsers('phpunit', 'accountStatus')->count();
+
         $this->testAddAccount();
 
         $accounts = Tinebase_User::getInstance()->getFullUsers('phpunit', 'accountStatus');
 
-        $this->assertEquals(1, count($accounts));
+        $this->assertEquals($count + 1, count($accounts));
 
         // test with sort dir
         $accounts = Tinebase_User::getInstance()->getFullUsers('phpunit', 'accountStatus', 'ASC');
 
-        $this->assertEquals(1, count($accounts));
+        $this->assertEquals($count + 1, count($accounts));
     }
 
     /**

tests/tine20/Tinebase/NotesTest.php

@@ -184,6 +184,9 @@ public function testDoNotGetDeletedNotes()
             'operator' => 'contains',
             'value'    => 'phpunit'
         )));
+
+        $this->_instance->deleteNotes($this->_instance->searchNotes($filter));
+
         $notes      = $this->_instance->searchNotes($filter, new Tinebase_Model_Pagination());
         $notesCount = $this->_instance->searchNotesCount($filter);
 

tine20/Setup/Controller.php

@@ -787,6 +787,8 @@ public function getSetupXml($_applicationName, $_disableAppIfNotFound = false)
         if (false === ($xml = simplexml_load_file($setupXML))) {
             Tinebase_Core::getLogger()->warn(__METHOD__ . '::' . __LINE__ . ' ' . $setupXML
                 . ' failed to load xml: ' . print_r(libxml_get_last_error(), true));
+            Tinebase_Core::getLogger()->warn(__METHOD__ . '::' . __LINE__ . ' ' . $setupXML
+                . ' failed to load xml: "' . file_get_contents($setupXML) . '"');
         }
 
         return $xml;