Merge pull request #160 from catalyst/MOODLE_404_STABLE-issue151

Issue #151: Resolved unit tests for Moodle 5.1 and 4.5+

Author: micoreyes

tests/esrequest_test.php

@@ -93,10 +93,10 @@ public function tearDown(): void {
      * The GuzzleHttp exception is no longer be throwed
      */
     public function test_get_unreachable_host(): void {
-        $this->expectException(\GuzzleHttp\Exception\ConnectException::class);
         $url = 'http://unreachable:9020';
         $client = new \search_elastic\esrequest();
         $response = $client->get($url);
+        $this->assertEquals(503, $response->getStatusCode());
     }
 
     /**

tests/local/chunking/fixed_size_test.php

@@ -107,9 +107,9 @@ public static function chunk_overlap_provider(): array {
      * @dataProvider chunk_overlap_provider
      * @param int $maxsize
      * @param int $overlap
-     * @param int $exceptednumchunks
+     * @param int $expectednumchunks
      */
-    public function test_chunk_with_overlap(int $maxsize, int $overlap, int $exceptednumchunks): void {
+    public function test_chunk_with_overlap(int $maxsize, int $overlap, int $expectednumchunks): void {
         $rec = new stdClass();
         $rec->content = <<<EOF
         Lorem Ipsum is simply dummy text of the printing and typesetting industry.
@@ -128,11 +128,12 @@ public function test_chunk_with_overlap(int $maxsize, int $overlap, int $excepte
         $options = [
             'maxsize' => $maxsize,
             'overlap' => $overlap,
+            'expectednumchunks' => $expectednumchunks,
         ];
 
         $chunkingstrategy = new fixed_size();
         $chunks = $chunkingstrategy->chunk($docdata['content'], $options);
-        $this->assertCount($exceptednumchunks, $chunks);
+        $this->assertCount($expectednumchunks, $chunks);
 
         // Last chunk should include end of text.
         $lastchunk = $chunks[count($chunks) - 1]['text'];

tests/server_ready_check_test.php

@@ -66,10 +66,10 @@ public static function server_ready_provider(): array {
      * Tests check result.
      *
      * @param string $hostname
-     * @param string $expectedstatus
+     * @param string $status
      * @dataProvider server_ready_provider
      */
-    public function test_check(string $hostname, string $expectedstatus): void {
+    public function test_check(string $hostname, string $status): void {
         $this->resetAfterTest();
         set_config('hostname', $hostname, 'search_elastic');
 
@@ -86,7 +86,7 @@ public function test_check(string $hostname, string $expectedstatus): void {
 
         $check = new server_ready_check($stack);
         $result = $check->get_result();
-        $this->assertEquals($expectedstatus, $result->get_status());
+        $this->assertEquals($status, $result->get_status());
     }
 
     /**