From 344c91bca8f6d42a9d15987d62d520ffe16711e6 Mon Sep 17 00:00:00 2001 From: Ben Fortuna Date: Tue, 24 Sep 2019 13:31:50 +1000 Subject: [PATCH] Removed redundant tests --- .../ical4j/model/property/TriggerSpec.groovy | 42 +++---------------- .../model/property/LastModifiedTest.java | 5 +-- 2 files changed, 7 insertions(+), 40 deletions(-) diff --git a/src/test/groovy/net/fortuna/ical4j/model/property/TriggerSpec.groovy b/src/test/groovy/net/fortuna/ical4j/model/property/TriggerSpec.groovy index 2f86172bb..88d273524 100644 --- a/src/test/groovy/net/fortuna/ical4j/model/property/TriggerSpec.groovy +++ b/src/test/groovy/net/fortuna/ical4j/model/property/TriggerSpec.groovy @@ -31,10 +31,10 @@ */ package net.fortuna.ical4j.model.property - +import net.fortuna.ical4j.model.CalendarDateFormat import spock.lang.Specification -import java.time.ZonedDateTime +import java.time.Period class TriggerSpec extends Specification { @@ -43,40 +43,8 @@ class TriggerSpec extends Specification { new Trigger(value).value == expectedValue where: - value | expectedValue - java.time.Period.ZERO | 'P0D' - net.fortuna.ical4j.model.CalendarDateFormat.UTC_DATE_TIME_FORMAT.parse('20110131T012647Z') | '20110131T012647Z' + value | expectedValue + Period.ZERO | 'P0D' + CalendarDateFormat.UTC_DATE_TIME_FORMAT.parse('20110131T012647Z') | '20110131T012647Z' } - - def 'verify trigger date-time converts to UTC'() { - setup: 'override platform default timezone' - def originalPlatformTz = TimeZone.default - TimeZone.default = TimeZone.getTimeZone('Australia/Melbourne') - - expect: 'derived value is expected' - new Trigger(net.fortuna.ical4j.model.CalendarDateFormat.UTC_DATE_TIME_FORMAT.parse(value)).value == expectedValue - - cleanup: 'restore platform default timezone' - TimeZone.default = originalPlatformTz - - where: - value | expectedValue - '20110131T012647Z' | '20110130T142647Z' - } - - def 'verify original date-time is not modified'() { - given: 'a date in a non-UTC timezone' - def originalTzDefault = TimeZone.default - TimeZone.default = TimeZone.getTimeZone('Australia/Melbourne') - ZonedDateTime dateTime = ZonedDateTime.now() - - when: 'the date is used to construct a trigger' - Trigger trigger = [dateTime.toInstant()] - - then: "the original date's timezone is not modified" - assert !dateTime.utc - - cleanup: - TimeZone.default = originalTzDefault - } } diff --git a/src/test/java/net/fortuna/ical4j/model/property/LastModifiedTest.java b/src/test/java/net/fortuna/ical4j/model/property/LastModifiedTest.java index 412cb648a..4d1e0f014 100755 --- a/src/test/java/net/fortuna/ical4j/model/property/LastModifiedTest.java +++ b/src/test/java/net/fortuna/ical4j/model/property/LastModifiedTest.java @@ -31,11 +31,11 @@ */ package net.fortuna.ical4j.model.property; -import java.text.ParseException; - import junit.framework.TestSuite; import net.fortuna.ical4j.model.PropertyTest; +import java.text.ParseException; + /** * $Id$ * @@ -69,7 +69,6 @@ public static TestSuite suite() throws ParseException { TestSuite suite = new TestSuite(); LastModified modified = new LastModified("20081124T090000"); suite.addTest(new LastModifiedTest(modified, "20081124T090000")); - suite.addTest(new LastModifiedTest("testValidationException", modified)); modified = new LastModified("20081124T090000Z"); suite.addTest(new LastModifiedTest("testValidation", modified));