Fix units tests

Author: Lainow

src/Controller.php

@@ -232,18 +232,10 @@ private static function addGroupsForActorType(CommonDBTM $item, Config $moconfig
                 $criteria = [
                     'groups_id' => $user->fields['groups_id'],
                     $idField => $object->fields['id'],
+                    'type' => $actorType,
                 ];
 
-                // Add type for assigned technicians
-                if ($actorType == \CommonITILActor::ASSIGN) {
-                    $criteria['type'] = \CommonITILActor::ASSIGN;
-                }
-
                 if (!$t_group->getFromDBByCrit($criteria)) {
-                    if ($actorType == \CommonITILActor::ASSIGN) {
-                        $criteria['type'] = \CommonITILActor::ASSIGN;
-                    }
-
                     $t_group->add($criteria);
                 }
             } else {
@@ -261,23 +253,16 @@ private static function addGroupsForActorType(CommonDBTM $item, Config $moconfig
                         $criteria = [
                             'groups_id' => $ug['groups_id'],
                             $idField => $object->fields['id'],
+                            'type' => $actorType,
                         ];
 
-                        // Add type for assigned technicians
-                        if ($actorType == \CommonITILActor::ASSIGN) {
-                            $criteria['type'] = \CommonITILActor::ASSIGN;
-                        }
-
                         if (!$t_group->getFromDBByCrit($criteria)) {
                             $groupData = [
                                 'groups_id' => $ug['groups_id'],
                                 $idField => $object->fields['id'],
+                                'type' => $actorType,
                             ];
 
-                            if ($actorType == \CommonITILActor::ASSIGN) {
-                                $groupData['type'] = \CommonITILActor::ASSIGN;
-                            }
-
                             $t_group->add($groupData);
                         }
                     }

tests/MoreOptionsTestCase.php

@@ -131,4 +131,49 @@ protected function getCurrentConfig(): Config
         }
         return $config;
     }
+
+    /**
+     * Clear session messages
+     */
+    protected function clearSessionMessages(): void
+    {
+        if (isset($_SESSION['MESSAGE_AFTER_REDIRECT'])) {
+            $_SESSION['MESSAGE_AFTER_REDIRECT'] = [];
+        }
+    }
+
+    /**
+     * Clear specific log entries containing a pattern
+     */
+    protected function clearLogEntriesContaining(string $pattern): void
+    {
+        if (!isset($this->log_handler)) {
+            return;
+        }
+        
+        $records = $this->log_handler->getRecords();
+        foreach ($records as $key => $log) {
+            if (isset($log['message']) && str_contains($log['message'], $pattern)) {
+                unset($records[$key]);
+            }
+        }
+        
+        $this->log_handler->clear();
+        foreach (array_values($records) as $record) {
+            $this->log_handler->handle($record);
+        }
+    }
+
+    /**
+     * Initialize session variables for entity management
+     */
+    protected function initEntitySession(): void
+    {
+        if (!isset($_SESSION['glpiactiveentities_string'])) {
+            $_SESSION['glpiactiveentities_string'] = '';
+        }
+        if (!isset($_SESSION['glpiactiveentities'])) {
+            $_SESSION['glpiactiveentities'] = [];
+        }
+    }
 }