Index: /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/calendar/AppointmentViewPage.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/calendar/AppointmentViewPage.java	(revision 4864)
+++ /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/calendar/AppointmentViewPage.java	(revision 4890)
@@ -30,4 +30,7 @@
 	@FindBy(xpath = "//table[@id='calendar_viewevent_button_right']/tbody/tr/td/nobr/form/div/input[@id='']")
 	private WebElement removeButton;
+
+	@FindBy(xpath = "//table[@id='calendar_viewevent_button_right']/tbody/tr/td[2]/nobr/form/div/input[@id='']")
+	private WebElement removeSeriesButton;
 
 	@FindBy(xpath = "//table[@id='calendar_view_event']/tbody/tr[1]/td[2]")
@@ -68,4 +71,13 @@
 	public void removeAppointment() {
 		this.removeButton.click();
+		Alert alert = driver.switchTo().alert();
+		Assert.assertEquals(
+				alert.getText(),
+				"Tem certeza que deseja remover esta entrada?\nIsto irÃ¡ remover esta entrada para todos usuÃ¡rios.");
+		alert.accept();
+	}
+
+	public void removeSeriesAppointment() {
+		this.removeSeriesButton.click();
 		Alert alert = driver.switchTo().alert();
 		Assert.assertEquals(
Index: /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/calendar/CalendarPage.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/calendar/CalendarPage.java	(revision 4864)
+++ /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/calendar/CalendarPage.java	(revision 4890)
@@ -42,3 +42,13 @@
 		return PageFactory.initElements(driver, AppointmentViewPage.class);
 	}
+
+	public AppointmentViewPage openAppointmentViewPage(String id, String date) {
+		driver.get(Constants.URL
+				+ "/index.php?menuaction=calendar.uicalendar.view&cal_id=" + id
+				+ "&date=" + date);
+		System.out
+				.println("/index.php?menuaction=calendar.uicalendar.view&cal_id="
+						+ id + "&date=" + date);
+		return PageFactory.initElements(driver, AppointmentViewPage.class);
+	}
 }
Index: /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/calendar/AppointmentPage.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/calendar/AppointmentPage.java	(revision 4864)
+++ /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/pages/calendar/AppointmentPage.java	(revision 4890)
@@ -1,5 +1,8 @@
 package org.expressolivre.cte.pages.calendar;
 
+import java.util.List;
+
 import org.expressolivre.cte.pages.common.Page;
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
@@ -88,8 +91,4 @@
 	private WebElement recurEndDate;
 
-	/** Domingo, Segunda, TerÃ§a, .... */
-	@FindBy(name = "cal[rpt_day][]")
-	private WebElement rptDay;
-
 	@FindBy(name = "cal[recur_interval]")
 	private WebElement recurInterval;
@@ -257,4 +256,36 @@
 	}
 
