fix tests relative to changes in 37a0e50

orthagh · Sep 15, 2016 · 10558a1 · 10558a1
1 parent 37a0e50
commit 10558a1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/tests/API/APIRestTest.php b/tests/API/APIRestTest.php
@@ -147,7 +147,8 @@ public function testGetMyEntities($session_token) {
       $body = $res->getBody();
       $data = json_decode($body, true);
       $this->assertNotEquals(false, $data);
-      $this->assertArrayHasKey(0, $data); // check presence of root entity
+      $this->assertArrayHasKey('id', $data[0]); // check presence of first entity
+      $this->assertEquals(0, $data[0]['id']); // check presence of root entity
    }
 
 
@@ -165,9 +166,10 @@ public function testGetActiveEntities($session_token) {
       $data = json_decode($body, true);
       $this->assertNotEquals(false, $data);
       $this->assertArrayHasKey('active_entity', $data);
-      $this->assertArrayHasKey('active_entity_recursive', $data);
-      $this->assertArrayHasKey('active_entities', $data);
-      $this->assertTrue(is_array($data['active_entities']), $data);
+      $this->assertArrayHasKey('id', $data['active_entity']);
+      $this->assertArrayHasKey('active_entity_recursive', $data['active_entity']);
+      $this->assertArrayHasKey('active_entities', $data['active_entity']);
+      $this->assertTrue(is_array($data['active_entity']['active_entities']));
    }
 
 
@@ -198,7 +200,8 @@ public function testGetMyProfiles($session_token) {
       $body = $res->getBody();
       $data = json_decode($body, true);
       $this->assertNotEquals(false, $data);
-      $this->assertArrayHasKey(4, $data);  // check presence of super-admin profile
+      $this->assertArrayHasKey('myprofiles', $data);  // check presence of root key
+      $this->assertArrayHasKey('id', $data['myprofiles'][0]);  // check presence of id key in first entity
    }
 
 

diff --git a/tests/API/APIXmlrpcTest.php b/tests/API/APIXmlrpcTest.php
@@ -115,9 +115,10 @@ public function testGetActiveEntities($session_token) {
       $data = xmlrpc_decode($res->getBody());
       $this->assertNotEquals(false, $data);
       $this->assertArrayHasKey('active_entity', $data);
-      $this->assertArrayHasKey('active_entity_recursive', $data);
-      $this->assertArrayHasKey('active_entities', $data);
-      $this->assertTrue(is_array($data['active_entities']), $data);
+      $this->assertArrayHasKey('id', $data['active_entity']);
+      $this->assertArrayHasKey('active_entity_recursive', $data['active_entity']);
+      $this->assertArrayHasKey('active_entities', $data['active_entity']);
+      $this->assertTrue(is_array($data['active_entity']['active_entities']));
    }
 
 
@@ -140,7 +141,9 @@ public function testGetMyProfiles($session_token) {
 
       $data = xmlrpc_decode($res->getBody());
       $this->assertNotEquals(false, $data);
-      $this->assertArrayHasKey(4, $data);  // check presence of super-admin profile
+      $this->assertNotEquals(false, $data);
+      $this->assertArrayHasKey('myprofiles', $data);  // check presence of root key
+      $this->assertArrayHasKey('id', $data['myprofiles'][0]);  // check presence of id key in first entity
    }