Skip to content

Commit 9330c7f

Browse files
authored
Merge pull request #1376 from nextcloud/fix/tests-execute
fix: Don't use deprecated method Job#execute()
2 parents 3a81b99 + 91b95ed commit 9330c7f

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

tests/ClassifierTest.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public function testSchedulerJob() : void {
111111

112112
$scheduler->setId(1);
113113
$scheduler->setLastRun(0);
114-
$scheduler->execute($this->jobList);
114+
$scheduler->start($this->jobList);
115115

116116
$storageId = $this->testFile->getMountPoint()->getNumericStorageId();
117117
$rootId = $this->testFile->getMountPoint()->getStorageRootId();
@@ -324,7 +324,7 @@ public function testImagenetPipeline(string $ignoreFileName) : void {
324324
]);
325325
$crawler->setId(1);
326326
$crawler->setLastRun(0);
327-
$crawler->execute($this->jobList);
327+
$crawler->start($this->jobList);
328328

329329
// clean up
330330
$this->jobList->remove(StorageCrawlJob::class);
@@ -339,7 +339,7 @@ public function testImagenetPipeline(string $ignoreFileName) : void {
339339
'imagenet queue should contain exactly one image');
340340

341341
list($classifier) = $this->jobList->getJobs(ClassifyImagenetJob::class, 1, 0);
342-
$classifier->execute($this->jobList);
342+
$classifier->start($this->jobList);
343343

344344
/** @var \OCP\SystemTag\ISystemTagObjectMapper $objectMapper */
345345
$objectMapper = \OC::$server->get(ISystemTagObjectMapper::class);
@@ -397,7 +397,7 @@ public function testLandmarksPipeline() : void {
397397
]);
398398
$crawler->setId(1);
399399
$crawler->setLastRun(0);
400-
$crawler->execute($this->jobList);
400+
$crawler->start($this->jobList);
401401

402402
// clean up
403403
$this->jobList->remove(StorageCrawlJob::class);
@@ -415,7 +415,7 @@ public function testLandmarksPipeline() : void {
415415
'imagenet queue should contain image');
416416

417417
list($classifier, ) = $this->jobList->getJobs(ClassifyImagenetJob::class, 1, 0);
418-
$classifier->execute($this->jobList);
418+
$classifier->start($this->jobList);
419419

420420
self::assertTrue($this->jobList->has(ClassifyLandmarksJob::class, [
421421
'storageId' => $storageId,
@@ -427,7 +427,7 @@ public function testLandmarksPipeline() : void {
427427
'landmarks queue should contain image');
428428

429429
list($classifier, ) = $this->jobList->getJobs(ClassifyLandmarksJob::class, 1, 0);
430-
$classifier->execute($this->jobList);
430+
$classifier->start($this->jobList);
431431

432432
/** @var \OCP\SystemTag\ISystemTagObjectMapper $objectMapper */
433433
$objectMapper = \OC::$server->get(ISystemTagObjectMapper::class);
@@ -483,11 +483,11 @@ public function testFacesPipeline() : void {
483483
]);
484484
$crawler->setId(1);
485485
$crawler->setLastRun(0);
486-
$crawler->execute($this->jobList);
486+
$crawler->start($this->jobList);
487487

488488
while (count($jobs = $this->jobList->getJobs(StorageCrawlJob::class, 1, 0)) > 0) {
489489
list($crawler) = $jobs;
490-
$crawler->execute($this->jobList);
490+
$crawler->start($this->jobList);
491491
}
492492

493493
self::assertTrue($this->jobList->has(ClassifyFacesJob::class, [
@@ -500,7 +500,7 @@ public function testFacesPipeline() : void {
500500
'faces queue should contain images');
501501

502502
list($classifier, ) = $this->jobList->getJobs(ClassifyFacesJob::class, 1, 0);
503-
$classifier->execute($this->jobList);
503+
$classifier->start($this->jobList);
504504

505505
self::assertGreaterThan(10,
506506
count($this->faceDetectionMapper->findByUserId(self::TEST_USER1)),
@@ -511,7 +511,7 @@ public function testFacesPipeline() : void {
511511
]), 'ClusterFacesJob should have been scheduled');
512512

513513
list($clusterer, ) = $this->jobList->getJobs(ClusterFacesJob::class, 1, 0);
514-
$clusterer->execute($this->jobList);
514+
$clusterer->start($this->jobList);
515515

516516
/** @var FaceClusterMapper $clusterMapper */
517517
$clusterMapper = \OC::$server->get(FaceClusterMapper::class);
@@ -581,11 +581,11 @@ public function testMovinetPipeline(string $ignoreFileName) : void {
581581
]);
582582
$crawler->setId(1);
583583
$crawler->setLastRun(0);
584-
$crawler->execute($this->jobList);
584+
$crawler->start($this->jobList);
585585

586586
while (count($jobs = $this->jobList->getJobs(StorageCrawlJob::class, 1, 0)) > 0) {
587587
list($crawler) = $jobs;
588-
$crawler->execute($this->jobList);
588+
$crawler->start($this->jobList);
589589
}
590590

591591
self::assertTrue($this->jobList->has(ClassifyMovinetJob::class, [
@@ -598,7 +598,7 @@ public function testMovinetPipeline(string $ignoreFileName) : void {
598598
'movinet queue should contain exactly one entry');
599599

600600
list($classifier) = $this->jobList->getJobs(ClassifyMovinetJob::class, 1, 0);
601-
$classifier->execute($this->jobList);
601+
$classifier->start($this->jobList);
602602

603603
/** @var \OCP\SystemTag\ISystemTagObjectMapper $objectMapper */
604604
$objectMapper = \OC::$server->get(ISystemTagObjectMapper::class);
@@ -665,11 +665,11 @@ public function testMusicnnPipeline(string $ignoreFileName) : void {
665665
]);
666666
$crawler->setId(1);
667667
$crawler->setLastRun(0);
668-
$crawler->execute($this->jobList);
668+
$crawler->start($this->jobList);
669669

670670
while (count($jobs = $this->jobList->getJobs(StorageCrawlJob::class, 1, 0)) > 0) {
671671
list($crawler) = $jobs;
672-
$crawler->execute($this->jobList);
672+
$crawler->start($this->jobList);
673673
}
674674

675675
self::assertTrue($this->jobList->has(ClassifyMusicnnJob::class, [
@@ -682,7 +682,7 @@ public function testMusicnnPipeline(string $ignoreFileName) : void {
682682
'movinet queue should contain exactly one entry');
683683

684684
list($classifier) = $this->jobList->getJobs(ClassifyMusicnnJob::class, 1, 0);
685-
$classifier->execute($this->jobList);
685+
$classifier->start($this->jobList);
686686

687687
/** @var \OCP\SystemTag\ISystemTagObjectMapper $objectMapper */
688688
$objectMapper = \OC::$server->get(ISystemTagObjectMapper::class);

0 commit comments

Comments
 (0)