X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fapi%2Fv3%2FSyntaxConformanceTest.php;h=38ac526470f16f6290a5efb532887f00eb9cf84f;hb=15d9b3ae22fdaa680a96725516334c693f4d9618;hp=85f00009e9628ffa8e7281fdc708a73b422b7051;hpb=873a6408b9461557400f5a23409ed5b047a22a74;p=civicrm-core.git

diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php
index 85f00009e9..38ac526470 100644
--- a/tests/phpunit/api/v3/SyntaxConformanceTest.php
+++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -90,19 +90,19 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase {
 
   public static function entities_get() {
     // all the entities, beside the ones flagged
-    return api_v3_SyntaxConformanceTest::entities(api_v3_SyntaxConformanceTest::toBeSkipped_get(TRUE));
+    return static::entities(static::toBeSkipped_get(TRUE));
   }
 
   public static function entities_create() {
-    return api_v3_SyntaxConformanceTest::entities(api_v3_SyntaxConformanceTest::toBeSkipped_create(TRUE));
+    return static::entities(static::toBeSkipped_create(TRUE));
   }
 
   public static function entities_updatesingle() {
-    return api_v3_SyntaxConformanceTest::entities(api_v3_SyntaxConformanceTest::toBeSkipped_updatesingle(TRUE));
+    return static::entities(static::toBeSkipped_updatesingle(TRUE));
   }
 
   public static function entities_delete() {
-    return api_v3_SyntaxConformanceTest::entities(api_v3_SyntaxConformanceTest::toBeSkipped_delete(TRUE));
+    return static::entities(static::toBeSkipped_delete(TRUE));
   }
 
   public static function toBeSkipped_get($sequential = FALSE) {
@@ -156,7 +156,7 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase {
  * @return multitype:string |multitype:multitype:string
  */
   public static function toBeSkipped_automock($sequential = FALSE) {
-    $entitiesWithoutGet = array('MailingContact', 'EntityTag', 'Participant', 'ParticipantPayment', 'Setting', 'SurveyRespondant', 'MailingRecipients',  'CustomSearch', 'Extension', 'ReportTemplate', 'System');
+    $entitiesWithoutGet = array('MailingContact', 'EntityTag', 'Participant', 'ParticipantPayment', 'Setting', 'SurveyRespondant', 'MailingRecipients',  'CustomSearch', 'Extension', 'ReportTemplate', 'System', 'DashboardContact');
     if ($sequential === TRUE) {
       return $entitiesWithoutGet;
     }
@@ -235,6 +235,7 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase {
       'MailSettings',
       'Setting',
       'MailingContact',
+      'DashboardContact',
     );
     if ($sequential === TRUE) {
       return $entitiesWithout;
@@ -252,6 +253,11 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase {
   public function getKnownUnworkablesUpdateSingle($entity, $key){
     // can't update values are values for which updates don't result in the value being changed
     $knownFailures = array(
+      'ActionSchedule' => array(
+        'cant_update' => array(
+          'group_id',
+        ),
+      ),
       'Address' => array(
         'cant_update' => array(
           'state_province_id', //issues with country id - need to ensure same country
@@ -700,7 +706,6 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase {
           }
           break;
 
-        case CRM_Utils_Type::T_BOOL:
         case CRM_Utils_Type::T_BOOLEAN:
           // probably created with a 1
           $entity[$fieldName] = '0';
@@ -739,9 +744,7 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase {
       );
 
       $checkEntity = $this->callAPISuccess($entityName, 'getsingle', $checkParams);
-      $this->assertAPIArrayComparison($entity, $checkEntity, array(), "changing field $fieldName\n");
-        //print_r(array('update-params' => $updateParams, 'update-result' => $update, 'getsingle-params' => $checkParams, 'getsingle-result' => $checkEntity, 'expected entity' => $entity), TRUE)
-
+      $this->assertAPIArrayComparison($entity, $checkEntity, array(), "changing field $fieldName\n" . print_r(array('update-params' => $updateParams, 'update-result' => $update, 'getsingle-params' => $checkParams, 'getsingle-result' => $checkEntity, 'expected entity' => $entity), TRUE));
     }
     $baoObj->deleteTestObjects($baoString);
     $baoObj->free();