Fix PHPUnit unit and integration tests

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>

.gitignore

@@ -8,6 +8,7 @@ css/*.map
 js/*
 nbproject/
 node_modules/
+tests/.phpunit.result.cache
 npm-debug.log
 vendor
 Thumbs.db

tests/Integration/App/AppTest.php

@@ -21,7 +21,7 @@
  *
  */
 
-namespace OCA\Polls\Tests\Integration;
+namespace OCA\Polls\Tests\Integration\App;
 
 use OCP\AppFramework\App;
 use PHPUnit\Framework\TestCase;

tests/phpunit.integration.xml

@@ -1,12 +1,12 @@
 <phpunit bootstrap="bootstrap.php" colors="true">
-	<testsuites>
-		<testsuite name="integration-app">
-			<directory>Integration/app</directory>
-		</testsuite>
-	</testsuites>
 	<filter>
 		<whitelist>
-			<directory suffix=".php">./../lib</directory>
+			<directory suffix=".php">../lib</directory>
 		</whitelist>
 	</filter>
+	<testsuites>
+		<testsuite name="integration">
+			<directory>./Integration</directory>
+		</testsuite>
+	</testsuites>
 </phpunit>

tests/phpunit.xml

@@ -1,7 +1,7 @@
-<phpunit bootstrap="./bootstrap.php" colors="true">
+<phpunit bootstrap="bootstrap.php" colors="true">
     <filter>
         <whitelist>
-            <directory suffix=".php">lib</directory>
+            <directory suffix=".php">../lib</directory>
         </whitelist>
     </filter>
     <testsuites>