Merge pull request #49 from mrsombre/fix-tests-on-win

 Fix tests for running on Windows host

Author: mrsombre

tests/ServerTest.php

@@ -7,22 +7,22 @@ class ServerTest extends TestCase
     public function testGetProtos()
     {
         $protos = static::$_client->server()->getProtos();
-        $this->assertInternalType('array', $protos);
+        $this->assertIsArray($protos);
         $this->assertContains('1.6.3.0', $protos);
     }
 
     public function testGetGenInfo()
     {
         $generalInfo = static::$_client->server()->getGeneralInfo();
         $this->assertGreaterThan(0, strlen($generalInfo->serverName));
-        $this->assertRegExp('/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/', $generalInfo->serverGuid);
+        $this->assertRegExp('/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/', strtolower($generalInfo->serverGuid));
         $this->assertEquals('standard', $generalInfo->mode);
     }
 
     public function testGetPreferences()
     {
         $preferences = static::$_client->server()->getPreferences();
-        $this->assertInternalType('integer', $preferences->statTtl);
+        $this->assertIsNumeric($preferences->statTtl);
         $this->assertGreaterThan(0, $preferences->statTtl);
         $this->assertEquals(0, $preferences->restartApacheInterval);
     }
@@ -37,7 +37,7 @@ public function testGetAdmin()
     public function testGetKeyInfo()
     {
         $keyInfo = static::$_client->server()->getKeyInfo();
-        $this->assertInternalType('array', $keyInfo);
+        $this->assertIsArray($keyInfo);
         $this->assertGreaterThan(0, count($keyInfo));
         $this->assertArrayHasKey('plesk_key_id', $keyInfo);
         $this->assertArrayHasKey('lim_date', $keyInfo);
@@ -46,70 +46,65 @@ public function testGetKeyInfo()
     public function testGetComponents()
     {
         $components = static::$_client->server()->getComponents();
-        $this->assertInternalType('array', $components);
+        $this->assertIsArray($components);
         $this->assertGreaterThan(0, count($components));
         $this->assertArrayHasKey('psa', $components);
-        $this->assertArrayHasKey('php', $components);
     }
 
     public function testGetServiceStates()
     {
         $serviceStates = static::$_client->server()->getServiceStates();
-        $this->assertInternalType('array', $serviceStates);
+
+        $this->assertIsArray($serviceStates);
         $this->assertGreaterThan(0, count($serviceStates));
-        $this->assertArrayHasKey('web', $serviceStates);
-
-        $webService = $serviceStates['web'];
-        $this->assertInternalType('array', $webService);
-        $this->assertArrayHasKey('id', $webService);
-        $this->assertArrayHasKey('title', $webService);
-        $this->assertArrayHasKey('state', $webService);
-        $this->assertEquals('running', $webService['state']);
+
+        $service = current($serviceStates);
+        $this->assertIsArray($service);
+        $this->assertArrayHasKey('id', $service);
+        $this->assertArrayHasKey('title', $service);
+        $this->assertArrayHasKey('state', $service);
     }
 
     public function testGetSessionPreferences()
     {
         $preferences = static::$_client->server()->getSessionPreferences();
-        $this->assertInternalType('integer', $preferences->loginTimeout);
+        $this->assertIsNumeric($preferences->loginTimeout);
         $this->assertGreaterThan(0, $preferences->loginTimeout);
     }
 
     public function testGetShells()
     {
         $shells = static::$_client->server()->getShells();
-        $this->assertInternalType('array', $shells);
-        $this->assertGreaterThan(0, count($shells));
-        $this->assertArrayHasKey('/bin/bash', $shells);
 
-        $bash = $shells['/bin/bash'];
-        $this->assertEquals('/bin/bash', $bash);
+        $this->assertIsArray($shells);
+        $this->assertGreaterThan(0, count($shells));
     }
 
     public function testGetNetworkInterfaces()
     {
         $netInterfaces = static::$_client->server()->getNetworkInterfaces();
-        $this->assertInternalType('array', $netInterfaces);
+        $this->assertIsArray($netInterfaces);
         $this->assertGreaterThan(0, count($netInterfaces));
     }
 
     public function testGetStatistics()
     {
         $stats = static::$_client->server()->getStatistics();
-        $this->assertInternalType('integer', $stats->objects->clients);
+        $this->assertIsNumeric($stats->objects->clients);
         $this->assertEquals('psa', $stats->version->internalName);
     }
 
     public function testGetSiteIsolationConfig()
     {
         $config = static::$_client->server()->getSiteIsolationConfig();
-        $this->assertInternalType('array', $config);
+        $this->assertIsArray($config);
         $this->assertGreaterThan(0, count($config));
         $this->assertArrayHasKey('php', $config);
     }
 
     public function testGetUpdatesInfo()
     {
         $updatesInfo = static::$_client->server()->getUpdatesInfo();
-        $this->assertInternalType('boolean', $updatesInfo->installUpdatesAutomatically);
+        $this->assertIsBool($updatesInfo->installUpdatesAutomatically);
     }
 }

tests/SiteTest.php

@@ -34,7 +34,7 @@ public function testCreate()
     {
         $site = $this->_createSite('addon.dom');
 
-        $this->assertInternalType('integer', $site->id);
+        $this->assertIsNumeric($site->id);
         $this->assertGreaterThan(0, $site->id);
 
         static::$_client->site()->delete('id', $site->id);
@@ -79,7 +79,7 @@ public function testGetHostingWithHosting()
 
         $siteHosting = static::$_client->site()->getHosting('id', $site->id);
         $this->assertArrayHasKey('www_root', $siteHosting->properties);
-        $this->assertEquals('addon.dom', basename($siteHosting->properties['www_root']));
+        $this->assertStringEndsWith('addon.dom', $siteHosting->properties['www_root']);
 
         static::$_client->site()->delete('id', $site->id);
     }