Test refactoring

ical4j · Jun 12, 2020 · ba84b41 · ba84b41
1 parent 39ff97e
commit ba84b41
Show file tree

Hide file tree

Showing 19 changed files with 27 additions and 52 deletions.
diff --git a/src/main/java/net/fortuna/ical4j/model/component/Available.java b/src/main/java/net/fortuna/ical4j/model/component/Available.java
@@ -188,7 +188,7 @@ public Available createComponent() {
 
         @Override
         public Available createComponent(PropertyList properties) throws URISyntaxException {
-            return new Available(new PropertyList(properties));
+            return new Available(properties);
         }
 
         @Override

diff --git a/src/test/groovy/net/fortuna/ical4j/data/CalendarBuilderSpec.groovy b/src/test/groovy/net/fortuna/ical4j/data/CalendarBuilderSpec.groovy
@@ -22,9 +22,7 @@ class CalendarBuilderSpec extends Specification {
         System.out.println(cal2);
         InputStream stream = new ByteArrayInputStream(cal2.getBytes(Charset.forName("UTF-8")));
         CalendarBuilder builder = new CalendarBuilder();
-        Calendar calendar = null;
-
-        calendar = builder.build(stream);
+        Calendar calendar = builder.build(stream);
 
         then: 'the result is as expected'
         calendar as String == cal2.replaceAll('\n', '\r\n')

diff --git a/src/test/groovy/net/fortuna/ical4j/model/property/DurationSpec.groovy b/src/test/groovy/net/fortuna/ical4j/model/property/DurationSpec.groovy
@@ -14,7 +14,7 @@ class DurationSpec extends Specification {
 
         where:
         value   | expectedValue
-        'P7D'   | 'P7D'
+        'P7D'   | 'P1W'
         '-P1W'   | '-P1W'
         'P52W'  | 'P52W'
         'PT10M' | 'PT10M'

diff --git a/src/test/groovy/net/fortuna/ical4j/model/property/TzIdSpec.groovy b/src/test/groovy/net/fortuna/ical4j/model/property/TzIdSpec.groovy
@@ -14,7 +14,7 @@ class TzIdSpec extends Specification {
         where:
         tzIdString              | expectedString
         'Australia/Melbourne'   | 'Australia/Melbourne'
-        'UTC+10'                | 'UTC+10:00'
+        'UTC+10'                | 'UTC+10'
     }
 
     def 'test custom zone id instance creation'() {
@@ -26,7 +26,7 @@ class TzIdSpec extends Specification {
         where:
         tzIdString                          | expectedString
         '/tzurl.org/Australia/Melbourne'    | '/tzurl.org/Australia/Melbourne'
-        'Canberra, Melbourne, Sydney'       | 'Canberra, Melbourne, Sydney'
+        'Canberra, Melbourne, Sydney'       | 'Canberra\\, Melbourne\\, Sydney'
     }
 
     def 'test unsuccessfull instance creation'() {

diff --git a/src/test/java/net/fortuna/ical4j/filter/FilterTest.java b/src/test/java/net/fortuna/ical4j/filter/FilterTest.java
@@ -138,11 +138,11 @@ public static TestSuite suite() throws FileNotFoundException, IOException, Parse
         calendar.getComponents().add(e2);
         calendar.getComponents().add(e3);
 
-        Predicate<Component> organiserRuleMatch = new HasPropertyRule(organizer);
-        Predicate<Component> attendee1RuleMatch = new HasPropertyRule(a1);
+        Predicate<Component> organiserRuleMatch = new HasPropertyRule<>(organizer);
+        Predicate<Component> attendee1RuleMatch = new HasPropertyRule<>(a1);
 
-        Predicate<Component> organiserRuleNoMatch = new HasPropertyRule(new Organizer(new URI("Mailto:X@example.com")));
-        Predicate<Component> attendeeRuleNoMatch = new HasPropertyRule(new Attendee(new URI("Mailto:X@example.com")));
+        Predicate<Component> organiserRuleNoMatch = new HasPropertyRule<>(new Organizer(new URI("Mailto:X@example.com")));
+        Predicate<Component> attendeeRuleNoMatch = new HasPropertyRule<>(new Attendee(new URI("Mailto:X@example.com")));
 
         TestSuite suite = new TestSuite();
         //testFilterMatchAll..

diff --git a/src/test/java/net/fortuna/ical4j/filter/PeriodRuleTest.java b/src/test/java/net/fortuna/ical4j/filter/PeriodRuleTest.java
@@ -97,10 +97,9 @@ protected void tearDown() {
      * Test handling of recurrence rules.
      * @throws ParserException
      * @throws IOException
-     * @throws ParseException
      */
     /*
-    public void testRecurrenceRules() throws ParserException, IOException, ParseException {
+    public void testRecurrenceRules() throws ParserException, IOException {
         Calendar rCal = Calendars.load("etc/samples/valid/LH1.ics");
         Period period = new Period(new DateTime("20060831T000000Z"), new DateTime("20070831T230000Z")); 
         Filter filter = new Filter(new PeriodRule(period)); 

diff --git a/src/test/java/net/fortuna/ical4j/model/CalendarTest.java b/src/test/java/net/fortuna/ical4j/model/CalendarTest.java
@@ -40,9 +40,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.IOException;
 import java.net.URISyntaxException;
-import java.text.ParseException;
 import java.time.DayOfWeek;
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoField;
@@ -80,7 +78,7 @@ public void testValid() throws ValidationException {
     }
 
     @Test
-    public void testValid2() throws ParseException, IOException, URISyntaxException {
+    public void testValid2() throws URISyntaxException {
         TzId tzParam = new TzId(TimeZoneRegistry.getGlobalZoneId("Australia/Melbourne").getId());
 
         // Add events, etc..

diff --git a/src/test/java/net/fortuna/ical4j/model/ComponentTest.java b/src/test/java/net/fortuna/ical4j/model/ComponentTest.java
@@ -33,7 +33,6 @@
 
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-import net.fortuna.ical4j.data.ParserException;
 import net.fortuna.ical4j.model.component.CalendarComponent;
 import net.fortuna.ical4j.model.property.DtEnd;
 import net.fortuna.ical4j.model.property.DtStart;
@@ -44,9 +43,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.text.ParseException;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.temporal.Temporal;
@@ -150,7 +146,7 @@ public void testCalculateRecurrenceSet() {
      * @return
      */
     @SuppressWarnings("serial")
-	public static TestSuite suite() throws ValidationException, ParseException, IOException, URISyntaxException, ParserException  {
+	public static TestSuite suite() throws Exception {
         TestSuite suite = new TestSuite();
 
         Component component = new Component("test") {

diff --git a/src/test/java/net/fortuna/ical4j/model/DateListTest.java b/src/test/java/net/fortuna/ical4j/model/DateListTest.java
@@ -34,8 +34,6 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import java.text.ParseException;
-
 /**
  * $Id$
  *
@@ -53,7 +51,6 @@ public class DateListTest extends TestCase {
     /**
      * @param value
      * @param expectedSize
-     * @throws ParseException
      */
     public DateListTest(String value, int expectedSize) {
         this(DateList.parse(value), expectedSize);
@@ -78,9 +75,8 @@ public void testSize() {
 
     /**
      * @return
-     * @throws ParseException 
      */
-    public static TestSuite suite() throws ParseException {
+    public static TestSuite suite() {
         TestSuite suite = new TestSuite();
         suite.addTest(new DateListTest(new DateList(), 0));
         suite.addTest(new DateListTest(new Date().toString(), 1));

diff --git a/src/test/java/net/fortuna/ical4j/model/PeriodTest.java b/src/test/java/net/fortuna/ical4j/model/PeriodTest.java
@@ -37,7 +37,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.text.ParseException;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -413,9 +412,8 @@ public void testIsEmpty() {
 
     /**
      * @return
-     * @throws ParseException 
      */
-    public static Test suite() throws ParseException {
+    public static Test suite() {
     	TestSuite suite = new TestSuite();
 
         ZonedDateTime past = ZonedDateTime.now().withYear(1980).withMonth(1).withDayOfMonth(23);

diff --git a/src/test/java/net/fortuna/ical4j/model/PropertyTest.java b/src/test/java/net/fortuna/ical4j/model/PropertyTest.java
@@ -135,8 +135,7 @@ public Property copy() {
     /**
      * Test deep copy of properties.
      */
-    public void testCopy() throws IOException, URISyntaxException,
-            ParseException {
+    public void testCopy() throws IOException, URISyntaxException {
         Property copy = property.copy();
         assertEquals(property, copy);
 
@@ -180,7 +179,7 @@ public final void testValidationException() {
      * @throws ParseException
      */
     @SuppressWarnings("serial")
-	public void testImmutable() throws IOException, URISyntaxException, ParseException {
+	public void testImmutable() throws IOException, URISyntaxException {
         try {
             property.setValue("");
             fail("UnsupportedOperationException should be thrown");

diff --git a/src/test/java/net/fortuna/ical4j/model/component/AvailableTest.java b/src/test/java/net/fortuna/ical4j/model/component/AvailableTest.java
@@ -67,7 +67,7 @@ public AvailableTest(String testMethod, Available component) {
      * @return
      * @throws SocketException 
      */
-    public static TestSuite suite() throws SocketException {
+    public static TestSuite suite() {
         TestSuite suite = new TestSuite();
 
         Available a = new Available();

diff --git a/src/test/java/net/fortuna/ical4j/model/component/VAlarmTest.java b/src/test/java/net/fortuna/ical4j/model/component/VAlarmTest.java
@@ -68,7 +68,7 @@ public VAlarmTest(String testMethod, VAlarm component) {
      * @throws IOException 
      * @throws ParseException 
      */
-    public static TestSuite suite() throws ParseException, IOException, URISyntaxException {
+    public static TestSuite suite() throws URISyntaxException {
         TestSuite suite = new TestSuite();
 
         VAlarm alarm = new VAlarm();

diff --git a/src/test/java/net/fortuna/ical4j/model/component/VAvailabilityTest.java b/src/test/java/net/fortuna/ical4j/model/component/VAvailabilityTest.java
@@ -65,7 +65,7 @@ public VAvailabilityTest(String testMethod, VAvailability component) {
      * @return
      * @throws SocketException 
      */
-    public static TestSuite suite() throws SocketException {
+    public static TestSuite suite() {
         TestSuite suite = new TestSuite();
 
         VAvailability a = new VAvailability();

diff --git a/src/test/java/net/fortuna/ical4j/model/component/VEventTest.java b/src/test/java/net/fortuna/ical4j/model/component/VEventTest.java
@@ -531,7 +531,7 @@ public void testGetOccurrence() throws IOException, ParseException, URISyntaxExc
      * @throws IOException
      * @throws ParserException
      */
-    public static TestSuite suite() throws ValidationException, ParseException, IOException, URISyntaxException, ParserException {
+    public static TestSuite suite() throws ValidationException, IOException, ParserException {
         UidGenerator uidGenerator = new RandomUidGenerator();
 
         ZonedDateTime weekday9AM = ZonedDateTime.now().withYear(2005).withMonth(3).withDayOfMonth(7)

diff --git a/src/test/java/net/fortuna/ical4j/model/component/VFreeBusyTest.java b/src/test/java/net/fortuna/ical4j/model/component/VFreeBusyTest.java
@@ -41,7 +41,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.text.ParseException;
@@ -362,8 +361,7 @@ public void testFreeBusyPeriods() {
     /**
      * @return
      */
-    public static TestSuite suite() throws ParseException, URISyntaxException,
-            IOException {
+    public static TestSuite suite() throws ParseException, URISyntaxException {
         TestSuite suite = new TestSuite();
 
         suite.addTest(new VFreeBusyTest("testVFreeBusyComponentList"));

diff --git a/src/test/java/net/fortuna/ical4j/model/property/DateListPropertyTest.java b/src/test/java/net/fortuna/ical4j/model/property/DateListPropertyTest.java
@@ -36,7 +36,6 @@
 import net.fortuna.ical4j.model.PropertyTest;
 import net.fortuna.ical4j.model.TimeZoneRegistry;
 
-import java.io.IOException;
 import java.net.URISyntaxException;
 import java.text.ParseException;
 
@@ -72,8 +71,7 @@ public DateListPropertyTest(String testMethod, DateListProperty property) {
     /**
      * 
      */
-    public void testCopy() throws IOException, URISyntaxException,
-            ParseException {
+    public void testCopy() throws URISyntaxException {
         Property copy = property.copy();
         assertEquals(property, copy);
         if (property.getTimeZone() != null) {

diff --git a/src/test/java/net/fortuna/ical4j/model/property/DatePropertyTest.java b/src/test/java/net/fortuna/ical4j/model/property/DatePropertyTest.java
@@ -38,9 +38,7 @@
 import net.fortuna.ical4j.model.TimeZoneRegistry;
 import net.fortuna.ical4j.model.parameter.TzId;
 
-import java.io.IOException;
 import java.net.URISyntaxException;
-import java.text.ParseException;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.temporal.Temporal;
@@ -79,8 +77,7 @@ public DatePropertyTest(String testMethod, DateProperty property) {
     /**
      * 
      */
-    public void testCopy() throws IOException, URISyntaxException,
-            ParseException {
+    public void testCopy() throws URISyntaxException {
         Property copy = property.copy();
         assertEquals(property, copy);
     }

diff --git a/src/test/java/net/fortuna/ical4j/model/property/VersionTest.java b/src/test/java/net/fortuna/ical4j/model/property/VersionTest.java
@@ -31,14 +31,12 @@
  */
 package net.fortuna.ical4j.model.property;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.text.ParseException;
-
 import junit.framework.TestSuite;
-
 import net.fortuna.ical4j.model.PropertyTest;
 
+import java.io.IOException;
+import java.net.URISyntaxException;
+
 /**
  * Created on 16/03/2005
  *
@@ -73,7 +71,7 @@ public VersionTest(String testMethod, Version property) {
     /*
      * Test that the constant VERSION_2_0 is immutable.
      */
-    public void testImmutable() throws IOException, URISyntaxException, ParseException {
+    public void testImmutable() throws IOException, URISyntaxException {
         super.testImmutable();
 
         try {