Fixed references to the new dirs (#839)

* Fix functional tests

* Fixed references to the new dirs

.gitignore

@@ -1,9 +1,6 @@
-build/api
-build/code-browser
-build/coverage
-build/logs
-build/pdepend
-build/phpdox
+bin/api
+bin/logs
+bin/coverage
 channel/
 *.tgz
 phpunit.xml

phpdoc.dist.xml

@@ -2,12 +2,12 @@
 <phpdoc>
   <title>Windows Azure SDK for PHP</title>
   <parser>
-    <target>build/api</target>
+    <target>bin/api</target>
   </parser>
   <transformer>
-    <target>build/api</target>
+    <target>bin/api</target>
   </transformer>
   <files>
     <directory>src/</directory>
   </files>
-</phpdoc>
+</phpdoc>

phpunit.functional.xml.dist

@@ -12,16 +12,16 @@
   </testsuites>
 
   <logging>
-    <log type="coverage-html" target="build/coverage" title="azure-sdk-for-php"
+    <log type="coverage-html" target="bin/coverage" title="azure-sdk-for-php"
          charset="UTF-8" yui="true" highlight="true"
          lowUpperBound="35" highLowerBound="70"/>
-    <log type="coverage-clover" target="build/logs/clover.xml"/>
-    <log type="junit" target="build/logs/functional.xml" logIncompleteSkipped="false"/>
+    <log type="coverage-clover" target="bin/logs/clover.xml"/>
+    <log type="junit" target="bin/logs/functional.xml" logIncompleteSkipped="false"/>
   </logging>
 
   <filter>
     <whitelist addUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">WindowsAzure</directory>
+      <directory suffix=".php">src</directory>
       <exclude>
         <file>src/WindowsAzure.php</file>
       </exclude>

phpunit.xml.dist

@@ -12,16 +12,16 @@
   </testsuites>
 
   <logging>
-    <log type="coverage-html" target="build/coverage" title="azure-sdk-for-php"
+    <log type="coverage-html" target="bin/coverage" title="azure-sdk-for-php"
          charset="UTF-8" yui="true" highlight="true"
          lowUpperBound="35" highLowerBound="70"/>
-    <log type="coverage-clover" target="build/logs/clover.xml"/>
-    <log type="junit" target="build/logs/unit.xml" logIncompleteSkipped="false"/>
+    <log type="coverage-clover" target="bin/logs/clover.xml"/>
+    <log type="junit" target="bin/logs/unit.xml" logIncompleteSkipped="false"/>
   </logging>
 
   <filter>
     <whitelist addUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">WindowsAzure</directory>
+      <directory suffix=".php">src</directory>
       <exclude>
         <file>src/WindowsAzure.php</file>
       </exclude>

tests/functional/WindowsAzure/MediaServices/MediaServicesFunctionalTest.php

@@ -532,7 +532,7 @@ class MediaServicesFunctionalTest extends MediaServicesRestProxyTestBase
         $result = $this->restProxy->getAccessPolicyList();
 
         // Assert
-        $this->assertEquals(2, count($result));
+        $this->assertGreaterThanOrEqual(2, count($result));
         $names = array(
                 $result[0]->getName(),
                 $result[1]->getName(),
@@ -699,7 +699,7 @@ class MediaServicesFunctionalTest extends MediaServicesRestProxyTestBase
         $access2->setDurationInMinutes(30);
 
         // Test
-       $access1 = $this->restProxy->createAccessPolicy($access1);
+        $access1 = $this->restProxy->createAccessPolicy($access1);
         $access2 = $this->restProxy->createAccessPolicy($access2);
 
         $result = $this->restProxy->getAccessPolicyList();
@@ -711,7 +711,7 @@ class MediaServicesFunctionalTest extends MediaServicesRestProxyTestBase
         $after = count($this->restProxy->getAccessPolicyList());
 
         // Assert
-        $this->assertEquals(2, $before);
+        $this->assertGreaterThanOrEqual(2, $before);
         $this->assertEquals(0, $after);
     }