demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[networkupstools] Fix NutApiTest failing on Windows (#12564)

Browse Source 
On Windows the PrintWriter used in the NutConnector adds different line endings causing some tests to fail.

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born 2022-04-03 11:12:32 +02:00 committed by GitHub
parent 0f56369b2a
commit 79245b5d89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bundles/org.openhab.binding.networkupstools/src/test/java/org/openhab/binding/networkupstools/internal/nut/NutApiTest.java
View File

@ -24,6 +24,7 @@ import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Map;
import java.util.stream.Collectors;
import org.eclipse.jdt.annotation.NonNull;
import org.junit.jupiter.api.BeforeEach;
@ -49,7 +50,7 @@ public class NutApiTest {
@Override
protected Socket newSocket() {
return socket;
};
}
};
}
@ -58,9 +59,10 @@ public class NutApiTest {
*/
@Test
public void testListVariables() throws IOException, NutException, URISyntaxException {
final String expectedCommands = new String(
Files.readAllBytes(Paths.get(getClass().getResource("var_list_commands.txt").toURI())));
final StringBuffer actualCommands = new StringBuffer();
final String expectedCommands = Files
.readAllLines(Paths.get(getClass().getResource("var_list_commands.txt").toURI())).stream()
.collect(Collectors.joining(System.lineSeparator()));
final StringBuilder actualCommands = new StringBuilder();
try (InputStream in = getClass().getResourceAsStream("var_list.txt"); OutputStream out = new OutputStream() {
@Override
public void write(int b) throws IOException {
@ -84,9 +86,10 @@ public class NutApiTest {
*/
@Test
public void testGetVariable() throws IOException, NutException, URISyntaxException {
final String expectedCommands = new String(
Files.readAllBytes(Paths.get(getClass().getResource("var_get_commands.txt").toURI())));
final StringBuffer actualCommands = new StringBuffer();
final String expectedCommands = Files
.readAllLines(Paths.get(getClass().getResource("var_get_commands.txt").toURI())).stream()
.collect(Collectors.joining(System.lineSeparator()));
final StringBuilder actualCommands = new StringBuilder();
try (InputStream in = getClass().getResourceAsStream("var_get.txt"); OutputStream out = new OutputStream() {
@Override
public void write(int b) throws IOException {

1
bundles/org.openhab.binding.networkupstools/src/test/resources/org/openhab/binding/networkupstools/internal/nut/var_get_commands.txt
View File

@ -1,3 +1,4 @@
USERNAME test
PASSWORD pwd
GET VAR ups1 ups.status

1
bundles/org.openhab.binding.networkupstools/src/test/resources/org/openhab/binding/networkupstools/internal/nut/var_list_commands.txt
View File

@ -1,3 +1,4 @@
USERNAME test
PASSWORD pwd
LIST VAR ups1