+	public void setRptUseEnd(String finalDate) {
+		this.rptUseEnd.click();
+		this.recurEndDate.clear();
+		this.recurEndDate.sendKeys(finalDate);
+	}
+
+	/**
+	 * Valores para os dias da semana:
+	 * 
+	 * <pre>
+	 * 1 - Domingo
+	 * 2 - Segunda
+	 * 4 - TerÃ§a
+	 * 8 - Quarta
+	 * 16 - Quinta
+	 * 32 - Sexta
+	 * 64 - Sabado
+	 * </pre>
+	 * 
+	 * @param values
+	 */
+	public void setRecurDays(List<String> values) {
+		List<WebElement> elements = driver.findElements(By
+				.name("cal[rpt_day][]"));
+
+		for (WebElement e : elements) {
+			if (values.contains(e.getValue())) {
+				e.click();
+			}
+		}
+	}
+
 	public void saveAppointment() {
 		this.save.click();
Index: /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoTestCase.java	(revision 4890)
+++ /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoTestCase.java	(revision 4890)
@@ -0,0 +1,62 @@
+package org.expressolivre.cte.calendar.adicionar;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+import org.expressolivre.cte.common.BaseCalendarTestCase;
+import org.expressolivre.cte.pages.calendar.AppointmentPage;
+import org.testng.annotations.Optional;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+/**
+ * Suite:[FUN03.2] Adicionar Compromisso
+ * 
+ * Caso de Teste: EL-938:Adicionar compromisso
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-938
+ * 
+ * Caso de Teste: EL-939:Adicionar compromisso do tipo privado
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-939
+ * 
+ * Caso de Teste: EL-940:Adicionar compromisso sem repeticao
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-940
+ * 
+ * Caso de Teste: EL-1265:Adicionar compromisso do tipo restrito
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-1265
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Feb 8, 2011 at 9:36:08 AM
+ * 
+ */
+public class AdicionarCompromissoTestCase extends BaseCalendarTestCase {
+
+	@Parameters({ "tipo", "titulo", "horaInicial", "minutoInicial",
+			"horaFinal", "minutoFinal", "prioridade" })
+	@Test
+	public void adicionarCompromissoDataCorrente(
+			@Optional("Normal") String tipo, String titulo, String horaInicial,
+			String minutoInicial, String horaFinal, String minutoFinal,
+			@Optional("Normal") String prioridade) {
+
+		// Pega data corrente.
+		Calendar cal = Calendar.getInstance();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+		SimpleDateFormat sdf2 = new SimpleDateFormat("dd/MM/yyyy");
+
+		AppointmentPage ap = super.adicionarCompromisso(
+				sdf.format(cal.getTime()), tipo, titulo,
+				sdf2.format(cal.getTime()), horaInicial, minutoInicial,
+				sdf2.format(cal.getTime()), horaFinal, minutoFinal, prioridade);
+
+		ap.saveAppointment();
+	}
+}
Index: /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoComAlarmeTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoComAlarmeTestCase.java	(revision 4890)
+++ /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoComAlarmeTestCase.java	(revision 4890)
@@ -0,0 +1,52 @@
+package org.expressolivre.cte.calendar.adicionar;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+import org.expressolivre.cte.common.BaseCalendarTestCase;
+import org.expressolivre.cte.pages.calendar.AppointmentPage;
+import org.testng.annotations.Optional;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+/**
+ * Suite:[FUN03.2] Adicionar Compromisso
+ * 
+ * Caso de Teste: EL-941:Adicionar compromisso com alarme
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-941
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Ago 1, 2011 at 2:10:08 PM
+ * 
+ */
+public class AdicionarCompromissoComAlarmeTestCase extends BaseCalendarTestCase {
+
+	@Parameters({ "tipo", "titulo", "horaInicial", "minutoInicial",
+			"horaFinal", "minutoFinal", "prioridade", "alarme" })
+	@Test
+	public void adicionarCompromissoComAlarme(@Optional("Normal") String tipo,
+			String titulo, String horaInicial, String minutoInicial,
+			String horaFinal, String minutoFinal,
+			@Optional("Normal") String prioridade, String alarme) {
+
+		// Pega data corrente.
+		Calendar cal = Calendar.getInstance();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+		SimpleDateFormat sdf2 = new SimpleDateFormat("dd/MM/yyyy");
+
+		AppointmentPage ap = super.adicionarCompromisso(
+				sdf.format(cal.getTime()), tipo, titulo,
+				sdf2.format(cal.getTime()), horaInicial, minutoInicial,
+				sdf2.format(cal.getTime()), horaFinal, minutoFinal, prioridade);
+
+		String[] s = alarme.split("-");
+		ap.setAlarmDays(s[0]);
+		ap.setAlarmHours(s[1]);
+		ap.setAlarmMinutes(s[2]);
+
+		ap.saveAppointment();
+	}
+}
Index: /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoSemInformarTituloTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoSemInformarTituloTestCase.java	(revision 4890)
+++ /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoSemInformarTituloTestCase.java	(revision 4890)
@@ -0,0 +1,52 @@
+package org.expressolivre.cte.calendar.adicionar;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+import org.expressolivre.cte.common.BaseCalendarTestCase;
+import org.expressolivre.cte.pages.calendar.AppointmentPage;
+import org.testng.Assert;
+import org.testng.annotations.Optional;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+/**
+ * Suite:[FUN03.2] Adicionar Compromisso
+ * 
+ * Caso de Teste: EL-1052:Adicionar compromisso sem informar titulo
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-1052
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Jul 29, 2011 at 9:41:08 AM
+ * 
+ */
+public class AdicionarCompromissoSemInformarTituloTestCase extends
+		BaseCalendarTestCase {
+
+	@Parameters({ "tipo", "titulo", "horaInicial", "minutoInicial",
+			"horaFinal", "minutoFinal", "prioridade" })
+	@Test
+	public void adicionarCompromissoSemTitulo(@Optional("Normal") String tipo,
+			String titulo, String horaInicial, String minutoInicial,
+			String horaFinal, String minutoFinal,
+			@Optional("Normal") String prioridade) {
+
+		// Pega data corrente.
+		Calendar cal = Calendar.getInstance();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+		SimpleDateFormat sdf2 = new SimpleDateFormat("dd/MM/yyyy");
+
+		AppointmentPage ap = super.adicionarCompromisso(
+				sdf.format(cal.getTime()), tipo, titulo,
+				sdf2.format(cal.getTime()), horaInicial, minutoInicial,
+				sdf2.format(cal.getTime()), horaFinal, minutoFinal, prioridade);
+
+		ap.saveAppointment();
+
+		Assert.assertEquals(ap.getFormStatus(), "VocÃª nÃ£o colocou o tÃ­tulo.");
+
+	}
+}
Index: /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoComRepeticaoDiariaTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoComRepeticaoDiariaTestCase.java	(revision 4890)
+++ /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoComRepeticaoDiariaTestCase.java	(revision 4890)
@@ -0,0 +1,52 @@
+package org.expressolivre.cte.calendar.adicionar;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.expressolivre.cte.common.BaseCalendarTestCase;
+import org.expressolivre.cte.pages.calendar.AppointmentPage;
+import org.testng.annotations.Optional;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+/**
+ * Suite:[FUN03.2] Adicionar Compromisso
+ * 
+ * Caso de Teste: EL-942:Adicionar compromisso com repeticao diaria
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-942
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Ago 1, 2011 at 2:31:08 PM
+ * 
+ */
+public class AdicionarCompromissoComRepeticaoDiariaTestCase extends
+		BaseCalendarTestCase {
+
+	@Parameters({ "tipo", "titulo", "dataInicial", "horaInicial",
+			"minutoInicial", "horaFinal", "minutoFinal", "prioridade",
+			"dataFinal" })
+	@Test
+	public void adicionarCompromissoComRepeticaoDiaria(
+			@Optional("Normal") String tipo, String titulo, String dataInicial,
+			String horaInicial, String minutoInicial, String horaFinal,
+			String minutoFinal, @Optional("Normal") String prioridade,
+			String dataFinal) throws ParseException {
+
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+		SimpleDateFormat sdf2 = new SimpleDateFormat("dd/MM/yyyy");
+		Date dtIni = sdf2.parse(dataInicial);
+
+		AppointmentPage ap = super.adicionarCompromisso(sdf.format(dtIni),
+				tipo, titulo, dataInicial, horaInicial, minutoInicial,
+				dataInicial, horaFinal, minutoFinal, prioridade);
+
+		ap.setRecurType("DiÃ¡ria");
+		ap.setRptUseEnd(dataFinal);
+
+		ap.saveAppointment();
+	}
+}
Index: /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoDataInicialFinalInvalidaTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoDataInicialFinalInvalidaTestCase.java	(revision 4890)
+++ /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoDataInicialFinalInvalidaTestCase.java	(revision 4890)
@@ -0,0 +1,54 @@
+package org.expressolivre.cte.calendar.adicionar;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+import org.expressolivre.cte.common.BaseCalendarTestCase;
+import org.expressolivre.cte.pages.calendar.AppointmentPage;
+import org.testng.Assert;
+import org.testng.annotations.Optional;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+/**
+ * Suite:[FUN03.2] Adicionar Compromisso
+ * 
+ * Caso de Teste: EL-1053:Adicionar compromisso com data inicial/final invalida
+ * inicial
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-1053
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Jul 28, 2011 at 4:42:08 AM
+ * 
+ */
+public class AdicionarCompromissoDataInicialFinalInvalidaTestCase extends
+		BaseCalendarTestCase {
+
+	@Parameters({ "tipo", "titulo", "dataInicial", "horaInicial",
+			"minutoInicial", "dataFinal", "horaFinal", "minutoFinal",
+			"prioridade" })
+	@Test
+	public void adicionarCompromissoComDataInicialFinalInvalida(
+			@Optional("Normal") String tipo, String titulo, String dataInicial,
+			String horaInicial, String minutoInicial, String dataFinal,
+			String horaFinal, String minutoFinal,
+			@Optional("Normal") String prioridade) {
+
+		// Pega data corrente.
+		Calendar cal = Calendar.getInstance();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+
+		AppointmentPage ap = super.adicionarCompromisso(
+				sdf.format(cal.getTime()), tipo, titulo, dataInicial,
+				horaInicial, minutoInicial, dataFinal, horaFinal, minutoFinal,
+				prioridade);
+		ap.saveAppointment();
+
+		Assert.assertEquals("VocÃª informou uma data invÃ¡lida.",
+				ap.getFormStatus());
+
+	}
+}
Index: /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoHoraInicialFinalInvalidaTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoHoraInicialFinalInvalidaTestCase.java	(revision 4890)
+++ /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoHoraInicialFinalInvalidaTestCase.java	(revision 4890)
@@ -0,0 +1,52 @@
+package org.expressolivre.cte.calendar.adicionar;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+import org.expressolivre.cte.common.BaseCalendarTestCase;
+import org.expressolivre.cte.pages.calendar.AppointmentPage;
+import org.testng.Assert;
+import org.testng.annotations.Optional;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+/**
+ * Suite:[FUN03.2] Adicionar Compromisso
+ * 
+ * Caso de Teste: EL-1054:Adicionar compromisso com hora inicial/final invalida.
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-1054
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Jul 26, 2011 at 10:34:08 AM
+ * 
+ */
+public class AdicionarCompromissoHoraInicialFinalInvalidaTestCase extends
+		BaseCalendarTestCase {
+
+	@Parameters({ "tipo", "titulo", "horaInicial", "minutoInicial",
+			"horaFinal", "minutoFinal", "prioridade" })
+	@Test
+	public void adicionarCompromissoHoraFinalMenorQueHoraInicial(
+			@Optional("Normal") String tipo, String titulo, String horaInicial,
+			String minutoInicial, String horaFinal, String minutoFinal,
+			@Optional("Normal") String prioridade) {
+
+		// Pega data corrente.
+		Calendar cal = Calendar.getInstance();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+		SimpleDateFormat sdf2 = new SimpleDateFormat("dd/MM/yyyy");
+
+		AppointmentPage ap = super.adicionarCompromisso(
+				sdf.format(cal.getTime()), tipo, titulo,
+				sdf2.format(cal.getTime()), horaInicial, minutoInicial,
+				sdf2.format(cal.getTime()), horaFinal, minutoFinal, prioridade);
+		ap.saveAppointment();
+
+		Assert.assertEquals(ap.getFormStatus(),
+				"vocÃª informou uma hora do dia invÃ¡lida.");
+
+	}
+}
Index: /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoDataFinalMenorDataInicialTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoDataFinalMenorDataInicialTestCase.java	(revision 4890)
+++ /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoDataFinalMenorDataInicialTestCase.java	(revision 4890)
@@ -0,0 +1,57 @@
+package org.expressolivre.cte.calendar.adicionar;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+import org.expressolivre.cte.common.BaseCalendarTestCase;
+import org.expressolivre.cte.pages.calendar.AppointmentPage;
+import org.testng.Assert;
+import org.testng.annotations.Optional;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+/**
+ * Suite:[FUN03.2] Adicionar Compromisso
+ * 
+ * Caso de Teste: EL-947:Adicionar compromisso com data final menor que data
+ * inicial
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-947
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Jul 26, 2011 at 10:45:08 AM
+ * 
+ */
+public class AdicionarCompromissoDataFinalMenorDataInicialTestCase extends
+		BaseCalendarTestCase {
+
+	@Parameters({ "tipo", "titulo", "horaInicial", "minutoInicial",
+			"horaFinal", "minutoFinal", "prioridade" })
+	@Test
+	public void adicionarCompromissoComDataFinalMenorQueDataInicial(
+			@Optional("Normal") String tipo, String titulo, String horaInicial,
+			String minutoInicial, String horaFinal, String minutoFinal,
+			@Optional("Normal") String prioridade) {
+
+		// Pega data corrente.
+		Calendar cal = Calendar.getInstance();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+		SimpleDateFormat sdf2 = new SimpleDateFormat("dd/MM/yyyy");
+
+		String dataInicial = sdf2.format(cal.getTime());
+		cal.add(Calendar.DATE, -1);
+		String dataFinal = sdf2.format(cal.getTime());
+
+		AppointmentPage ap = super.adicionarCompromisso(
+				sdf.format(cal.getTime()), tipo, titulo, dataInicial,
+				horaInicial, minutoInicial, dataFinal, horaFinal, minutoFinal,
+				prioridade);
+		ap.saveAppointment();
+
+		Assert.assertEquals("VocÃª informou uma data invÃ¡lida.",
+				ap.getFormStatus());
+
+	}
+}
Index: /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoHoraFinalMenorHoraInicialTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoHoraFinalMenorHoraInicialTestCase.java	(revision 4890)
+++ /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoHoraFinalMenorHoraInicialTestCase.java	(revision 4890)
@@ -0,0 +1,54 @@
+package org.expressolivre.cte.calendar.adicionar;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+import org.expressolivre.cte.common.BaseCalendarTestCase;
+import org.expressolivre.cte.pages.calendar.AppointmentPage;
+import org.testng.Assert;
+import org.testng.annotations.Optional;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+/**
+ * Suite:[FUN03.2] Adicionar Compromisso
+ * 
+ * Caso de Teste: EL-948:Adicionar compromisso com hora final menor que hora
+ * inicial
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-948
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Jul 26, 2011 at 10:34:08 AM
+ * 
+ */
+public class AdicionarCompromissoHoraFinalMenorHoraInicialTestCase extends
+		BaseCalendarTestCase {
+
+	@Parameters({ "tipo", "titulo", "horaInicial", "minutoInicial",
+			"horaFinal", "minutoFinal", "prioridade" })
+	@Test
+	public void adicionarCompromissoHoraFinalMenorQueHoraInicial(
+			@Optional("Normal") String tipo, String titulo, String horaInicial,
+			String minutoInicial, String horaFinal, String minutoFinal,
+			@Optional("Normal") String prioridade) {
+
+		// Pega data corrente.
+		Calendar cal = Calendar.getInstance();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+		SimpleDateFormat sdf2 = new SimpleDateFormat("dd/MM/yyyy");
+
+		AppointmentPage ap = super.adicionarCompromisso(
+				sdf.format(cal.getTime()), tipo, titulo,
+				sdf2.format(cal.getTime()), horaInicial, minutoInicial,
+				sdf2.format(cal.getTime()), horaFinal, minutoFinal, prioridade);
+		ap.saveAppointment();
+
+		Assert.assertEquals(
+				"A hora de inicio nÃ£o pode ser maior do que a hora de tÃ©rmino.",
+				ap.getFormStatus());
+
+	}
+}
Index: /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoComRepeticaoSemanalTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoComRepeticaoSemanalTestCase.java	(revision 4890)
+++ /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/adicionar/AdicionarCompromissoComRepeticaoSemanalTestCase.java	(revision 4890)
@@ -0,0 +1,54 @@
+package org.expressolivre.cte.calendar.adicionar;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+
+import org.expressolivre.cte.common.BaseCalendarTestCase;
+import org.expressolivre.cte.pages.calendar.AppointmentPage;
+import org.testng.annotations.Optional;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+/**
+ * Suite:[FUN03.2] Adicionar Compromisso
+ * 
+ * Caso de Teste: EL-943:Adicionar compromisso com repeticao semanal
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-943
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Ago 1, 2011 at 3:43:08 PM
+ * 
+ */
+public class AdicionarCompromissoComRepeticaoSemanalTestCase extends
+		BaseCalendarTestCase {
+
+	@Parameters({ "tipo", "titulo", "dataInicial", "horaInicial",
+			"minutoInicial", "horaFinal", "minutoFinal", "prioridade",
+			"dataFinal", "dias" })
+	@Test
+	public void adicionarCompromissoComRepeticaoSemanal(
+			@Optional("Normal") String tipo, String titulo, String dataInicial,
+			String horaInicial, String minutoInicial, String horaFinal,
+			String minutoFinal, @Optional("Normal") String prioridade,
+			String dataFinal, String dias) throws ParseException {
+
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+		SimpleDateFormat sdf2 = new SimpleDateFormat("dd/MM/yyyy");
+		Date dtIni = sdf2.parse(dataInicial);
+
+		AppointmentPage ap = super.adicionarCompromisso(sdf.format(dtIni),
+				tipo, titulo, dataInicial, horaInicial, minutoInicial,
+				dataInicial, horaFinal, minutoFinal, prioridade);
+
+		ap.setRecurType("semanal");
+		ap.setRptUseEnd(dataFinal);
+		ap.setRecurDays(Arrays.asList(dias.split(",")));
+
+		ap.saveAppointment();
+	}
+}
Index: /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/visualizar/RemoverCompromissoComRepeticaoTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/visualizar/RemoverCompromissoComRepeticaoTestCase.java	(revision 4890)
+++ /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/visualizar/RemoverCompromissoComRepeticaoTestCase.java	(revision 4890)
@@ -0,0 +1,43 @@
+package org.expressolivre.cte.calendar.visualizar;
+
+import org.expressolivre.cte.common.BaseCalendarTestCase;
+import org.expressolivre.cte.pages.calendar.AppointmentViewPage;
+import org.expressolivre.cte.pages.calendar.CalendarTodayViewPage;
+import org.testng.Assert;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+/**
+ * Caso de Teste: EL-969:Remover compromisso com repeticao
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-969
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Ago 2, 2011 at 9:39:05 AM
+ * 
+ */
+public class RemoverCompromissoComRepeticaoTestCase extends
+		BaseCalendarTestCase {
+
+	@Parameters({ "titulo" })
+	@Test
+	public void removerCompromissoComRepeticao(String titulo) {
+		CalendarTodayViewPage ctvp = super.openTodayView();
+		String id = ctvp.getAppointmentId(titulo);
+
+		System.out.println(id);
+
+		String[] ids = id.split("rc");
+		System.out.println("-->" + ids[0].substring(1) + " "
+				+ ids[1].substring(0, ids[1].length() - 1));
+
+		AppointmentViewPage avp = cp.openAppointmentViewPage(
+				ids[0].substring(1), ids[1].substring(0, ids[1].length() - 1));
+		Assert.assertEquals(avp.getTitle(), titulo);
+
+		avp.removeSeriesAppointment();
+	}
+
+}
Index: /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/visualizar/RemoverCompromissoTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/visualizar/RemoverCompromissoTestCase.java	(revision 4890)
+++ /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/visualizar/RemoverCompromissoTestCase.java	(revision 4890)
@@ -0,0 +1,35 @@
+package org.expressolivre.cte.calendar.visualizar;
+
+import org.expressolivre.cte.common.BaseCalendarTestCase;
+import org.expressolivre.cte.pages.calendar.AppointmentViewPage;
+import org.expressolivre.cte.pages.calendar.CalendarTodayViewPage;
+import org.testng.Assert;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+/**
+ * Caso de Teste: EL-970:Remover compromisso
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-970
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Jul 26, 2011 at 9:49:05 AM
+ * 
+ */
+public class RemoverCompromissoTestCase extends BaseCalendarTestCase {
+
+	@Parameters({ "titulo" })
+	@Test
+	public void removerCompromisso(String titulo) {
+		CalendarTodayViewPage ctvp = super.openTodayView();
+		String id = ctvp.getAppointmentId(titulo);
+
+		AppointmentViewPage avp = cp.openAppointmentViewPage(id);
+		Assert.assertEquals(avp.getTitle(), titulo);
+
+		avp.removeAppointment();
+	}
+
+}
Index: /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/visualizar/ExibirCompromissoTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/visualizar/ExibirCompromissoTestCase.java	(revision 4890)
+++ /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/visualizar/ExibirCompromissoTestCase.java	(revision 4890)
@@ -0,0 +1,43 @@
+package org.expressolivre.cte.calendar.visualizar;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+import org.expressolivre.cte.common.BaseCalendarTestCase;
+import org.expressolivre.cte.pages.calendar.AppointmentViewPage;
+import org.expressolivre.cte.pages.calendar.CalendarTodayViewPage;
+import org.testng.Assert;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+/**
+ * Caso de Teste: EL-964:Exibir compromisso
+ * 
+ * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
+ * testcase&id=EL-964
+ * 
+ * @author L.F.Estivalet (Serpro)
+ * 
+ *         Created on Jul 25, 2011 at 10:37:43 AM
+ * 
+ */
+public class ExibirCompromissoTestCase extends BaseCalendarTestCase {
+
+	@Parameters({ "tipo", "titulo", "inicio", "fim", "prioridade" })
+	@Test
+	public void exibirCompromisso(String tipo, String titulo, String inicio,
+			String fim, String prioridade) {
+		CalendarTodayViewPage ctvp = super.openTodayView();
+		String id = ctvp.getAppointmentId(titulo);
+
+		Calendar cal = Calendar.getInstance();
+		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
+		String today = sdf.format(cal.getTime());
+
+		AppointmentViewPage avp = cp.openAppointmentViewPage(id);
+		Assert.assertEquals(avp.getTitle(), titulo);
+		Assert.assertEquals(avp.getStartTime(), today + " - " + inicio);
+		Assert.assertEquals(avp.getEndTime(), today + " - " + fim);
+		Assert.assertEquals(avp.getPriority(), prioridade);
+	}
+}
Index: vel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/AdicionarCompromissoTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/AdicionarCompromissoTestCase.java	(revision 4864)
+++ 	(revision )
@@ -1,57 +1,0 @@
-package org.expressolivre.cte.calendar;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
-import org.expressolivre.cte.common.BaseCalendarTestCase;
-import org.expressolivre.cte.pages.calendar.AppointmentPage;
-import org.testng.annotations.Optional;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
-
-/**
- * Suite:[FUN03.2] Adicionar Compromisso
- * 
- * Caso de Teste: EL-938:Adicionar compromisso
- * 
- * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
- * testcase&id=EL-938
- * 
- * Caso de Teste: EL-939:Adicionar compromisso do tipo privado
- * 
- * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
- * testcase&id=EL-939
- * 
- * Caso de Teste: EL-1265:Adicionar compromisso do tipo restrito
- * 
- * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
- * testcase&id=EL-1265
- * 
- * @author L.F.Estivalet (Serpro)
- * 
- *         Created on Feb 8, 2011 at 9:36:08 AM
- * 
- */
-public class AdicionarCompromissoTestCase extends BaseCalendarTestCase {
-
-	@Parameters({ "tipo", "titulo", "horaInicial", "minutoInicial",
-			"horaFinal", "minutoFinal", "prioridade" })
-	@Test
-	public void adicionarCompromissoDataCorrente(
-			@Optional("Normal") String tipo, String titulo, String horaInicial,
-			String minutoInicial, String horaFinal, String minutoFinal,
-			@Optional("Normal") String prioridade) {
-
-		// Pega data corrente.
-		Calendar cal = Calendar.getInstance();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-		SimpleDateFormat sdf2 = new SimpleDateFormat("dd/MM/yyyy");
-
-		AppointmentPage ap = super.adicionarCompromisso(
-				sdf.format(cal.getTime()), tipo, titulo,
-				sdf2.format(cal.getTime()), horaInicial, minutoInicial,
-				sdf2.format(cal.getTime()), horaFinal, minutoFinal, prioridade);
-
-		ap.saveAppointment();
-	}
-}
Index: vel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/AdicionarCompromissoDataInicialFinalInvalidaTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/AdicionarCompromissoDataInicialFinalInvalidaTestCase.java	(revision 4868)
+++ 	(revision )
@@ -1,54 +1,0 @@
-package org.expressolivre.cte.calendar;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
-import org.expressolivre.cte.common.BaseCalendarTestCase;
-import org.expressolivre.cte.pages.calendar.AppointmentPage;
-import org.testng.Assert;
-import org.testng.annotations.Optional;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
-
-/**
- * Suite:[FUN03.2] Adicionar Compromisso
- * 
- * Caso de Teste: EL-1053:Adicionar compromisso com data inicial/final invalida
- * inicial
- * 
- * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
- * testcase&id=EL-1053
- * 
- * @author L.F.Estivalet (Serpro)
- * 
- *         Created on Jul 28, 2011 at 4:42:08 AM
- * 
- */
-public class AdicionarCompromissoDataInicialFinalInvalidaTestCase extends
-		BaseCalendarTestCase {
-
-	@Parameters({ "tipo", "titulo", "dataInicial", "horaInicial",
-			"minutoInicial", "dataFinal", "horaFinal", "minutoFinal",
-			"prioridade" })
-	@Test
-	public void adicionarCompromissoComDataInicialFinalInvalida(
-			@Optional("Normal") String tipo, String titulo, String dataInicial,
-			String horaInicial, String minutoInicial, String dataFinal,
-			String horaFinal, String minutoFinal,
-			@Optional("Normal") String prioridade) {
-
-		// Pega data corrente.
-		Calendar cal = Calendar.getInstance();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-
-		AppointmentPage ap = super.adicionarCompromisso(
-				sdf.format(cal.getTime()), tipo, titulo, dataInicial,
-				horaInicial, minutoInicial, dataFinal, horaFinal, minutoFinal,
-				prioridade);
-		ap.saveAppointment();
-
-		Assert.assertEquals("VocÃª informou uma data invÃ¡lida.",
-				ap.getFormStatus());
-
-	}
-}
Index: vel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/AdicionarCompromissoHoraInicialFinalInvalidaTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/AdicionarCompromissoHoraInicialFinalInvalidaTestCase.java	(revision 4868)
+++ 	(revision )
@@ -1,52 +1,0 @@
-package org.expressolivre.cte.calendar;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
-import org.expressolivre.cte.common.BaseCalendarTestCase;
-import org.expressolivre.cte.pages.calendar.AppointmentPage;
-import org.testng.Assert;
-import org.testng.annotations.Optional;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
-
-/**
- * Suite:[FUN03.2] Adicionar Compromisso
- * 
- * Caso de Teste: EL-1054:Adicionar compromisso com hora inicial/final invalida.
- * 
- * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
- * testcase&id=EL-1054
- * 
- * @author L.F.Estivalet (Serpro)
- * 
- *         Created on Jul 26, 2011 at 10:34:08 AM
- * 
- */
-public class AdicionarCompromissoHoraInicialFinalInvalidaTestCase extends
-		BaseCalendarTestCase {
-
-	@Parameters({ "tipo", "titulo", "horaInicial", "minutoInicial",
-			"horaFinal", "minutoFinal", "prioridade" })
-	@Test
-	public void adicionarCompromissoHoraFinalMenorQueHoraInicial(
-			@Optional("Normal") String tipo, String titulo, String horaInicial,
-			String minutoInicial, String horaFinal, String minutoFinal,
-			@Optional("Normal") String prioridade) {
-
-		// Pega data corrente.
-		Calendar cal = Calendar.getInstance();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-		SimpleDateFormat sdf2 = new SimpleDateFormat("dd/MM/yyyy");
-
-		AppointmentPage ap = super.adicionarCompromisso(
-				sdf.format(cal.getTime()), tipo, titulo,
-				sdf2.format(cal.getTime()), horaInicial, minutoInicial,
-				sdf2.format(cal.getTime()), horaFinal, minutoFinal, prioridade);
-		ap.saveAppointment();
-
-		Assert.assertEquals(ap.getFormStatus(),
-				"vocÃª informou uma hora do dia invÃ¡lida.");
-
-	}
-}
Index: vel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/RemoverCompromissoTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/RemoverCompromissoTestCase.java	(revision 4864)
+++ 	(revision )
@@ -1,35 +1,0 @@
-package org.expressolivre.cte.calendar;
-
-import org.expressolivre.cte.common.BaseCalendarTestCase;
-import org.expressolivre.cte.pages.calendar.AppointmentViewPage;
-import org.expressolivre.cte.pages.calendar.CalendarTodayViewPage;
-import org.testng.Assert;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
-
-/**
- * Caso de Teste: EL-970:Remover compromisso
- * 
- * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
- * testcase&id=EL-970
- * 
- * @author L.F.Estivalet (Serpro)
- * 
- *         Created on Jul 26, 2011 at 9:49:05 AM
- * 
- */
-public class RemoverCompromissoTestCase extends BaseCalendarTestCase {
-
-	@Parameters({ "titulo" })
-	@Test
-	public void exibirCompromisso(String titulo) {
-		CalendarTodayViewPage ctvp = super.openTodayView();
-		String id = ctvp.getAppointmentId(titulo);
-
-		AppointmentViewPage avp = cp.openAppointmentViewPage(id);
-		Assert.assertEquals(avp.getTitle(), titulo);
-
-		avp.removeAppointment();
-	}
-
-}
Index: vel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/AdicionarCompromissoDataFinalMenorDataInicialTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/AdicionarCompromissoDataFinalMenorDataInicialTestCase.java	(revision 4864)
+++ 	(revision )
@@ -1,57 +1,0 @@
-package org.expressolivre.cte.calendar;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
-import org.expressolivre.cte.common.BaseCalendarTestCase;
-import org.expressolivre.cte.pages.calendar.AppointmentPage;
-import org.testng.Assert;
-import org.testng.annotations.Optional;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
-
-/**
- * Suite:[FUN03.2] Adicionar Compromisso
- * 
- * Caso de Teste: EL-947:Adicionar compromisso com data final menor que data
- * inicial
- * 
- * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
- * testcase&id=EL-947
- * 
- * @author L.F.Estivalet (Serpro)
- * 
- *         Created on Jul 26, 2011 at 10:45:08 AM
- * 
- */
-public class AdicionarCompromissoDataFinalMenorDataInicialTestCase extends
-		BaseCalendarTestCase {
-
-	@Parameters({ "tipo", "titulo", "horaInicial", "minutoInicial",
-			"horaFinal", "minutoFinal", "prioridade" })
-	@Test
-	public void adicionarCompromissoComDataFinalMenorQueDataInicial(
-			@Optional("Normal") String tipo, String titulo, String horaInicial,
-			String minutoInicial, String horaFinal, String minutoFinal,
-			@Optional("Normal") String prioridade) {
-
-		// Pega data corrente.
-		Calendar cal = Calendar.getInstance();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-		SimpleDateFormat sdf2 = new SimpleDateFormat("dd/MM/yyyy");
-
-		String dataInicial = sdf2.format(cal.getTime());
-		cal.add(Calendar.DATE, -1);
-		String dataFinal = sdf2.format(cal.getTime());
-
-		AppointmentPage ap = super.adicionarCompromisso(
-				sdf.format(cal.getTime()), tipo, titulo, dataInicial,
-				horaInicial, minutoInicial, dataFinal, horaFinal, minutoFinal,
-				prioridade);
-		ap.saveAppointment();
-
-		Assert.assertEquals("VocÃª informou uma data invÃ¡lida.",
-				ap.getFormStatus());
-
-	}
-}
Index: vel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/AdicionarCompromissoHoraFinalMenorHoraInicialTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/AdicionarCompromissoHoraFinalMenorHoraInicialTestCase.java	(revision 4864)
+++ 	(revision )
@@ -1,54 +1,0 @@
-package org.expressolivre.cte.calendar;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
-import org.expressolivre.cte.common.BaseCalendarTestCase;
-import org.expressolivre.cte.pages.calendar.AppointmentPage;
-import org.testng.Assert;
-import org.testng.annotations.Optional;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
-
-/**
- * Suite:[FUN03.2] Adicionar Compromisso
- * 
- * Caso de Teste: EL-948:Adicionar compromisso com hora final menor que hora
- * inicial
- * 
- * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
- * testcase&id=EL-948
- * 
- * @author L.F.Estivalet (Serpro)
- * 
- *         Created on Jul 26, 2011 at 10:34:08 AM
- * 
- */
-public class AdicionarCompromissoHoraFinalMenorHoraInicialTestCase extends
-		BaseCalendarTestCase {
-
-	@Parameters({ "tipo", "titulo", "horaInicial", "minutoInicial",
-			"horaFinal", "minutoFinal", "prioridade" })
-	@Test
-	public void adicionarCompromissoHoraFinalMenorQueHoraInicial(
-			@Optional("Normal") String tipo, String titulo, String horaInicial,
-			String minutoInicial, String horaFinal, String minutoFinal,
-			@Optional("Normal") String prioridade) {
-
-		// Pega data corrente.
-		Calendar cal = Calendar.getInstance();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-		SimpleDateFormat sdf2 = new SimpleDateFormat("dd/MM/yyyy");
-
-		AppointmentPage ap = super.adicionarCompromisso(
-				sdf.format(cal.getTime()), tipo, titulo,
-				sdf2.format(cal.getTime()), horaInicial, minutoInicial,
-				sdf2.format(cal.getTime()), horaFinal, minutoFinal, prioridade);
-		ap.saveAppointment();
-
-		Assert.assertEquals(
-				"A hora de inicio nÃ£o pode ser maior do que a hora de tÃ©rmino.",
-				ap.getFormStatus());
-
-	}
-}
Index: vel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/ExibirCompromissoTestCase.java
===================================================================
--- /devel/testlink/automation2.0/src/test/java/org/expressolivre/cte/calendar/ExibirCompromissoTestCase.java	(revision 4864)
+++ 	(revision )
@@ -1,43 +1,0 @@
-package org.expressolivre.cte.calendar;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
-import org.expressolivre.cte.common.BaseCalendarTestCase;
-import org.expressolivre.cte.pages.calendar.AppointmentViewPage;
-import org.expressolivre.cte.pages.calendar.CalendarTodayViewPage;
-import org.testng.Assert;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
-
-/**
- * Caso de Teste: EL-964:Exibir compromisso
- * 
- * Link: http://testlink.expressolivre.org/linkto.php?tprojectPrefix=EL&item=
- * testcase&id=EL-964
- * 
- * @author L.F.Estivalet (Serpro)
- * 
- *         Created on Jul 25, 2011 at 10:37:43 AM
- * 
- */
-public class ExibirCompromissoTestCase extends BaseCalendarTestCase {
-
-	@Parameters({ "tipo", "titulo", "inicio", "fim", "prioridade" })
-	@Test
-	public void exibirCompromisso(String tipo, String titulo, String inicio,
-			String fim, String prioridade) {
-		CalendarTodayViewPage ctvp = super.openTodayView();
-		String id = ctvp.getAppointmentId(titulo);
-
-		Calendar cal = Calendar.getInstance();
-		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
-		String today = sdf.format(cal.getTime());
-
-		AppointmentViewPage avp = cp.openAppointmentViewPage(id);
-		Assert.assertEquals(avp.getTitle(), titulo);
-		Assert.assertEquals(avp.getStartTime(), today + " - " + inicio);
-		Assert.assertEquals(avp.getEndTime(), today + " - " + fim);
-		Assert.assertEquals(avp.getPriority(), prioridade);
-	}
-}
Index: /devel/testlink/automation2.0/src/test/resources/config.properties
===================================================================
--- /devel/testlink/automation2.0/src/test/resources/config.properties	(revision 4864)
+++ /devel/testlink/automation2.0/src/test/resources/config.properties	(revision 4890)
@@ -9,7 +9,11 @@
 
 # Usuario normal
-url=https://cte2.serpro.gov.br
-user=88758559000
-passwd=serpro
+#url=https://cte2.serpro.gov.br
+#user=88758559000
+#passwd=serpro
+
+url=https://cte5.serpro.gov.br
+user=expresso-admin
+passwd=3xpr3ss0
 
 #url=https://10.200.113.112/
Index: /devel/testlink/automation2.0/[FUN03.2] - AdicionarCompromisso.xml
===================================================================
--- /devel/testlink/automation2.0/[FUN03.2] - AdicionarCompromisso.xml	(revision 4868)
+++ /devel/testlink/automation2.0/[FUN03.2] - AdicionarCompromisso.xml	(revision 4890)
@@ -11,5 +11,5 @@
 	  <parameter name="minutoFinal"  value="30"/>
 	  <classes>
-	     <class name="org.expressolivre.cte.calendar.AdicionarCompromissoTestCase" />
+	     <class name="org.expressolivre.cte.calendar.adicionar.AdicionarCompromissoTestCase" />
 	  </classes>
   </test>
@@ -23,5 +23,5 @@
 	  <parameter name="minutoFinal"  value="30"/>
 	  <classes>
-	     <class name="org.expressolivre.cte.calendar.AdicionarCompromissoTestCase" />
+	     <class name="org.expressolivre.cte.calendar.adicionar.AdicionarCompromissoTestCase" />
 	  </classes>
   </test>
@@ -35,5 +35,5 @@
 	  <parameter name="minutoFinal"  value="30"/>
 	  <classes>
-	     <class name="org.expressolivre.cte.calendar.AdicionarCompromissoTestCase" />
+	     <class name="org.expressolivre.cte.calendar.adicionar.AdicionarCompromissoTestCase" />
 	  </classes>
   </test>
@@ -46,5 +46,5 @@
 	  <parameter name="prioridade"  value="Normal"/>
 	  <classes>
-	     <class name="org.expressolivre.cte.calendar.ExibirCompromissoTestCase" />
+	     <class name="org.expressolivre.cte.calendar.visualizar.ExibirCompromissoTestCase" />
 	  </classes>
   </test>
@@ -53,5 +53,5 @@
 	  <parameter name="titulo"  value="[Selenium] Compromisso normal data corrente"/>
 	  <classes>
-	     <class name="org.expressolivre.cte.calendar.RemoverCompromissoTestCase" />
+	     <class name="org.expressolivre.cte.calendar.visualizar.RemoverCompromissoTestCase" />
 	  </classes>
   </test>
@@ -60,5 +60,5 @@
 	  <parameter name="titulo"  value="[Selenium] Compromisso privado data corrente"/>
 	  <classes>
-	     <class name="org.expressolivre.cte.calendar.RemoverCompromissoTestCase" />
+	     <class name="org.expressolivre.cte.calendar.visualizar.RemoverCompromissoTestCase" />
 	  </classes>
   </test>
@@ -67,8 +67,8 @@
 	  <parameter name="titulo"  value="[Selenium] Compromisso restrito data corrente"/>
 	  <classes>
-	     <class name="org.expressolivre.cte.calendar.RemoverCompromissoTestCase" />
-	  </classes>
-  </test>
--->
+	     <class name="org.expressolivre.cte.calendar.visualizar.RemoverCompromissoTestCase" />
+	  </classes>
+  </test>
+
   <test name="Adicionar compromisso com hora final menor que inicial">
 	  <parameter name="tipo"  value="Normal"/>
@@ -79,5 +79,5 @@
 	  <parameter name="minutoFinal"  value="30"/>
 	  <classes>
-	     <class name="org.expressolivre.cte.calendar.AdicionarCompromissoHoraFinalMenorHoraInicialTestCase" />
+	     <class name="org.expressolivre.cte.calendar.adicionar.AdicionarCompromissoHoraFinalMenorHoraInicialTestCase" />
 	  </classes>
   </test>
@@ -93,5 +93,5 @@
 	  <parameter name="minutoFinal"  value="30"/>
 	  <classes>
-	     <class name="org.expressolivre.cte.calendar.AdicionarCompromissoDataFinalMenorDataInicialTestCase" />
+	     <class name="org.expressolivre.cte.calendar.adicionar.AdicionarCompromissoDataFinalMenorDataInicialTestCase" />
 	  </classes>
   </test>
@@ -107,5 +107,5 @@
 	  <parameter name="minutoFinal"  value="30"/>
 	  <classes>
-	     <class name="org.expressolivre.cte.calendar.AdicionarCompromissoDataInicialFinalInvalidaTestCase" />
+	     <class name="org.expressolivre.cte.calendar.adicionar.AdicionarCompromissoDataInicialFinalInvalidaTestCase" />
 	  </classes>
   </test>
@@ -121,5 +121,5 @@
 	  <parameter name="minutoFinal"  value="30"/>
 	  <classes>
-	     <class name="org.expressolivre.cte.calendar.AdicionarCompromissoDataInicialFinalInvalidaTestCase" />
+	     <class name="org.expressolivre.cte.calendar.adicionar.AdicionarCompromissoDataInicialFinalInvalidaTestCase" />
 	  </classes>
   </test>
@@ -134,5 +134,5 @@
 	  <parameter name="minutoFinal"  value="30"/>
 	  <classes>
-	     <class name="org.expressolivre.cte.calendar.AdicionarCompromissoHoraInicialFinalInvalidaTestCase" />
+	     <class name="org.expressolivre.cte.calendar.adicionar.AdicionarCompromissoHoraInicialFinalInvalidaTestCase" />
 	  </classes>
   </test>
@@ -146,9 +146,70 @@
 	  <parameter name="minutoFinal"  value="30"/>
 	  <classes>
-	     <class name="org.expressolivre.cte.calendar.AdicionarCompromissoHoraInicialFinalInvalidaTestCase" />
-	  </classes>
-  </test>
- 
- 
+	     <class name="org.expressolivre.cte.calendar.adicionar.AdicionarCompromissoHoraInicialFinalInvalidaTestCase" />
+	  </classes>
+  </test>
+
+   <test name="Adicionar compromisso sem titulo">
+	  <parameter name="tipo"  value="Normal"/>
+	  <parameter name="titulo"  value=""/>
+	  <parameter name="horaInicial"  value="33"/>
+	  <parameter name="minutoInicial"  value="00"/>
+	  <parameter name="horaFinal"  value="10"/>
+	  <parameter name="minutoFinal"  value="30"/>
+	  <classes>
+	     <class name="org.expressolivre.cte.calendar.adicionar.AdicionarCompromissoSemInformarTituloTestCase" />
+	  </classes>
+  </test>
+
+  <test name="Adicionar compromisso com alarme">
+	  <parameter name="tipo"  value="Normal"/>
+	  <parameter name="titulo"  value="[Selenium] Compromisso com alarme"/>
+	  <parameter name="horaInicial"  value="18"/>
+	  <parameter name="minutoInicial"  value="00"/>
+	  <parameter name="horaFinal"  value="18"/>
+	  <parameter name="minutoFinal"  value="30"/>
+	  <parameter name="alarme"  value="0-0-5"/>
+	  <classes>
+	     <class name="org.expressolivre.cte.calendar.adicionar.AdicionarCompromissoComAlarmeTestCase" />
+	  </classes>
+  </test>
+
+
+  <test name="Adicionar compromisso com recorrencia diaria">
+	  <parameter name="tipo"  value="Normal"/>
+	  <parameter name="titulo"  value="[Selenium] Compromisso com recorrencia diaria"/>
+	  <parameter name="dataInicial"  value="01/08/2011"/>
+	  <parameter name="horaInicial"  value="09"/>
+	  <parameter name="minutoInicial"  value="00"/>
+	  <parameter name="horaFinal"  value="10"/>
+	  <parameter name="minutoFinal"  value="00"/>
+	  <parameter name="dataFinal"  value="05/08/2011"/>
+	  <classes>
+	     <class name="org.expressolivre.cte.calendar.adicionar.AdicionarCompromissoComRepeticaoDiariaTestCase" />
+	  </classes>
+  </test>
+
+  <test name="Adicionar compromisso com recorrencia semanal">
+	  <parameter name="tipo"  value="Normal"/>
+	  <parameter name="titulo"  value="[Selenium] Compromisso com recorrencia semanal"/>
+	  <parameter name="dataInicial"  value="01/08/2011"/>
+	  <parameter name="horaInicial"  value="09"/>
+	  <parameter name="minutoInicial"  value="00"/>
+	  <parameter name="horaFinal"  value="10"/>
+	  <parameter name="minutoFinal"  value="00"/>
+	  <parameter name="dataFinal"  value="31/08/2011"/>
+	  <parameter name="dias"  value="2,4,8"/>
+	  <classes>
+	     <class name="org.expressolivre.cte.calendar.adicionar.AdicionarCompromissoComRepeticaoSemanalTestCase" />
+	  </classes>
+  </test>
+--> 
+
+  <test name="Remover compromisso com recorrencia">
+	  <parameter name="titulo"  value="[Selenium] Compromisso com recorrencia semanal"/>
+	  <classes>
+	     <class name="org.expressolivre.cte.calendar.visualizar.RemoverCompromissoComRepeticaoTestCase" />
+	  </classes>
+  </test>
   
 </suite>
