Fix discoverymanager tests (#25769)

* Allow testing of the DiscoveryManager * Array sort order is of no relevance
bboule · Aug 11, 2016 · d2e2021 · d2e2021
1 parent 8f14dc2
commit d2e2021
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/apps/federatedfilesharing/lib/DiscoveryManager.php b/apps/federatedfilesharing/lib/DiscoveryManager.php
@@ -41,6 +41,8 @@ class DiscoveryManager {
 	private $cache;
 	/** @var IClient */
 	private $client;
+	/** @var bool */
+	public $underTest = false;
 
 	/**
 	 * @param ICacheFactory $cacheFactory
@@ -84,7 +86,7 @@ private function discover($remote) {
 			'share' => '/ocs/v1.php/cloud/shares',
 		];
 
-		if (defined('PHPUNIT_RUN')) {
+		if (defined('PHPUNIT_RUN') && !$this->underTest) {
 			return $discoveredServices;
 		}
 		// Read the data from the response body

diff --git a/apps/federatedfilesharing/tests/DiscoveryManagerTest.php b/apps/federatedfilesharing/tests/DiscoveryManagerTest.php
@@ -63,6 +63,7 @@ public function setUp() {
 			$cacheFactory,
 			$clientService
 		);
+		$this->discoveryManager->underTest = true;
 	}
 
 	public function testWithMalformedFormattedEndpointCached() {

diff --git a/tests/lib/SystemTag/SystemTagObjectMapperTest.php b/tests/lib/SystemTag/SystemTagObjectMapperTest.php
@@ -151,7 +151,7 @@ public function testGetObjectsForTags() {
 		$this->assertEquals([
 			'1',
 			'2',
-		], $objectIds);
+		], $objectIds, '', 0.0, 10, true);
 	}
 
 	public function testGetObjectsForTagsLimit() {