fixed the unit test

modules/opencase_entities/oc_actor.page.inc

@@ -20,17 +20,5 @@ use Drupal\Core\Render\Element;
  *   - attributes: HTML attributes for the containing element.
  */
 function template_preprocess_oc_actor(array &$variables) {
-  // Make the id available to the template and also separate the fields
-  // into two sections to be displayed in two columns.
-  $variables['id'] = $variables['elements']['#oc_actor']->get('id')[0]->get('value')->getValue();
-  $variables['contact_details'] = array();
-  $variables['fields_other_than_contact_details'] = array();
-  foreach (Element::children($variables['elements']) as $key) {
-    $variables['content'][$key] = $variables['elements'][$key];
-    if (in_array($key, ['email', 'phone', 'phone2', 'postal_address', 'post_code'])) {
-      $variables['contact_details'][$key] = $variables['elements'][$key];
-    } else {
-      $variables['fields_other_than_contact_details'][$key] = $variables['elements'][$key];
-    }
-  }
+_template_preprocess_entity($variables);
 }

modules/opencase_entities/templates/oc_actor.html.twig

@@ -16,7 +16,10 @@
  */
 #}
 <div{{ attributes.addClass('oc_actor') }}>
-  {% if content %}
-    {{- content -}}
+  {% if normal_fields %}
+    <div id='static_data'>{{- normal_fields -}}</div>
+  {% endif %}
+  {% if extra_fields %}
+    <div id='dynamic_data'>{{- extra_fields -}}</div>
   {% endif %}
 </div>

src/TimeBasedFieldUpdater.php

@@ -31,7 +31,10 @@ final class TimeBasedFieldUpdater {
         $query = $this->entityTypeManager->getStorage($this->entity_type)->getQuery();
         $conditions[] = [$this->date_field, date($this->date_format, strtotime('-'.$time_elapsed)), "<"];
         $conditions[] = ['type', $this->bundle, '='];
-        $this->utils->addConditionsToQuery($query, $conditions);
+
+        foreach ($conditions as $condition) {
+            $query->condition($condition[0], $condition[1], $condition[2] ?? "=");
+        }
         foreach($query->execute() as $id) {
             $this->updateEntity($id, $new_values);
         }

src/Utils.php

@@ -3,10 +3,8 @@
 namespace Drupal\opencase;
 
 use \Drupal;
-use Drupal\Core\Entity\EntityTypeManager;
 use Drupal\Core\Entity\Query\QueryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use RuntimeException;
 
 class Utils {
 
@@ -19,15 +17,6 @@ class Utils {
         $this->entityTypeManager = $entityTypeManager;
     }
 
-    public function addConditionsToQuery(QueryInterface $query, array $conditions): void {
-        foreach($conditions as $condition) {
-            $field = $condition[0];
-            $value = $condition[1];
-            $operator = isset($condition[2]) ? $condition[2] : "=";
-            $query->condition($field, $value, $operator);
-        }
-    } 
-
      /**
    * Utility: find term by name and vid.
    *

tests/src/Unit/TimeBasedFieldUpdaterTest.php

@@ -48,13 +48,13 @@ class TimeBasedFieldUpdaterTest extends UnitTestCase{
 
     function testBundleAndDateAndExtraConditionsAreAllAddedAsQueryConditions(): void {
         $this->query->method('execute')->willReturn([]);
-        $expected_conditions= [
+
+        $this->query->expects($this->exactly(4))->method('condition')->withConsecutive(
           ['dummy_field', 'dummy_value', '<'],
           ['dummy_field_2', 'dummy_value_2', '='],
           ['dummy_date_field', date('Y-m-d', strtotime('- 3 months')), "<"],
-            ['type', 'dummy_bundle', '=']      
-        ];
-        $this->utils->expects($this->once())->method('addConditionsToQuery')->with($this->query, $expected_conditions);
+          ['type', 'dummy_bundle', '=']);
+
         $this->updater->update([['dummy_field', 'dummy_value', '<'], ['dummy_field_2', 'dummy_value_2', '='] ], '3 months', ['dummy_field' => 4]);
     }
 }

tests/src/Unit/UtilsTest.php

@@ -16,20 +16,10 @@ class UtilsTest extends UnitTestCase{
     }
 
     public function testGetTidByNameGetsTid():void {
-        $this->entityTypeManager->method('getStorage')->willReturn($this->storage);
         $term_entity = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityBase')->disableOriginalConstructor()->getMock();
         $term_entity->expects($this->once())->method('id')->willReturn('3');
         $this->storage->expects($this->once())->method('loadByProperties')->with(['name' => 'foo', 'vid' => 'bar'])
             ->willReturn([$term_entity]);
         $this->assertEquals($this->utils->getTidByName('foo', 'bar'), 3);
     }
-    public function testAddConditionToQueryAddsEqualsIfNoOperatorProvided():void {
-        $this->query->expects($this->exactly(1))->method('condition')->with("1", "2", "=");
-        $this->utils->addConditionsToQuery($this->query, [["1","2"]]);
-
-    }
-    public function testAddConditionToQueryAddsTheRightAmountOfConditions():void {
-        $this->query->expects($this->exactly(4))->method('condition');
-        $this->utils->addConditionsToQuery($this->query, [["1","2","3"], ["lk", "n", "kk"], ['sfd', 'ds', 'fds'], ["1","2","3"]]);
-    }
 }