Migrate tests to JUnit 5 (#8519)

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2020-09-21 18:21:26 +02:00
committed by GitHub
parent 6df6783b60
commit bd82ca82df
478 changed files with 3996 additions and 4419 deletions

View File

@@ -12,7 +12,7 @@
*/
package org.openhab.binding.loxone.internal.controls;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.*;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -20,8 +20,8 @@ import java.time.ZonedDateTime;
import java.util.HashMap;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.DateTimeType;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType;
@@ -50,7 +50,7 @@ public class LxControlAlarmNoPresenceTest extends LxControlTest {
private static final String numberChannels[] = { NEXT_LEVEL_CHANNEL, NEXT_LEVEL_DELAY_CHANNEL,
NEXT_LEVEL_DELAY_TOTAL_CHANNEL, LEVEL_CHANNEL, ARMED_DELAY_CHANNEL, ARMED_TOTAL_DELAY_CHANNEL };
@Before
@BeforeEach
public void setup() {
setupControl("233d5db0-0333-5865-ffff403fb0c34b9e", "0b734138-037d-034e-ffff403fb0c34b9e",
"0fe650c2-0004-d446-ffff504f9410790f", "Burglar Alarm No Presence");

View File

@@ -12,8 +12,8 @@
*/
package org.openhab.binding.loxone.internal.controls;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.OnOffType;
/**
@@ -26,7 +26,7 @@ public class LxControlAlarmWithPresenceTest extends LxControlAlarmNoPresenceTest
private static final String MOTION_SENSORS_CHANNEL = " / Motion Sensors";
@Override
@Before
@BeforeEach
public void setup() {
setupControl("133d5db0-0333-5865-ffff403fb0c34b9e", "0b734138-037d-034e-ffff403fb0c34b9e",
"0fe650c2-0004-d446-ffff504f9410790f", "Burglar Alarm With Presence");

View File

@@ -12,8 +12,8 @@
*/
package org.openhab.binding.loxone.internal.controls;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.IncreaseDecreaseType;
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.PercentType;
@@ -26,7 +26,7 @@ import org.openhab.core.library.types.StopMoveType;
*
*/
public class LxControlDimmerTest extends LxControlTest {
@Before
@BeforeEach
public void setup() {
setupControl("131b19cd-03c0-640f-ffff403fb0c34b9e", "0b734138-037d-034e-ffff403fb0c34b9e",
"0fe650c2-0004-d446-ffff504f9410790f", "Dimmer Control");

View File

@@ -15,8 +15,8 @@ package org.openhab.binding.loxone.internal.controls;
import java.util.HashSet;
import java.util.Set;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType;
@@ -41,7 +41,7 @@ public class LxControlIRoomControllerV2Test extends LxControlTest {
private static final String FROST_PROTECT_TEMPERATURE_CHANNEL = "/ Frost Protect Temperature";
private static final String HEAT_PROTECT_TEMPERATURE_CHANNEL = "/ Heat Protect Temperature";
@Before
@BeforeEach
public void setup() {
setupControl("14328f8a-21c9-7c0d-ffff403fb0c34b9e", "0b734138-037d-034e-ffff403fb0c34b9e",
"0fe650c2-0004-d446-ffff504f9410790f", "Intelligent Room Controller");

View File

@@ -14,8 +14,8 @@ package org.openhab.binding.loxone.internal.controls;
import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/**
* Test class for (@link LxControlInfoOnlyAnalog} - check tags for temperature category
@@ -24,7 +24,7 @@ import org.junit.Test;
*
*/
public class LxControlInfoOnlyAnalogTempTagTest extends LxControlTest {
@Before
@BeforeEach
public void setup() {
setupControl("0fec5dc3-003e-8800-ffff555fb0c34b9e", "0fe3a451-0283-2afa-ffff403fb0c34b9e",
"0fb99a98-02df-46f1-ffff403fb0c34b9e", "Info Only Analog Temperature");

View File

@@ -12,8 +12,8 @@
*/
package org.openhab.binding.loxone.internal.controls;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.types.UnDefType;
@@ -24,7 +24,7 @@ import org.openhab.core.types.UnDefType;
*
*/
public class LxControlInfoOnlyAnalogTest extends LxControlTest {
@Before
@BeforeEach
public void setup() {
setupControl("0fec5dc3-003e-8800-ffff403fb0c34b9e", "0fe3a451-0283-2afa-ffff403fb0c34b9e",
"0fe665f4-0161-4773-ffff403fb0c34b9e", "Info Only Analog");

View File

@@ -12,8 +12,8 @@
*/
package org.openhab.binding.loxone.internal.controls;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.types.UnDefType;
@@ -24,7 +24,7 @@ import org.openhab.core.types.UnDefType;
*
*/
public class LxControlInfoOnlyDigitalTest extends LxControlTest {
@Before
@BeforeEach
public void setup() {
setupControl("101b50f7-0306-98fb-ffff403fb0c34b9e", "0e368d32-014f-4604-ffff403fb0c34b9e",
"101b563d-0302-78bd-ffff403fb0c34b9e", "Info Only Digital");

View File

@@ -15,8 +15,8 @@ package org.openhab.binding.loxone.internal.controls;
import java.util.Collections;
import java.util.Set;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.PercentType;
@@ -35,7 +35,7 @@ public class LxControlJalousieTest extends LxControlTest {
private static final String SHADE_CHANNEL = " / Shade";
private static final String AUTO_SHADE_CHANNEL = " / Auto Shade";
@Before
@BeforeEach
public void setup() {
setupControl("0e367c09-0161-e2c1-ffff403fb0c34b9e", "0e368d32-014f-4604-ffff403fb0c34b9e",
"0b734138-033e-02d8-ffff403fb0c34b9e", "Window Blinds");

View File

@@ -12,7 +12,7 @@
*/
package org.openhab.binding.loxone.internal.controls;
import org.junit.Before;
import org.junit.jupiter.api.BeforeEach;
/**
* Test class for (@link LxControlLeftRightAnalog}
@@ -22,7 +22,7 @@ import org.junit.Before;
*/
public class LxControlLeftRightAnalogTest extends LxControlUpDownAnalogTest {
@Override
@Before
@BeforeEach
public void setup() {
min = 1072.123;
max = 1123.458;

View File

@@ -12,8 +12,8 @@
*/
package org.openhab.binding.loxone.internal.controls;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/**
* Test class for (@link LxControlLeftRightDigital}
@@ -23,7 +23,7 @@ import org.junit.Test;
*/
public class LxControlLeftRightDigitalTest extends LxControlUpDownDigitalTest {
@Override
@Before
@BeforeEach
public void setup() {
upChannel = " / Left";
downChannel = " / Right";

View File

@@ -13,7 +13,8 @@
package org.openhab.binding.loxone.internal.controls;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.*;
import java.io.BufferedReader;
import java.io.InputStream;
@@ -24,8 +25,8 @@ import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.binding.loxone.internal.types.LxUuid;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType;
@@ -40,7 +41,7 @@ import org.openhab.core.types.UnDefType;
*
*/
public class LxControlLightControllerV2Test extends LxControlTest {
@Before
@BeforeEach
public void setup() {
setupControl("1076668f-0101-7076-ffff403fb0c34b9e", "0b734138-03ac-03f0-ffff403fb0c34b9e",
"0b734138-033e-02d4-ffff403fb0c34b9e", "Lighting controller");

View File

@@ -12,8 +12,8 @@
*/
package org.openhab.binding.loxone.internal.controls;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType;
@@ -28,7 +28,7 @@ public class LxControlMeterTest extends LxControlTest {
private static final String TOTAL_VALUE_CHANNEL = " / Total";
private static final String RESET_CHANNEL = " / Reset";
@Before
@BeforeEach
public void setup() {
setupControl("13b3ea27-00fc-6f1b-ffff403fb0c34b9e", "0b734138-037d-034e-ffff403fb0c34b9e",
"0fe650c2-0004-d446-ffff504f9410790f", "Energy Meter");

View File

@@ -14,8 +14,8 @@ package org.openhab.binding.loxone.internal.controls;
import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.StringType;
@@ -28,7 +28,7 @@ import org.openhab.core.library.types.StringType;
*/
public class LxControlPushbuttonTest extends LxControlSwitchTest {
@Override
@Before
@BeforeEach
public void setup() {
setupControl("0e3684cc-026e-28e0-ffff403fb0c34b9e", "0b734138-038c-035e-ffff403fb0c34b9e",
"0b734138-033e-02d8-ffff403fb0c34b9e", "Kitchen All Blinds Up");

View File

@@ -16,8 +16,8 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.PercentType;
@@ -30,7 +30,7 @@ import org.openhab.core.types.StateOption;
*
*/
public class LxControlRadioTest extends LxControlTest {
@Before
@BeforeEach
public void setup() {
setupControl("4255054f-0355-af47-ffff403fb0c34b9e", "11d68cf4-0080-7697-ffff403fb0c34b9e",
"0fe650c2-0004-d446-ffff504f9410790f", "Sprinkler 1");

View File

@@ -16,8 +16,8 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.types.StateOption;
@@ -30,7 +30,7 @@ import org.openhab.core.types.StateOption;
*/
public class LxControlRadioTest2 extends LxControlRadioTest {
@Override
@Before
@BeforeEach
public void setup() {
setupControl("1255054f-0355-af47-ffff403fb0c34b9e", "11d68cf4-0080-7697-ffff403fb0c34b9e",
"0fe650c2-0004-d446-ffff504f9410790f", "Sprinkler 2");

View File

@@ -12,8 +12,8 @@
*/
package org.openhab.binding.loxone.internal.controls;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/**
* Test class for (@link LxControlSlider} - this is actually the same control as up down analog
@@ -23,7 +23,7 @@ import org.junit.Test;
*/
public class LxControlSliderTest extends LxControlUpDownAnalogTest {
@Override
@Before
@BeforeEach
public void setup() {
min = 120.0;
max = 450.0;

View File

@@ -14,8 +14,8 @@ package org.openhab.binding.loxone.internal.controls;
import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.StringType;
@@ -28,7 +28,7 @@ import org.openhab.core.types.UnDefType;
*
*/
public class LxControlSwitchTest extends LxControlTest {
@Before
@BeforeEach
public void setup() {
setupControl("0f2f6b5d-0349-83b1-ffff403fb0c34b9e", "0b734138-038c-0382-ffff403fb0c34b9e",
"0b734138-033e-02d4-ffff403fb0c34b9e", "Switch Button");

View File

@@ -12,8 +12,9 @@
*/
package org.openhab.binding.loxone.internal.controls;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.junit.jupiter.api.Assertions.*;
import java.io.IOException;
import java.lang.reflect.Type;

View File

@@ -12,8 +12,8 @@
*/
package org.openhab.binding.loxone.internal.controls;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.StringType;
/**
@@ -23,7 +23,7 @@ import org.openhab.core.library.types.StringType;
*
*/
public class LxControlTextStateTest extends LxControlTest {
@Before
@BeforeEach
public void setup() {
setupControl("106bed36-016d-6dd8-ffffffe6109fb656", "0b734138-038c-0386-ffff403fb0c34b9e",
"0fe665f4-0161-4773-ffff403fb0c34b9e", "Gate");

View File

@@ -15,8 +15,8 @@ package org.openhab.binding.loxone.internal.controls;
import java.math.BigDecimal;
import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType;
@@ -29,7 +29,7 @@ import org.openhab.core.library.types.OnOffType;
public class LxControlTimedSwitchTest extends LxControlTest {
private static final String DELAY_CHANNEL = " / Deactivation Delay";
@Before
@BeforeEach
public void setup() {
setupControl("1326771c-030e-3a7c-ffff403fb0c34b9e", "0b734138-037d-034e-ffff403fb0c34b9e",
"0fe650c2-0004-d446-ffff504f9410790f", "Stairwell Light Switch");

View File

@@ -12,8 +12,8 @@
*/
package org.openhab.binding.loxone.internal.controls;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.StringType;
/**
@@ -23,7 +23,7 @@ import org.openhab.core.library.types.StringType;
*
*/
public class LxControlTrackerTest extends LxControlTest {
@Before
@BeforeEach
public void setup() {
setupControl("132aa43b-01d4-56ea-ffff403fb0c34b9e", "0b734138-037d-034e-ffff403fb0c34b9e",
"0fe650c2-0004-d446-ffff504f9410790f", "Tracker Control");

View File

@@ -14,8 +14,8 @@ package org.openhab.binding.loxone.internal.controls;
import java.math.BigDecimal;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.types.UnDefType;
@@ -31,7 +31,7 @@ public class LxControlUpDownAnalogTest extends LxControlTest {
Double step;
String format;
@Before
@BeforeEach
public void setup() {
min = 50.0;
max = 150.0;

View File

@@ -12,8 +12,8 @@
*/
package org.openhab.binding.loxone.internal.controls;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.OnOffType;
/**
@@ -26,7 +26,7 @@ public class LxControlUpDownDigitalTest extends LxControlTest {
String upChannel;
String downChannel;
@Before
@BeforeEach
public void setup() {
upChannel = " / Up";
downChannel = " / Down";

View File

@@ -12,8 +12,8 @@
*/
package org.openhab.binding.loxone.internal.controls;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.IncreaseDecreaseType;
import org.openhab.core.library.types.PercentType;
@@ -25,7 +25,7 @@ import org.openhab.core.library.types.PercentType;
*/
public class LxControlValueSelectorIncrTest extends LxControlValueSelectorTest {
@Override
@Before
@BeforeEach
public void setup() {
setupControl("132a7b7e-0022-3aac-ffff403fb0c34b9e", "0b734138-037d-034e-ffff403fb0c34b9e",
"0fe650c2-0004-d446-ffff504f9410790f", "Selection Switch Increase Only");

View File

@@ -14,8 +14,8 @@ package org.openhab.binding.loxone.internal.controls;
import java.math.BigDecimal;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.IncreaseDecreaseType;
import org.openhab.core.library.types.OnOffType;
@@ -31,7 +31,7 @@ import org.openhab.core.library.types.StopMoveType;
public class LxControlValueSelectorTest extends LxControlTest {
private static final String NUMBER_CHANNEL = " / Number";
@Before
@BeforeEach
public void setup() {
setupControl("432a7b7e-0022-3aac-ffff403fb0c34b9e", "0b734138-037d-034e-ffff403fb0c34b9e",
"0fe650c2-0004-d446-ffff504f9410790f", "Selection Switch");

View File

@@ -12,8 +12,8 @@
*/
package org.openhab.binding.loxone.internal.controls;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.library.types.StringType;
/**
@@ -23,7 +23,7 @@ import org.openhab.core.library.types.StringType;
*
*/
public class LxControlWebPageTest extends LxControlTest {
@Before
@BeforeEach
public void setup() {
setupControl("132d2791-00f8-d532-ffff403fb0c34b9e", "0b734138-037d-034e-ffff403fb0c34b9e",
"0fe650c2-0004-d446-ffff504f9410790f", "Webpage 1");

View File

@@ -12,7 +12,7 @@
*/
package org.openhab.binding.loxone.internal.controls;
import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.*;
import java.io.BufferedReader;
import java.io.IOException;