Skip to content

Fix unit-test cross-OS glitches #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 11, 2019
Merged

Fix unit-test cross-OS glitches #8

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b72d4cb
Introduce assertSamePath() helper to handle cross-OS paths comparison
staabm Nov 10, 2019
348143f
revert changes to CommandHelperTest
staabm Nov 10, 2019
84c2bff
try this->getFileHelper()->normalizePath() instead of str_replace()
staabm Nov 11, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
try this->getFileHelper()->normalizePath() instead of str_replace()
  • Loading branch information
@staabm
staabm authored Nov 11, 2019
commit 84c2bff997d02ecab2b6d797a4066f3267af73d9
4 changes: 2 additions & 2 deletions src/Testing/TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,8 @@ public function getFileHelper(): FileHelper
*/
protected function assertSamePaths(string $expected, string $actual, string $message = ''): void
Copy link
Contributor Author

@staabm staabm Nov 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I put his helper in the base-class because I guess it can be re-used to fix a few of the remaining 6 windows-only testsuite errors
Copy link
Member

@ondrejmirtes ondrejmirtes Nov 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with that, but try using FileHelper instead of str_replace.
Copy link
Member

@ondrejmirtes ondrejmirtes Nov 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it doesn't succeed, I'm gonna merge this as it is.
Copy link
Contributor

@clxmstaab clxmstaab Nov 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

using normalizePath will make the test error on windows travis CI
Copy link
Member

@ondrejmirtes ondrejmirtes Nov 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like it passes.
{
$expected = str_replace('/', DIRECTORY_SEPARATOR, $expected);
$actual = str_replace('/', DIRECTORY_SEPARATOR, $actual);
$expected = $this->getFileHelper()->normalizePath($expected);
$actual = $this->getFileHelper()->normalizePath($actual);

$this->assertSame($expected, $actual, $message);
}
Expand Down