Projet

Général

Profil

Révision bc175c27

Ajouté par Assos Assos il y a plus de 5 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/ldap/ldap_servers/tests/ldap_servers.test
5 5
 * simpletest for ldap servers
6 6
 */
7 7

  
8

  
9 8
if (function_exists('ldap_servers_module_load_include')) {
10 9
  ldap_servers_module_load_include('php', 'ldap_test', 'LdapTestCase.class');
11 10
}
......
98 97

  
99 98
        // test parent function groupMembershipsFromUser
100 99
        $groups = $ldap_server->groupMembershipsFromUser($ldap_module_user_entry, 'group_dns', $nested);
101
        $count =  count($groups);
100
        $count = count($groups);
102 101
        $diff1 = array_diff($groups_desired, $groups);
103 102
        $diff2 = array_diff($groups, $groups_desired);
104 103
        $pass = (count($diff1) == 0 && count($diff2) == 0 && $count == $desired_count);
......
181 180
    $this->assertTrue( $house0 == $ldap_entry['house'][0], t("[house:0] token worked ($house0) on ldap_servers_token_replace()."), $this->ldapTestId);
182 181

  
183 182
    $mixed = ldap_servers_token_replace($ldap_entry, 'thisold[house:0]');
184
    $this->assertTrue( $mixed  == 'thisold' . $ldap_entry['house'][0], t("thisold[house:0] token worked ($mixed) on ldap_servers_token_replace()."), $this->ldapTestId);
183
    $this->assertTrue( $mixed == 'thisold' . $ldap_entry['house'][0], t("thisold[house:0] token worked ($mixed) on ldap_servers_token_replace()."), $this->ldapTestId);
185 184

  
186 185
    $compound = ldap_servers_token_replace($ldap_entry, '[samaccountname:0][house:0]');
187 186
    $this->assertTrue( $compound == $ldap_entry['sAMAccountName'][0] . $ldap_entry['house'][0], t("[samaccountname:0][house:0] compound token worked ($mixed) on ldap_servers_token_replace()."), $this->ldapTestId);
......
317 316
      $field_to_prop_map = LdapServer::field_to_properties_map();
318 317
      $field_to_prop_map['bindpw'] = 'bindpw';
319 318
      $ldap_servers = ldap_servers_get_servers(NULL, 'all', FALSE, TRUE);
320
      $this->assertTrue(count(array_keys($ldap_servers)) == 1, 'Add form for ldap server added server.',  $this->ldapTestId . ' Add Server');
321
      $this->assertText('LDAP Server Server server1 added', 'Add form confirmation message',  $this->ldapTestId . ' Add Server');
319
      $this->assertTrue(count(array_keys($ldap_servers)) == 1, 'Add form for ldap server added server.', $this->ldapTestId . ' Add Server');
320
      $this->assertText('LDAP Server Server server1 added', 'Add form confirmation message', $this->ldapTestId . ' Add Server');
322 321
      // assert one ldap server exists in db table
323 322

  
324 323
      // assert load of server has correct properties for each input
......
329 328
        debug($ldap_servers);
330 329
        debug($server_data['server1']);
331 330
      }
332
      $this->assertTrue(count($mismatches) == 0, 'Add form for ldap server properties match values submitted.',  $this->ldapTestId . ' Add Server');
331
      $this->assertTrue(count($mismatches) == 0, 'Add form for ldap server properties match values submitted.', $this->ldapTestId . ' Add Server');
333 332

  
334 333

  
335 334
      /** update server conf test **/
......
346 345
      unset($edit['sid']);
347 346
      $this->drupalPost('admin/config/people/ldap/servers/edit/server1', $edit, t('Update'));
348 347
      $ldap_servers = ldap_servers_get_servers(NULL, 'all', FALSE, TRUE);
349
      $this->assertTrue(count(array_keys($ldap_servers)) == 1, 'Update form for ldap server didnt delete or add another server.',  $this->ldapTestId . '.Update Server');
348
      $this->assertTrue(count(array_keys($ldap_servers)) == 1, 'Update form for ldap server didnt delete or add another server.', $this->ldapTestId . '.Update Server');
350 349
      // assert confirmation message without error
351 350
      // assert one ldap server exists in db table
352 351
      // assert load of server has correct properties for each input
......
355 354
      if (count($mismatches)) {
356 355
        debug('mismatches between ldap server properties and form submitted values'); debug($mismatches);
357 356
      }
358
      $this->assertTrue(count($mismatches) == 0, 'Update form for ldap server properties match values submitted.',  $this->ldapTestId . '.Update Server');
357
      $this->assertTrue(count($mismatches) == 0, 'Update form for ldap server properties match values submitted.', $this->ldapTestId . '.Update Server');
359 358

  
360 359
      /** delete server conf test **/
361 360
      $this->drupalGet('admin/config/people/ldap/servers/delete/server1');
......
363 362

  
364 363
      $ldap_servers = ldap_servers_get_servers(NULL, 'all', FALSE, TRUE);
365 364

  
366
      $this->assertTrue(count(array_keys($ldap_servers)) == 0, 'Delete form for ldap server deleted server.',  $this->ldapTestId . '.Delete Server');
365
      $this->assertTrue(count(array_keys($ldap_servers)) == 0, 'Delete form for ldap server deleted server.', $this->ldapTestId . '.Delete Server');
367 366

  
368 367
      variable_set('ldap_simpletest', $ldap_simpletest_initial); // return to fake server mode
369 368
    }

Formats disponibles : Unified diff