Skip to content

Commit 23c7a01

Browse files
Do not hard-code directory separator in fixture and expectation files for class view end-to-end test to make it pass on Windows
1 parent c491254 commit 23c7a01

5 files changed

Lines changed: 13 additions & 12 deletions

File tree

tests/_files/Report/HTML/CoverageForClassesWithTraitsAndInheritance/ChildClass.php.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8">
5-
<title>Code Coverage for %sClassView/ChildClass.php</title>
5+
<title>Code Coverage for %sClassView%eChildClass.php</title>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<link href="_css/bootstrap.min.css?v=%s" rel="stylesheet" type="text/css">
88
<link href="_css/octicons.css?v=%s" rel="stylesheet" type="text/css">

tests/_files/Report/HTML/CoverageForClassesWithTraitsAndInheritance/ExampleClass.php.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8">
5-
<title>Code Coverage for %sClassView/ExampleClass.php</title>
5+
<title>Code Coverage for %sClassView%eExampleClass.php</title>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<link href="_css/bootstrap.min.css?v=%s" rel="stylesheet" type="text/css">
88
<link href="_css/octicons.css?v=%s" rel="stylesheet" type="text/css">

tests/_files/Report/HTML/CoverageForClassesWithTraitsAndInheritance/ExampleTrait.php.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8">
5-
<title>Code Coverage for %sClassView/ExampleTrait.php</title>
5+
<title>Code Coverage for %sClassView%eExampleTrait.php</title>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<link href="_css/bootstrap.min.css?v=%s" rel="stylesheet" type="text/css">
88
<link href="_css/octicons.css?v=%s" rel="stylesheet" type="text/css">

tests/_files/Report/HTML/CoverageForClassesWithTraitsAndInheritance/ParentClass.php.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8">
5-
<title>Code Coverage for %sClassView/ParentClass.php</title>
5+
<title>Code Coverage for %sClassView%eParentClass.php</title>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<link href="_css/bootstrap.min.css?v=%s" rel="stylesheet" type="text/css">
88
<link href="_css/octicons.css?v=%s" rel="stylesheet" type="text/css">

tests/src/CoverageFixtureProvider.php

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*/
1010
namespace SebastianBergmann\CodeCoverage;
1111

12+
use const DIRECTORY_SEPARATOR;
1213
use BankAccount;
1314
use SebastianBergmann\CodeCoverage\Data\RawCodeCoverageData;
1415
use SebastianBergmann\CodeCoverage\Driver\Driver;
@@ -1227,10 +1228,10 @@ public function coverageForClassWithAnonymousFunction(): CodeCoverage
12271228
public function coverageForClassesWithTraitsAndInheritance(): CodeCoverage
12281229
{
12291230
$filter = new Filter;
1230-
$filter->includeFile(TEST_FILES_PATH . 'ClassView/ChildClass.php');
1231-
$filter->includeFile(TEST_FILES_PATH . 'ClassView/ExampleClass.php');
1232-
$filter->includeFile(TEST_FILES_PATH . 'ClassView/ExampleTrait.php');
1233-
$filter->includeFile(TEST_FILES_PATH . 'ClassView/ParentClass.php');
1231+
$filter->includeFile(TEST_FILES_PATH . 'ClassView' . DIRECTORY_SEPARATOR . 'ChildClass.php');
1232+
$filter->includeFile(TEST_FILES_PATH . 'ClassView' . DIRECTORY_SEPARATOR . 'ExampleClass.php');
1233+
$filter->includeFile(TEST_FILES_PATH . 'ClassView' . DIRECTORY_SEPARATOR . 'ExampleTrait.php');
1234+
$filter->includeFile(TEST_FILES_PATH . 'ClassView' . DIRECTORY_SEPARATOR . 'ParentClass.php');
12341235

12351236
$coverage = new CodeCoverage(
12361237
$this->xdebugFakeForClassesWithTraitsAndInheritance(),
@@ -1375,17 +1376,17 @@ private function xdebugFakeForClassesWithTraitsAndInheritance(): Driver
13751376
return new FakeDriver(
13761377
RawCodeCoverageData::fromXdebugWithoutPathCoverage(
13771378
[
1378-
TEST_FILES_PATH . 'ClassView/ChildClass.php' => [
1379+
TEST_FILES_PATH . 'ClassView' . DIRECTORY_SEPARATOR . 'ChildClass.php' => [
13791380
11 => 1,
13801381
],
1381-
TEST_FILES_PATH . 'ClassView/ExampleClass.php' => [
1382+
TEST_FILES_PATH . 'ClassView' . DIRECTORY_SEPARATOR . 'ExampleClass.php' => [
13821383
9 => 1,
13831384
14 => -1,
13841385
],
1385-
TEST_FILES_PATH . 'ClassView/ExampleTrait.php' => [
1386+
TEST_FILES_PATH . 'ClassView' . DIRECTORY_SEPARATOR . 'ExampleTrait.php' => [
13861387
9 => 1,
13871388
],
1388-
TEST_FILES_PATH . 'ClassView/ParentClass.php' => [
1389+
TEST_FILES_PATH . 'ClassView' . DIRECTORY_SEPARATOR . 'ParentClass.php' => [
13891390
9 => -1,
13901391
],
13911392
],

0 commit comments

Comments
 (0)