Skip to content
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

[sleepiq] Fix the failing tests on Windows #7983

Merged
merged 2 commits into from
Jun 23, 2020
Merged

[sleepiq] Fix the failing tests on Windows #7983

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b21bce7
[sleepiq] Fix the failing tests
lolodomo Jun 22, 2020
76a7c18
Rather use Files.readAllLines
lolodomo Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions ....binding.sleepiq/src/3rdparty/test/org/openhab/binding/sleepiq/api/test/AbstractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,14 @@
import java.util.Arrays;
import java.util.List;

public abstract class AbstractTest
{
public abstract class AbstractTest {
private static final String RESOURCES_PATH = "src/test/resources/";

protected File getTestDataFile(String name)
{
protected File getTestDataFile(String name) {
return getTestDataPath(name).toFile();
}

protected Path getTestDataPath(String name)
{
protected Path getTestDataPath(String name) {
String packageName = this.getClass().getPackage().getName();

List<String> paths = new ArrayList<>();
Expand All @@ -44,8 +41,7 @@ protected Path getTestDataPath(String name)
return Paths.get(RESOURCES_PATH, paths.toArray(new String[paths.size()]));
}

protected String readJson(String jsonFileName) throws IOException
{
return new String(Files.readAllBytes(getTestDataPath(jsonFileName)));
protected String readJson(String jsonFileName) throws IOException {
return String.join("\n", Files.readAllLines(getTestDataPath(jsonFileName)));
}
}