fix(tests): restore disabled tests

flyve-mdm · Mar 17, 2017 · 47395ce · 47395ce
1 parent 31568b8
commit 47395ce
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 50 deletions.
diff --git a/...egration/CreateInvitationSendsAnEmail.php → ...tion/CreateInvitationSendsAnEmailTest.php b/...egration/CreateInvitationSendsAnEmail.php → ...tion/CreateInvitationSendsAnEmailTest.php
@@ -31,7 +31,7 @@
 
 use Flyvemdm\Test\ApiRestTestCase;
 
-class CreateInvitationSendsAnEmail extends ApiRestTestCase {
+class CreateInvitationSendsAnEmailTest extends ApiRestTestCase {
 
    protected static $sessionToken;
 

diff --git a/tests/0010_Integration/DeviceCountLimit.php → ...0010_Integration/DeviceCountLimitTest.php b/tests/0010_Integration/DeviceCountLimit.php → ...0010_Integration/DeviceCountLimitTest.php
@@ -29,7 +29,7 @@
  ------------------------------------------------------------------------------
  */
 
-class DeviceCountLimit extends RegisteredUserTestCase {
+class DeviceCountLimitTest extends RegisteredUserTestCase {
 
    protected static $deviceLimit = 5;
 

diff --git a/...s/0010_Integration/PolicyNotification.php → ...10_Integration/PolicyNotificationTest.php b/...s/0010_Integration/PolicyNotification.php → ...10_Integration/PolicyNotificationTest.php
@@ -29,14 +29,14 @@
  ------------------------------------------------------------------------------
 */
 
-class PolicyNotification extends RegisteredUserTestCase
+class PolicyNotificationTest extends RegisteredUserTestCase
 {
 
    public function testInitCreateFleet() {
       $fleet = new PluginFlyvemdmFleet();
       $fleet->add([
             'name'               => 'test fleet',
-            'entities_id'        => $entityId
+            'entities_id'        => $_SESSION['glpiactive_entity']
       ]);
       $this->assertFalse($fleet->isNewItem());
 
@@ -53,51 +53,21 @@ public function testApplyPolicy($fleet) {
       $policyFactory = new PluginFlyvemdmPolicyFactory();
       $policy = $policyFactory->createFromDBByID($policyData->getID());
 
-      // Prepare subscriber
-      $mqttSubscriber = new MqttClientHandler();
-      $publishedMessage = null;
-
-      // Contains true if the ploicy successfully applied to the fleet
-      $fleetPolicyId = null;
-
-      // function to trigger the mqtt message
-      $sendMqttMessageCallback = function () use (&$fleetPolicy, &$fleetPolicyId, &$fleet, &$policyData) {
-         // Apply the policy to a fleet
-         $fleetPolicy = new PluginFlyvemdmFleet_Policy();
-         $fleetPolicyId = $fleetPolicy->add([
-               'plugin_flyvemdm_fleets_id'      => $fleet->getID(),
-               'plugin_flyvemdm_policies_id'    => $policyData->getID(),
-               'value'                          => 'PASSWORD_NONE'
-         ]);
-      };
-
-      // Callback each time the mqtt broker sends a pingresp
-      $callback = function () use (&$publishedMessage, &$mqttSubscriber) {
-         $publishedMessage = $mqttSubscriber->getPublishedMessage();
-      };
-
-      $mqttSubscriber->setSendMqttMessageCallback($sendMqttMessageCallback);
-      $mqttSubscriber->setPingCallback($callback);
-      $topic = $fleet->getTopic();
-      $mqttSubscriber->subscribe("$topic/Command");
-
-      $this->assertGreaterThan(0, $fleetPolicyId, "Failed to apply the policy");
-      $this->assertInstanceOf('\sskaje\mqtt\Message\PUBLISH', $publishedMessage);
-
-      $data = array();
-      $data['publishedMessage'] = $publishedMessage;
-
-      return $data;
-   }
+      // Apply the policy to a fleet
+      $fleetPolicy = new PluginFlyvemdmFleet_Policy();
+      $fleetPolicyId = $fleetPolicy->add([
+            'plugin_flyvemdm_fleets_id'      => $fleet->getID(),
+            'plugin_flyvemdm_policies_id'    => $policyData->getID(),
+            'value'                          => 'PASSWORD_NONE'
+      ]);
 
-   /**
-    * @depends testApplyPolicy
-    * @param array $data
-    */
-   public function testPolicyApplyMessageIsValid($data) {
-      $published = $data['publishedMessage'];
-      $json = $published->getMessage();
-      $this->assertJson($json);
+      $groupName = $policyData->getField('group');
+      $fleetId = $fleet->getID();
+      $mqttUpdateQueue = new PluginFlyvemdmMqttupdatequeue();
+      $rows = $mqttUpdateQueue->find("`group` = '$groupName'
+                                      AND `plugin_flyvemdm_fleets_id` = '$fleetId'
+                                      AND `status` = 'queued'");
+      $this->assertCount(1, $rows);
    }
 
 }
diff --git a/tests/inc/GuestUserTestCase.php b/tests/inc/GuestUserTestCase.php
@@ -29,7 +29,7 @@
  ------------------------------------------------------------------------------
 */
 
-use Glpi\test\CommonTestCase;
+use Glpi\Test\CommonTestCase;
 
 class GuestUserTestCase extends CommonTestCase
 {

diff --git a/tests/inc/RegisteredUserTestCase.php b/tests/inc/RegisteredUserTestCase.php
@@ -29,7 +29,7 @@
  ------------------------------------------------------------------------------
 */
 
-use Glpi\test\CommonTestCase;
+use Glpi\Test\CommonTestCase;
 
 class RegisteredUserTestCase extends CommonTestCase
 {