[iCal4j-commit] ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property AgentTest.java, 1.5,
Brought to you by:
fortuna
Menu
▾
▴
[iCal4j-commit] ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property AgentTest.java, 1.5, 1.6 GenderTest.java, 1.6, 1.7 BirthTest.java, 1.6, 1.7 GeoTest.java, 1.10, 1.11 AddressTest.java, 1.8, 1.9 KeyTest.java, 1.10, 1.11 EmailTest.java, 1.7, 1.8 CalAdrUriTest.java, 1.6, 1.7 CalUriTest.java, 1.5, 1.6 ImppTest.java, 1.7, 1.8 ClazzTest.java, 1.5, 1.6 KindTest.java, 1.6, 1.7 BDayTest.java, 1.10, 1.11 FbUrlTest.java, 1.6, 1.7 CategoriesTest.java, 1.7, 1.8 DeathTest.java, 1.6, 1.7 FnTest.java, 1.5, 1.6 DDayTest.java, 1.6, 1.7
Update of /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11183/src/test/java/net/fortuna/ical4j/vcard/property Modified Files: AgentTest.java GenderTest.java BirthTest.java GeoTest.java AddressTest.java KeyTest.java EmailTest.java CalAdrUriTest.java CalUriTest.java ImppTest.java ClazzTest.java KindTest.java BDayTest.java FbUrlTest.java CategoriesTest.java DeathTest.java FnTest.java DDayTest.java Log Message: Checkstyle-based clean up Index: BDayTest.java =================================================================== RCS file: /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property/BDayTest.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** BDayTest.java 18 Jun 2009 10:58:44 -0000 1.10 --- BDayTest.java 21 Sep 2009 12:49:20 -0000 1.11 *************** *** 52,63 **** import org.junit.runners.Parameterized.Parameters; - /** - * $Id$ - * - * Created on 26/10/2008 - * - * @author Ben - * - */ public class BDayTest extends PropertyTest { --- 52,55 ---- *************** *** 66,76 **** private final Class<?> expectedDateType; - /** - * @param property - * @param expectedName - * @param expectedValue - * @param expectedParams - * @param expectedDateType - */ public BDayTest(BDay property, String expectedName, String expectedValue, Parameter[] expectedParams, Class<?> expectedDateType) { --- 58,61 ---- *************** *** 91,95 **** assertFalse(property.getDate() instanceof DateTime); } ! } else { assertNull(property.getDate()); assertNotNull(property.getText()); --- 76,81 ---- assertFalse(property.getDate() instanceof DateTime); } ! } ! else { assertNull(property.getDate()); assertNotNull(property.getText()); *************** *** 99,121 **** @Parameters public static Collection<Object[]> parameters() throws ParseException { ! List<Object[]> params = new ArrayList<Object[]>(); try { ! params.add(new Object[] { new BDay(new Date("19690415")), Id.BDAY.toString(), "19690415", ! new Parameter[] {}, Date.class }); ! params.add(new Object[] { new BDay(new DateTime("15730125T180322Z")), Id.BDAY.toString(), ! "15730125T180322Z", new Parameter[] {}, DateTime.class }); } catch (ParseException pe) { pe.printStackTrace(); } ! params.add(new Object[] { new BDay(new ArrayList<Parameter>(), "19690415"), Id.BDAY.toString(), "19690415", ! new Parameter[] {}, Date.class }); ! params.add(new Object[] { new BDay(new ArrayList<Parameter>(), "15730125T180322Z"), Id.BDAY.toString(), ! "15730125T180322Z", new Parameter[] {}, DateTime.class }); params.add(new Object[] { new BDay(""), Id.BDAY.toString(), "", new Parameter[] { Value.TEXT }, null }); ! List<Parameter> bdayParams = new ArrayList<Parameter>(); bdayParams.add(Value.TEXT); ! params.add(new Object[] { new BDay(bdayParams, "Circa 400, bce"), Id.BDAY.toString(), "Circa 400, bce", ! new Parameter[] { Value.TEXT }, null }); return params; } --- 85,112 ---- @Parameters public static Collection<Object[]> parameters() throws ParseException { ! final List<Object[]> params = new ArrayList<Object[]>(); try { ! String dateString = "19690415"; ! params.add(new Object[] { new BDay(new Date(dateString)), Id.BDAY.toString(), dateString, ! new Parameter[] {}, Date.class, }); ! dateString = "15730125T180322Z"; ! params.add(new Object[] { new BDay(new DateTime(dateString)), Id.BDAY.toString(), ! dateString, new Parameter[] {}, DateTime.class, }); } catch (ParseException pe) { pe.printStackTrace(); } ! String dateString = "19690416"; ! params.add(new Object[] { new BDay(new ArrayList<Parameter>(), dateString), Id.BDAY.toString(), dateString, ! new Parameter[] {}, Date.class, }); ! dateString = "15730125T180323Z"; ! params.add(new Object[] { new BDay(new ArrayList<Parameter>(), dateString), Id.BDAY.toString(), ! dateString, new Parameter[] {}, DateTime.class, }); params.add(new Object[] { new BDay(""), Id.BDAY.toString(), "", new Parameter[] { Value.TEXT }, null }); ! final List<Parameter> bdayParams = new ArrayList<Parameter>(); bdayParams.add(Value.TEXT); ! final String bdayString = "Circa 400, bce"; ! params.add(new Object[] { new BDay(bdayParams, bdayString), Id.BDAY.toString(), bdayParams, ! new Parameter[] { Value.TEXT }, null, }); return params; } Index: ClazzTest.java =================================================================== RCS file: /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property/ClazzTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ClazzTest.java 12 Jan 2009 03:34:34 -0000 1.5 --- ClazzTest.java 21 Sep 2009 12:49:20 -0000 1.6 *************** *** 44,63 **** - /** - * $Id$ - * - * Created on 26/10/2008 - * - * @author Ben - * - */ public class ClazzTest extends PropertyTest { - /** - * @param property - * @param expectedName - * @param expectedValue - * @param expectedParams - */ public ClazzTest(Property property, String expectedName, String expectedValue, Parameter[] expectedParams) { --- 44,49 ---- *************** *** 67,75 **** @Parameters public static Collection<Object[]> parameters() { ! List<Object[]> params = new ArrayList<Object[]>(); params.add(new Object[] {Clazz.CONFIDENTIAL, Id.CLASS.toString(), "CONFIDENTIAL", new Parameter[] {}}); params.add(new Object[] {Clazz.PRIVATE, Id.CLASS.toString(), "PRIVATE", new Parameter[] {}}); params.add(new Object[] {Clazz.PUBLIC, Id.CLASS.toString(), "PUBLIC", new Parameter[] {}}); ! params.add(new Object[] {new Clazz("mammal"), Id.CLASS.toString(), "mammal", new Parameter[] {}}); return params; } --- 53,62 ---- @Parameters public static Collection<Object[]> parameters() { ! final List<Object[]> params = new ArrayList<Object[]>(); params.add(new Object[] {Clazz.CONFIDENTIAL, Id.CLASS.toString(), "CONFIDENTIAL", new Parameter[] {}}); params.add(new Object[] {Clazz.PRIVATE, Id.CLASS.toString(), "PRIVATE", new Parameter[] {}}); params.add(new Object[] {Clazz.PUBLIC, Id.CLASS.toString(), "PUBLIC", new Parameter[] {}}); ! final String clazzString = "mammal"; ! params.add(new Object[] {new Clazz(clazzString), Id.CLASS.toString(), clazzString, new Parameter[] {}}); return params; } Index: GeoTest.java =================================================================== RCS file: /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property/GeoTest.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** GeoTest.java 3 Jun 2009 13:46:29 -0000 1.10 --- GeoTest.java 21 Sep 2009 12:49:20 -0000 1.11 *************** *** 45,64 **** import org.junit.runners.Parameterized.Parameters; - /** - * $Id$ - * - * Created: [27/10/2008] - * - * @author fortuna - * - */ public class GeoTest extends PropertyTest { - /** - * @param property - * @param expectedName - * @param expectedValue - * @param expectedParams - */ public GeoTest(Property property, String expectedName, String expectedValue, Parameter[] expectedParams) { super(property, expectedName, expectedValue, expectedParams); --- 45,50 ---- *************** *** 67,80 **** @Parameters public static Collection<Object[]> parameters() { ! List<Object[]> params = new ArrayList<Object[]>(); params.add(new Object[] { new Geo(BigDecimal.ZERO, BigDecimal.ZERO), Id.GEO.toString(), "0;0", ! new Parameter[] {} }); ! params.add(new Object[] { new Geo(new ArrayList<Parameter>(), "34.15345;-12.34523"), Id.GEO.toString(), ! "34.15345;-12.34523", new Parameter[] {} }); // enable relaxed parsing for non-standard GEO support.. CompatibilityHints.setHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING, true); ! params.add(new Object[] { new Geo(new ArrayList<Parameter>(), "34.15345,-12.34523"), Id.GEO.toString(), ! "34.15345;-12.34523", new Parameter[] {} }); CompatibilityHints.setHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING, false); --- 53,67 ---- @Parameters public static Collection<Object[]> parameters() { ! final List<Object[]> params = new ArrayList<Object[]>(); params.add(new Object[] { new Geo(BigDecimal.ZERO, BigDecimal.ZERO), Id.GEO.toString(), "0;0", ! new Parameter[] {}, }); ! final String geoString = "34.15345;-12.34523"; ! params.add(new Object[] { new Geo(new ArrayList<Parameter>(), geoString), Id.GEO.toString(), ! geoString, new Parameter[] {}, }); // enable relaxed parsing for non-standard GEO support.. CompatibilityHints.setHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING, true); ! params.add(new Object[] { new Geo(new ArrayList<Parameter>(), geoString), Id.GEO.toString(), ! geoString, new Parameter[] {}, }); CompatibilityHints.setHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING, false); Index: KindTest.java =================================================================== RCS file: /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property/KindTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** KindTest.java 12 Jan 2009 03:34:37 -0000 1.6 --- KindTest.java 21 Sep 2009 12:49:20 -0000 1.7 *************** *** 43,75 **** import org.junit.runners.Parameterized.Parameters; - - /** - * $Id$ - * - * Created on: 28/10/2008 - * - * @author fortuna - * - */ public class KindTest extends PropertyTest { ! /** ! * @param property ! * @param expectedName ! * @param expectedValue ! * @param expectedParams ! */ ! public KindTest(Property property, String expectedName, ! String expectedValue, Parameter[] expectedParams) { ! super(property, expectedName, expectedValue, expectedParams); ! } @Parameters public static Collection<Object[]> parameters() { ! List<Object[]> params = new ArrayList<Object[]>(); ! params.add(new Object[] {Kind.GROUP, Id.KIND.toString(), "group", new Parameter[] {}}); ! params.add(new Object[] {Kind.INDIVIDUAL, Id.KIND.toString(), "individual", new Parameter[] {}}); ! params.add(new Object[] {Kind.ORG, Id.KIND.toString(), "org", new Parameter[] {}}); ! params.add(new Object[] {new Kind("couple"), Id.KIND.toString(), "couple", new Parameter[] {}}); return params; } --- 43,61 ---- import org.junit.runners.Parameterized.Parameters; public class KindTest extends PropertyTest { ! public KindTest(Property property, String expectedName, String expectedValue, Parameter[] expectedParams) { ! super(property, expectedName, expectedValue, expectedParams); ! } @Parameters public static Collection<Object[]> parameters() { ! final List<Object[]> params = new ArrayList<Object[]>(); ! params.add(new Object[] { Kind.GROUP, Id.KIND.toString(), "group", new Parameter[] {} }); ! params.add(new Object[] { Kind.INDIVIDUAL, Id.KIND.toString(), "individual", new Parameter[] {} }); ! params.add(new Object[] { Kind.ORG, Id.KIND.toString(), "org", new Parameter[] {} }); ! ! final String customKind = "couple"; ! params.add(new Object[] { new Kind(customKind), Id.KIND.toString(), customKind, new Parameter[] {} }); return params; } Index: DeathTest.java =================================================================== RCS file: /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property/DeathTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DeathTest.java 3 Jun 2009 13:46:29 -0000 1.6 --- DeathTest.java 21 Sep 2009 12:49:20 -0000 1.7 *************** *** 43,62 **** import net.fortuna.ical4j.vcard.Property.Id; - /** - * $Id$ - * - * Created on 26/10/2008 - * - * @author Ben - * - */ public class DeathTest extends PropertyTest { - /** - * @param property - * @param expectedName - * @param expectedValue - * @param expectedParams - */ public DeathTest(Property property, String expectedName, String expectedValue, Parameter[] expectedParams) { super(property, expectedName, expectedValue, expectedParams); --- 43,48 ---- *************** *** 65,73 **** @Parameters public static Collection<Object[]> parameters() { ! List<Object[]> params = new ArrayList<Object[]>(); ! params.add(new Object[] { new Death("Somewhere in the Pacific Ocean"), Id.DEATH.toString(), ! "Somewhere in the Pacific Ocean", new Parameter[] {} }); ! params.add(new Object[] { new Death("Lunar expedition, Moon"), Id.DEATH.toString(), "Lunar expedition, Moon", ! new Parameter[] {} }); return params; } --- 51,61 ---- @Parameters public static Collection<Object[]> parameters() { ! final List<Object[]> params = new ArrayList<Object[]>(); ! String deathString = "Somewhere in the Pacific Ocean"; ! params.add(new Object[] { new Death(deathString), Id.DEATH.toString(), ! deathString, new Parameter[] {}, }); ! deathString = "Lunar expedition, Moon"; ! params.add(new Object[] { new Death(deathString), Id.DEATH.toString(), deathString, ! new Parameter[] {}, }); return params; } Index: DDayTest.java =================================================================== RCS file: /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property/DDayTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DDayTest.java 3 Jun 2009 13:46:30 -0000 1.6 --- DDayTest.java 21 Sep 2009 12:49:20 -0000 1.7 *************** *** 47,66 **** import net.fortuna.ical4j.vcard.parameter.Value; - /** - * $Id$ - * - * Created on 26/10/2008 - * - * @author Ben - * - */ public class DDayTest extends PropertyTest { - /** - * @param property - * @param expectedName - * @param expectedValue - * @param expectedParams - */ public DDayTest(Property property, String expectedName, String expectedValue, Parameter[] expectedParams) { super(property, expectedName, expectedValue, expectedParams); --- 47,52 ---- *************** *** 69,86 **** @Parameters public static Collection<Object[]> parameters() { ! List<Object[]> params = new ArrayList<Object[]>(); try { ! params.add(new Object[] { new DDay(new Date("20380415")), Id.DDAY.toString(), "20380415", ! new Parameter[] {} }); ! params.add(new Object[] { new DDay(new DateTime("19860125T081500")), Id.DDAY.toString(), "19860125T081500", ! new Parameter[] {} }); } catch (ParseException pe) { pe.printStackTrace(); } ! params.add(new Object[] { new DDay(""), Id.DDAY.toString(), "", new Parameter[] { Value.TEXT } }); ! params.add(new Object[] { new DDay("Unknown"), Id.DDAY.toString(), "Unknown", new Parameter[] { Value.TEXT } }); ! params.add(new Object[] { new DDay("4pm, January 9th"), Id.DDAY.toString(), "4pm, January 9th", ! new Parameter[] { Value.TEXT } }); return params; } --- 55,77 ---- @Parameters public static Collection<Object[]> parameters() { ! final List<Object[]> params = new ArrayList<Object[]>(); try { ! String dateString = "20380415"; ! params.add(new Object[] { new DDay(new Date(dateString)), Id.DDAY.toString(), dateString, ! new Parameter[] {}, }); ! dateString = "19860125T081500"; ! params.add(new Object[] { new DDay(new DateTime(dateString)), Id.DDAY.toString(), dateString, ! new Parameter[] {}, }); } catch (ParseException pe) { pe.printStackTrace(); } ! params.add(new Object[] { new DDay(""), Id.DDAY.toString(), "", new Parameter[] { Value.TEXT }, }); ! String ddayString = "Unknown"; ! params.add(new Object[] { new DDay(ddayString), Id.DDAY.toString(), ddayString, ! new Parameter[] { Value.TEXT }, }); ! ddayString = "4pm, January 9th"; ! params.add(new Object[] { new DDay(ddayString), Id.DDAY.toString(), ddayString, ! new Parameter[] { Value.TEXT }, }); return params; } Index: EmailTest.java =================================================================== RCS file: /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property/EmailTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** EmailTest.java 3 Jun 2009 13:46:29 -0000 1.7 --- EmailTest.java 21 Sep 2009 12:49:20 -0000 1.8 *************** *** 43,62 **** import org.junit.runners.Parameterized.Parameters; - /** - * $Id$ - * - * Created on 26/10/2008 - * - * @author Ben - * - */ public class EmailTest extends PropertyTest { - /** - * @param property - * @param expectedName - * @param expectedValue - * @param expectedParams - */ public EmailTest(Property property, String expectedName, String expectedValue, Parameter[] expectedParams) { super(property, expectedName, expectedValue, expectedParams); --- 43,48 ---- *************** *** 65,71 **** @Parameters public static Collection<Object[]> parameters() { ! List<Object[]> params = new ArrayList<Object[]>(); ! params.add(new Object[] { new Email("te...@ex..."), Id.EMAIL.toString(), "te...@ex...", ! new Parameter[] {} }); // params.add(new Object[] {new Email("te...@ex...", Type.HOME), Id.EMAIL.toString(), "te...@ex...", // new Parameter[] {Type.HOME}}); --- 51,58 ---- @Parameters public static Collection<Object[]> parameters() { ! final List<Object[]> params = new ArrayList<Object[]>(); ! final String emailString = "te...@ex..."; ! params.add(new Object[] { new Email(emailString), Id.EMAIL.toString(), emailString, ! new Parameter[] {}, }); // params.add(new Object[] {new Email("te...@ex...", Type.HOME), Id.EMAIL.toString(), "te...@ex...", // new Parameter[] {Type.HOME}}); Index: CalUriTest.java =================================================================== RCS file: /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property/CalUriTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CalUriTest.java 3 Jun 2009 13:46:30 -0000 1.5 --- CalUriTest.java 21 Sep 2009 12:49:20 -0000 1.6 *************** *** 45,64 **** import net.fortuna.ical4j.vcard.parameter.Type; - /** - * $Id$ - * - * Created on 26/10/2008 - * - * @author Ben - * - */ public class CalUriTest extends PropertyTest { - /** - * @param property - * @param expectedName - * @param expectedValue - * @param expectedParams - */ public CalUriTest(Property property, String expectedName, String expectedValue, Parameter[] expectedParams) { super(property, expectedName, expectedValue, expectedParams); --- 45,50 ---- *************** *** 67,75 **** @Parameters public static Collection<Object[]> parameters() { ! List<Object[]> params = new ArrayList<Object[]>(); ! params.add(new Object[] { new CalUri(URI.create("ftp://ftp.example.com/calA.ics")), Id.CALURI.toString(), ! "ftp://ftp.example.com/calA.ics", new Parameter[] {} }); ! params.add(new Object[] { new CalUri(URI.create("http://cal.example.com/calA"), Type.PREF), ! Id.CALURI.toString(), "http://cal.example.com/calA", new Parameter[] { Type.PREF } }); return params; } --- 53,63 ---- @Parameters public static Collection<Object[]> parameters() { ! final List<Object[]> params = new ArrayList<Object[]>(); ! String caluriString = "ftp://ftp.example.com/calA.ics"; ! params.add(new Object[] { new CalUri(URI.create(caluriString)), Id.CALURI.toString(), ! caluriString, new Parameter[] {}, }); ! caluriString = "http://cal.example.com/calA"; ! params.add(new Object[] { new CalUri(URI.create(caluriString), Type.PREF), ! Id.CALURI.toString(), caluriString, new Parameter[] { Type.PREF }, }); return params; } Index: AgentTest.java =================================================================== RCS file: /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property/AgentTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AgentTest.java 3 Jun 2009 13:46:29 -0000 1.5 --- AgentTest.java 21 Sep 2009 12:49:20 -0000 1.6 *************** *** 45,64 **** import net.fortuna.ical4j.vcard.parameter.Value; - /** - * $Id$ - * - * Created on 26/10/2008 - * - * @author Ben - * - */ public class AgentTest extends PropertyTest { - /** - * @param property - * @param expectedName - * @param expectedValue - * @param expectedParams - */ public AgentTest(Property property, String expectedName, String expectedValue, Parameter[] expectedParams) { super(property, expectedName, expectedValue, expectedParams); --- 45,50 ---- *************** *** 67,76 **** @Parameters public static Collection<Object[]> parameters() { ! List<Object[]> params = new ArrayList<Object[]>(); params.add(new Object[] { new Agent(""), Id.AGENT.toString(), "", new Parameter[] { Value.TEXT } }); ! params.add(new Object[] { new Agent("Agent 99"), Id.AGENT.toString(), "Agent 99", ! new Parameter[] { Value.TEXT } }); ! params.add(new Object[] { new Agent(URI.create("http://thereisnoagent.com")), Id.AGENT.toString(), ! "http://thereisnoagent.com", new Parameter[] {} }); return params; } --- 53,64 ---- @Parameters public static Collection<Object[]> parameters() { ! final List<Object[]> params = new ArrayList<Object[]>(); params.add(new Object[] { new Agent(""), Id.AGENT.toString(), "", new Parameter[] { Value.TEXT } }); ! String agentString = "Agent 99"; ! params.add(new Object[] { new Agent(agentString), Id.AGENT.toString(), agentString, ! new Parameter[] { Value.TEXT }, }); ! agentString = "http://thereisnoagent.com"; ! params.add(new Object[] { new Agent(URI.create(agentString)), Id.AGENT.toString(), ! agentString, new Parameter[] {}, }); return params; } Index: BirthTest.java =================================================================== RCS file: /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property/BirthTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** BirthTest.java 3 Jun 2009 13:46:29 -0000 1.6 --- BirthTest.java 21 Sep 2009 12:49:20 -0000 1.7 *************** *** 43,62 **** import net.fortuna.ical4j.vcard.Property.Id; - /** - * $Id$ - * - * Created on 26/10/2008 - * - * @author Ben - * - */ public class BirthTest extends PropertyTest { - /** - * @param property - * @param expectedName - * @param expectedValue - * @param expectedParams - */ public BirthTest(Property property, String expectedName, String expectedValue, Parameter[] expectedParams) { super(property, expectedName, expectedValue, expectedParams); --- 43,48 ---- *************** *** 65,71 **** @Parameters public static Collection<Object[]> parameters() { ! List<Object[]> params = new ArrayList<Object[]>(); ! params.add(new Object[] { new Birth("Mercy Hospital, Melbourne"), Id.BIRTH.toString(), ! "Mercy Hospital, Melbourne", new Parameter[] {} }); return params; } --- 51,58 ---- @Parameters public static Collection<Object[]> parameters() { ! final List<Object[]> params = new ArrayList<Object[]>(); ! final String birthString = "Mercy Hospital, Melbourne"; ! params.add(new Object[] { new Birth(birthString), Id.BIRTH.toString(), ! birthString, new Parameter[] {}, }); return params; } Index: AddressTest.java =================================================================== RCS file: /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property/AddressTest.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** AddressTest.java 3 Jun 2009 13:46:29 -0000 1.8 --- AddressTest.java 21 Sep 2009 12:49:20 -0000 1.9 *************** *** 44,63 **** import net.fortuna.ical4j.vcard.parameter.Type; - /** - * $Id$ - * - * Created on 26/10/2008 - * - * @author Ben - * - */ public class AddressTest extends PropertyTest { ! /** ! * @param property ! * @param expectedName ! * @param expectedValue ! * @param expectedParams ! */ public AddressTest(Property property, String expectedName, String expectedValue, Parameter[] expectedParams) { super(property, expectedName, expectedValue, expectedParams); --- 44,51 ---- import net.fortuna.ical4j.vcard.parameter.Type; public class AddressTest extends PropertyTest { ! private static final String THREE_SEMIS = ";;;"; ! public AddressTest(Property property, String expectedName, String expectedValue, Parameter[] expectedParams) { super(property, expectedName, expectedValue, expectedParams); *************** *** 66,100 **** @Parameters public static Collection<Object[]> parameters() { ! List<Object[]> params = new ArrayList<Object[]>(); ! String country = "Australia"; params.add(new Object[] { new Address(null, null, null, null, null, null, country), Id.ADR.toString(), ! ";;;;;;" + country + ";", new Parameter[] {} }); ! String locality = "Brunswick"; params.add(new Object[] { new Address(null, null, null, locality, null, null, country), Id.ADR.toString(), ! ";;;" + locality + ";;;" + country + ";", new Parameter[] {} }); ! String region = "Melbourne"; params.add(new Object[] { new Address(null, null, null, locality, region, null, country), Id.ADR.toString(), ! ";;;" + locality + ";" + region + ";;" + country + ";", new Parameter[] {} }); ! String postcode = "3056"; params.add(new Object[] { new Address(null, null, null, locality, region, postcode, country), ! Id.ADR.toString(), ";;;" + locality + ";" + region + ";" + postcode + ";" + country + ";", ! new Parameter[] {} }); params.add(new Object[] { new Address(null, null, null, locality, region, postcode, country, Type.HOME), ! Id.ADR.toString(), ";;;" + locality + ";" + region + ";" + postcode + ";" + country + ";", ! new Parameter[] { Type.HOME } }); params.add(new Object[] { new Address(null, null, null, locality, region, postcode, country, Type.HOME, Type.PREF), ! Id.ADR.toString(), ";;;" + locality + ";" + region + ";" + postcode + ";" + country + ";", ! new Parameter[] { Type.HOME, Type.PREF } }); ! Type type = new Type(Type.HOME, Type.PREF); params.add(new Object[] { new Address(null, null, null, locality, region, postcode, country, type), ! Id.ADR.toString(), ";;;" + locality + ";" + region + ";" + postcode + ";" + country + ";", ! new Parameter[] { type } }); return params; --- 54,88 ---- @Parameters public static Collection<Object[]> parameters() { ! final List<Object[]> params = new ArrayList<Object[]>(); ! final String country = "Australia"; params.add(new Object[] { new Address(null, null, null, null, null, null, country), Id.ADR.toString(), ! ";;;;;;" + country + ';', new Parameter[] {}, }); ! final String locality = "Brunswick"; params.add(new Object[] { new Address(null, null, null, locality, null, null, country), Id.ADR.toString(), ! THREE_SEMIS + locality + THREE_SEMIS + country + ';', new Parameter[] {}, }); ! final String region = "Melbourne"; params.add(new Object[] { new Address(null, null, null, locality, region, null, country), Id.ADR.toString(), ! THREE_SEMIS + locality + ';' + region + ";;" + country + ';', new Parameter[] {}, }); ! final String postcode = "3056"; params.add(new Object[] { new Address(null, null, null, locality, region, postcode, country), ! Id.ADR.toString(), THREE_SEMIS + locality + ';' + region + ';' + postcode + ';' + country + ';', ! new Parameter[] {}, }); params.add(new Object[] { new Address(null, null, null, locality, region, postcode, country, Type.HOME), ! Id.ADR.toString(), THREE_SEMIS + locality + ';' + region + ';' + postcode + ';' + country + ';', ! new Parameter[] { Type.HOME }, }); params.add(new Object[] { new Address(null, null, null, locality, region, postcode, country, Type.HOME, Type.PREF), ! Id.ADR.toString(), THREE_SEMIS + locality + ';' + region + ';' + postcode + ';' + country + ';', ! new Parameter[] { Type.HOME, Type.PREF }, }); ! final Type type = new Type(Type.HOME, Type.PREF); params.add(new Object[] { new Address(null, null, null, locality, region, postcode, country, type), ! Id.ADR.toString(), THREE_SEMIS + locality + ';' + region + ';' + postcode + ';' + country + ';', ! new Parameter[] { type }, }); return params; Index: GenderTest.java =================================================================== RCS file: /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property/GenderTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GenderTest.java 12 Jan 2009 03:34:37 -0000 1.6 --- GenderTest.java 21 Sep 2009 12:49:20 -0000 1.7 *************** *** 43,74 **** import net.fortuna.ical4j.vcard.Property.Id; - - /** - * $Id$ - * - * Created: [27/10/2008] - * - * @author fortuna - * - */ public class GenderTest extends PropertyTest { ! /** ! * @param property ! * @param expectedName ! * @param expectedValue ! * @param expectedParams ! */ ! public GenderTest(Property property, String expectedName, ! String expectedValue, Parameter[] expectedParams) { ! super(property, expectedName, expectedValue, expectedParams); ! } @Parameters public static Collection<Object[]> parameters() { ! List<Object[]> params = new ArrayList<Object[]>(); ! params.add(new Object[] {Gender.FEMALE, Id.GENDER.toString(), "F", new Parameter[] {}}); ! params.add(new Object[] {Gender.MALE, Id.GENDER.toString(), "M", new Parameter[] {}}); ! params.add(new Object[] {new Gender("Unknown"), Id.GENDER.toString(), "Unknown", new Parameter[] {}}); return params; } --- 43,59 ---- import net.fortuna.ical4j.vcard.Property.Id; public class GenderTest extends PropertyTest { ! public GenderTest(Property property, String expectedName, String expectedValue, Parameter[] expectedParams) { ! super(property, expectedName, expectedValue, expectedParams); ! } @Parameters public static Collection<Object[]> parameters() { ! final List<Object[]> params = new ArrayList<Object[]>(); ! params.add(new Object[] { Gender.FEMALE, Id.GENDER.toString(), "F", new Parameter[] {} }); ! params.add(new Object[] { Gender.MALE, Id.GENDER.toString(), "M", new Parameter[] {} }); ! final String genderString = "Unknown"; ! params.add(new Object[] { new Gender(genderString), Id.GENDER.toString(), genderString, new Parameter[] {} }); return params; } Index: FnTest.java =================================================================== RCS file: /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property/FnTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FnTest.java 12 Jan 2009 03:34:37 -0000 1.5 --- FnTest.java 21 Sep 2009 12:49:20 -0000 1.6 *************** *** 43,72 **** import net.fortuna.ical4j.vcard.Property.Id; - - /** - * $Id$ - * - * Created: [27/10/2008] - * - * @author fortuna - * - */ public class FnTest extends PropertyTest { ! /** ! * @param property ! * @param expectedName ! * @param expectedValue ! * @param expectedParams ! */ ! public FnTest(Property property, String expectedName, String expectedValue, ! Parameter[] expectedParams) { ! super(property, expectedName, expectedValue, expectedParams); ! } @Parameters public static Collection<Object[]> parameters() { ! List<Object[]> params = new ArrayList<Object[]>(); ! params.add(new Object[] {new Fn("Jane Doe"), Id.FN.toString(), "Jane Doe", new Parameter[] {}}); return params; } --- 43,57 ---- import net.fortuna.ical4j.vcard.Property.Id; public class FnTest extends PropertyTest { ! public FnTest(Property property, String expectedName, String expectedValue, Parameter[] expectedParams) { ! super(property, expectedName, expectedValue, expectedParams); ! } @Parameters public static Collection<Object[]> parameters() { ! final List<Object[]> params = new ArrayList<Object[]>(); ! final String fnString = "Jane Doe"; ! params.add(new Object[] { new Fn(fnString), Id.FN.toString(), fnString, new Parameter[] {} }); return params; } Index: ImppTest.java =================================================================== RCS file: /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property/ImppTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ImppTest.java 3 Jun 2009 13:46:29 -0000 1.7 --- ImppTest.java 21 Sep 2009 12:49:20 -0000 1.8 *************** *** 45,56 **** import org.junit.runners.Parameterized.Parameters; - /** - * $Id$ - * - * Created: [27/10/2008] - * - * @author fortuna - * - */ public class ImppTest extends PropertyTest { --- 45,48 ---- *************** *** 67,75 **** @Parameters public static Collection<Object[]> parameters() { ! List<Object[]> params = new ArrayList<Object[]>(); ! params.add(new Object[] { new Impp(URI.create("xmpp:al...@ex...")), Id.IMPP.toString(), ! "xmpp:al...@ex...", new Parameter[] {} }); ! params.add(new Object[] { new Impp(URI.create("xmpp:bo...@ex..."), Type.WORK), Id.IMPP.toString(), ! "xmpp:bo...@ex...", new Parameter[] { Type.WORK } }); return params; } --- 59,69 ---- @Parameters public static Collection<Object[]> parameters() { ! final List<Object[]> params = new ArrayList<Object[]>(); ! String imppString = "xmpp:al...@ex..."; ! params.add(new Object[] { new Impp(URI.create(imppString)), Id.IMPP.toString(), ! imppString, new Parameter[] {}, }); ! imppString = "xmpp:bo...@ex..."; ! params.add(new Object[] { new Impp(URI.create(imppString), Type.WORK), Id.IMPP.toString(), ! imppString, new Parameter[] { Type.WORK }, }); return params; } Index: FbUrlTest.java =================================================================== RCS file: /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property/FbUrlTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FbUrlTest.java 3 Jun 2009 13:46:29 -0000 1.6 --- FbUrlTest.java 21 Sep 2009 12:49:20 -0000 1.7 *************** *** 45,64 **** import net.fortuna.ical4j.vcard.parameter.Type; - /** - * $Id$ - * - * Created: [27/10/2008] - * - * @author fortuna - * - */ public class FbUrlTest extends PropertyTest { - /** - * @param property - * @param expectedName - * @param expectedValue - * @param expectedParams - */ public FbUrlTest(Property property, String expectedName, String expectedValue, Parameter[] expectedParams) { super(property, expectedName, expectedValue, expectedParams); --- 45,50 ---- *************** *** 67,75 **** @Parameters public static Collection<Object[]> parameters() { ! List<Object[]> params = new ArrayList<Object[]>(); ! params.add(new Object[] { new FbUrl(URI.create("FTP://ftp.example.com/busy/project-a.ifb")), ! Id.FBURL.toString(), "FTP://ftp.example.com/busy/project-a.ifb", new Parameter[] {} }); ! params.add(new Object[] { new FbUrl(URI.create("http://www.example.com/busy/janedoe"), Type.PREF), ! Id.FBURL.toString(), "http://www.example.com/busy/janedoe", new Parameter[] { Type.PREF } }); return params; } --- 53,63 ---- @Parameters public static Collection<Object[]> parameters() { ! final List<Object[]> params = new ArrayList<Object[]>(); ! String fburlString = "FTP://ftp.example.com/busy/project-a.ifb"; ! params.add(new Object[] { new FbUrl(URI.create(fburlString)), ! Id.FBURL.toString(), fburlString, new Parameter[] {}, }); ! fburlString = "http://www.example.com/busy/janedoe"; ! params.add(new Object[] { new FbUrl(URI.create(fburlString), Type.PREF), ! Id.FBURL.toString(), fburlString, new Parameter[] { Type.PREF }, }); return params; } Index: KeyTest.java =================================================================== RCS file: /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property/KeyTest.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** KeyTest.java 3 Jun 2009 13:46:29 -0000 1.10 --- KeyTest.java 21 Sep 2009 12:49:20 -0000 1.11 *************** *** 47,66 **** import org.junit.runners.Parameterized.Parameters; - /** - * $Id$ - * - * Created on: 27/10/2008 - * - * @author fortuna - * - */ public class KeyTest extends PropertyTest { - /** - * @param property - * @param expectedName - * @param expectedValue - * @param expectedParams - */ public KeyTest(Property property, String expectedName, String expectedValue, Parameter[] expectedParams) { super(property, expectedName, expectedValue, expectedParams); --- 47,52 ---- *************** *** 69,80 **** @Parameters public static Collection<Object[]> parameters() throws DecoderException { ! List<Object[]> params = new ArrayList<Object[]>(); ! params.add(new Object[] { new Key("somekey".getBytes()), Id.KEY.toString(), ! new String(new Base64().encode("somekey".getBytes())), new Parameter[] { Encoding.B } }); params.add(new Object[] { new Key(new byte[0]), Id.KEY.toString(), "", new Parameter[] { Encoding.B } }); ! Type type = new Type("application/pgp"); params.add(new Object[] { new Key(new byte[0], type), Id.KEY.toString(), "", ! new Parameter[] { Encoding.B, type } }); return params; } --- 55,67 ---- @Parameters public static Collection<Object[]> parameters() throws DecoderException { ! final String keyString = "somekey"; ! final List<Object[]> params = new ArrayList<Object[]>(); ! params.add(new Object[] { new Key(keyString.getBytes()), Id.KEY.toString(), ! new String(new Base64().encode(keyString.getBytes())), new Parameter[] { Encoding.B }, }); params.add(new Object[] { new Key(new byte[0]), Id.KEY.toString(), "", new Parameter[] { Encoding.B } }); ! final Type type = new Type("application/pgp"); params.add(new Object[] { new Key(new byte[0], type), Id.KEY.toString(), "", ! new Parameter[] { Encoding.B, type }, }); return params; } Index: CalAdrUriTest.java =================================================================== RCS file: /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property/CalAdrUriTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CalAdrUriTest.java 3 Jun 2009 13:46:29 -0000 1.6 --- CalAdrUriTest.java 21 Sep 2009 12:49:20 -0000 1.7 *************** *** 45,64 **** import net.fortuna.ical4j.vcard.parameter.Type; - /** - * $Id$ - * - * Created on 26/10/2008 - * - * @author Ben - * - */ public class CalAdrUriTest extends PropertyTest { - /** - * @param property - * @param expectedName - * @param expectedValue - * @param expectedParams - */ public CalAdrUriTest(Property property, String expectedName, String expectedValue, Parameter[] expectedParams) { super(property, expectedName, expectedValue, expectedParams); --- 45,50 ---- *************** *** 67,75 **** @Parameters public static Collection<Object[]> parameters() { ! List<Object[]> params = new ArrayList<Object[]>(); ! params.add(new Object[] { new CalAdrUri(URI.create("http://example.com/calendar/jdoe")), ! Id.CALADRURI.toString(), "http://example.com/calendar/jdoe", new Parameter[] {} }); ! params.add(new Object[] { new CalAdrUri(URI.create("mailto:ja...@ex..."), Type.PREF), ! Id.CALADRURI.toString(), "mailto:ja...@ex...", new Parameter[] { Type.PREF } }); return params; } --- 53,63 ---- @Parameters public static Collection<Object[]> parameters() { ! final List<Object[]> params = new ArrayList<Object[]>(); ! String uriString = "http://example.com/calendar/jdoe"; ! params.add(new Object[] { new CalAdrUri(URI.create(uriString)), ! Id.CALADRURI.toString(), uriString, new Parameter[] {}, }); ! uriString = "mailto:ja...@ex..."; ! params.add(new Object[] { new CalAdrUri(URI.create(uriString), Type.PREF), ! Id.CALADRURI.toString(), uriString, new Parameter[] { Type.PREF }, }); return params; } Index: CategoriesTest.java =================================================================== RCS file: /cvsroot/ical4j/ical4j-vcard/src/test/java/net/fortuna/ical4j/vcard/property/CategoriesTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CategoriesTest.java 10 Jun 2009 10:36:12 -0000 1.7 --- CategoriesTest.java 21 Sep 2009 12:49:20 -0000 1.8 *************** *** 43,54 **** import org.junit.runners.Parameterized.Parameters; - /** - * $Id$ - * - * Created on 26/10/2008 - * - * @author Ben - * - */ public class CategoriesTest extends PropertyTest { --- 43,46 ---- *************** *** 65,76 **** @Parameters public static Collection<Object[]> parameters() { ! List<Object[]> params = new ArrayList<Object[]>(); params.add(new Object[] { new Categories(""), Id.CATEGORIES.toString(), "", new Parameter[] {} }); ! params.add(new Object[] { new Categories("TRAVEL AGENT"), Id.CATEGORIES.toString(), "TRAVEL AGENT", ! new Parameter[] {} }); params.add(new Object[] { new Categories("INTERNET", "IETF", "INDUSTRY", "INFORMATION TECHNOLOGY"), ! Id.CATEGORIES.toString(), "INTERNET,IETF,INDUSTRY,INFORMATION TECHNOLOGY", new Parameter[] {} }); params.add(new Object[] { new Categories("GARDENER, LANDSCAPE"), Id.CATEGORIES.toString(), ! "GARDENER\\, LANDSCAPE", new Parameter[] {} }); return params; } --- 57,69 ---- @Parameters public static Collection<Object[]> parameters() { ! final List<Object[]> params = new ArrayList<Object[]>(); params.add(new Object[] { new Categories(""), Id.CATEGORIES.toString(), "", new Parameter[] {} }); ! final String categoryString = "TRAVEL AGENT"; ! params.add(new Object[] { new Categories(categoryString), Id.CATEGORIES.toString(), categoryString, ! new Parameter[] {}, }); params.add(new Object[] { new Categories("INTERNET", "IETF", "INDUSTRY", "INFORMATION TECHNOLOGY"), ! Id.CATEGORIES.toString(), "INTERNET,IETF,INDUSTRY,INFORMATION TECHNOLOGY", new Parameter[] {}, }); params.add(new Object[] { new Categories("GARDENER, LANDSCAPE"), Id.CATEGORIES.toString(), ! "GARDENER\\, LANDSCAPE", new Parameter[] {}, }); return params; } |