Skip to content

Commit 5cd8140

Browse files
authored
Remove obsoleted test methods (openhab#17871)
Signed-off-by: Jacob Laursen <[email protected]>
1 parent f39415b commit 5cd8140

File tree

1 file changed

+0
-61
lines changed
  • itests/org.openhab.binding.ntp.tests/src/main/java/org/openhab/binding/ntp/test

1 file changed

+0
-61
lines changed

itests/org.openhab.binding.ntp.tests/src/main/java/org/openhab/binding/ntp/test/NtpOSGiTest.java

-61
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static org.mockito.Mockito.*;
2020

2121
import java.time.ZoneId;
22-
import java.time.ZoneOffset;
2322
import java.time.ZonedDateTime;
2423
import java.time.format.DateTimeFormatter;
2524
import java.util.Locale;
@@ -30,7 +29,6 @@
3029
import org.junit.jupiter.api.AfterEach;
3130
import org.junit.jupiter.api.BeforeAll;
3231
import org.junit.jupiter.api.BeforeEach;
33-
import org.junit.jupiter.api.Disabled;
3432
import org.junit.jupiter.api.Test;
3533
import org.mockito.ArgumentMatchers;
3634
import org.openhab.binding.ntp.internal.NtpBindingConstants;
@@ -209,35 +207,6 @@ public void testStringChannelTimeZoneUpdate() {
209207
assertThat(timeZoneFromItemRegistry, is(anyOf(equalTo(expectedTimeZonePDT), equalTo(expectedTimeZonePST))));
210208
}
211209

212-
@Test
213-
public void testDateTimeChannelTimeZoneUpdate() {
214-
Configuration configuration = new Configuration();
215-
configuration.put(NtpBindingConstants.PROPERTY_TIMEZONE, TEST_TIME_ZONE_ID);
216-
initialize(configuration, NtpBindingConstants.CHANNEL_DATE_TIME, ACCEPTED_ITEM_TYPE_DATE_TIME, null, null);
217-
218-
String testItemState = getItemState(ACCEPTED_ITEM_TYPE_DATE_TIME).toString();
219-
assertFormat(testItemState, DateTimeType.DATE_PATTERN_WITH_TZ_AND_MS);
220-
ZonedDateTime timeZoneFromItemRegistry = ((DateTimeType) getItemState(ACCEPTED_ITEM_TYPE_DATE_TIME))
221-
.getZonedDateTime();
222-
223-
ZoneOffset expectedOffset = ZoneId.of(TEST_TIME_ZONE_ID).getRules()
224-
.getOffset(timeZoneFromItemRegistry.toInstant());
225-
assertEquals(expectedOffset, timeZoneFromItemRegistry.getOffset());
226-
}
227-
228-
@Test
229-
public void testDateTimeChannelCalendarTimeZoneUpdate() {
230-
Configuration configuration = new Configuration();
231-
configuration.put(NtpBindingConstants.PROPERTY_TIMEZONE, TEST_TIME_ZONE_ID);
232-
initialize(configuration, NtpBindingConstants.CHANNEL_DATE_TIME, ACCEPTED_ITEM_TYPE_DATE_TIME, null, null);
233-
ZonedDateTime timeZoneIdFromItemRegistry = ((DateTimeType) getItemState(ACCEPTED_ITEM_TYPE_DATE_TIME))
234-
.getZonedDateTime();
235-
236-
ZoneOffset expectedOffset = ZoneId.of(TEST_TIME_ZONE_ID).getRules()
237-
.getOffset(timeZoneIdFromItemRegistry.toInstant());
238-
assertEquals(expectedOffset, timeZoneIdFromItemRegistry.getOffset());
239-
}
240-
241210
@Test
242211
public void testStringChannelDefaultTimeZoneUpdate() {
243212
final String expectedTimeZoneEEST = "EEST";
@@ -259,36 +228,6 @@ public void testStringChannelDefaultTimeZoneUpdate() {
259228
assertThat(timeZoneFromItemRegistry, is(anyOf(equalTo(expectedTimeZoneEEST), equalTo(expectedTimeZoneEET))));
260229
}
261230

262-
@Test
263-
public void testDateTimeChannelDefaultTimeZoneUpdate() {
264-
ZonedDateTime zoned = ZonedDateTime.now();
265-
266-
ZoneOffset expectedTimeZone = zoned.getOffset();
267-
Configuration configuration = new Configuration();
268-
// Initialize with configuration with no time zone property set.
269-
initialize(configuration, NtpBindingConstants.CHANNEL_DATE_TIME, ACCEPTED_ITEM_TYPE_DATE_TIME, null, null);
270-
271-
String testItemState = getItemState(ACCEPTED_ITEM_TYPE_DATE_TIME).toString();
272-
assertFormat(testItemState, DateTimeType.DATE_PATTERN_WITH_TZ_AND_MS);
273-
ZoneOffset timeZoneFromItemRegistry = new DateTimeType(testItemState).getZonedDateTime().getOffset();
274-
275-
assertEquals(expectedTimeZone, timeZoneFromItemRegistry);
276-
}
277-
278-
@Test
279-
@Disabled("https://github.com/eclipse/smarthome/issues/5224")
280-
public void testDateTimeChannelCalendarDefaultTimeZoneUpdate() {
281-
Configuration configuration = new Configuration();
282-
// Initialize with configuration with no time zone property set.
283-
initialize(configuration, NtpBindingConstants.CHANNEL_DATE_TIME, ACCEPTED_ITEM_TYPE_DATE_TIME, null, null);
284-
285-
ZonedDateTime timeZoneIdFromItemRegistry = ((DateTimeType) getItemState(ACCEPTED_ITEM_TYPE_DATE_TIME))
286-
.getZonedDateTime();
287-
288-
ZoneOffset expectedOffset = ZoneId.systemDefault().getRules().getOffset(timeZoneIdFromItemRegistry.toInstant());
289-
assertEquals(expectedOffset, timeZoneIdFromItemRegistry.getOffset());
290-
}
291-
292231
@Test
293232
public void testStringChannelFormatting() {
294233
final String formatPattern = "EEE, d MMM yyyy HH:mm:ss z";

0 commit comments

Comments
 (0)