From 11c3f20b77a73a08d98a4f625b9b65f7821808f8 Mon Sep 17 00:00:00 2001
From: vsnepomuceno <vnepomuceno@gmail.com>
Date: Thu, 12 Jun 2014 22:17:26 -0300
Subject: [PATCH 01/19] Atualizacao dos testes para atividade 4.

---
 test/cucumber/ResearchProject.feature         |  46 ++---
 .../steps/ResearchProjectSteps.groovy         | 173 +++++++++++++++++-
 .../ResearchProjectPageCreatePage.groovy      |   9 +
 ...esearchProjectTestDadaAndOperations.groovy |  19 ++
 4 files changed, 216 insertions(+), 31 deletions(-)

diff --git a/test/cucumber/ResearchProject.feature b/test/cucumber/ResearchProject.feature
index 5b996ead..21d015c7 100644
--- a/test/cucumber/ResearchProject.feature
+++ b/test/cucumber/ResearchProject.feature
@@ -27,8 +27,8 @@ Feature: research project
 
 #if($XMLUpload)
   Scenario: upload research project with a file
-    Given the system has some research project stored
-    And I am logged in the system
+    Given I am logged in the system
+    And the system has some research project stored
     When I upload new research projects from the file "testelattes2.xml"
     Then the system has more research projects now
 
@@ -52,63 +52,63 @@ Feature: research project
     Then the system shows the research projects listed by the research projects name
 
   Scenario: remove research project that does not exist
-    Given the system has no research projects named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    Given the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
     And I am logged into the system as administrator
     When I try to remove a research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    Then nothing happens to the research projects stored
+    Then no research project stored is affected
 
   Scenario: edit existing research project
-    Given the research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is stored in the system
+    Given the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
     And I am logged into the system as administrator of the research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
     When I try to edit the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" in the system
     And I changed the data of the research project
     Then the data of the research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is updated in the system
 
   Scenario: new invalid research project with blank name
-    Given the research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is stored in the system
+    Given the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
     When I try to create a research project named as ""
     Then the research project "" is not stored by the system because it is invalid
     And no research project stored is affected
 
   Scenario: new invalid research project with blank description
-    Given the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" with description field blank
-    Then the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is not stored by the system because it is invalid
+    Given the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas"
+    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas" with description field blank
+    Then the research project "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas" is not stored by the system because it is invalid
     And no research project stored is affected
 
   Scenario: new research project with duplicated members
-    Given the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    When I create a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" with member field duplicated
-    Then the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is properly stored by the system
-    And the stored member list does not have duplicated members
+    Given the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas members duplicated"
+    When I create a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas members duplicated" with member field duplicated
+    Then the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas members duplicated" is properly stored by the system
+    And the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas members duplicated" does not have duplicated members
 
   Scenario: new research project web
     Given I am at new research project page
-    And the system has no research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    When I create the research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    Then the research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is stored by the system
+    And the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    When I create a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" with all required data
+    Then the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is properly stored by the system
     And it is shown in the research project list with name "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
 
   Scenario: new invalid research project with blank name web
     Given I am at new research project page
-    And the research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is stored in the system
-    When I try to create the research project named ""
-    Then the research project named "" is not stored by the system because it is invalid
+    And the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    When I try to create a research project named as ""
+    Then the research project "" is not stored by the system because it is invalid
     And  the system shows an error message at the research project page
     And no research project stored is affected
 
   Scenario: new invalid research project with blank description web
     Given I am at new research project page
-    And the system has no research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    When I try to create the research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" with description field blank
-    Then the research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is not stored by the system because it is invalid
+    And the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas"
+    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas" with description field blank
+    Then the research project "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas" is not stored by the system because it is invalid
     And  the system shows an error message at the research project page
     And no research project stored is affected
 
   Scenario: duplicated research project web
     Given I am at new research project page
     And the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    When I try to create the research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
     Then the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is not stored twice
     And it is not shown duplicated in the research project list
     And  the system shows an warning message at the research project page
diff --git a/test/cucumber/steps/ResearchProjectSteps.groovy b/test/cucumber/steps/ResearchProjectSteps.groovy
index 41611c7f..8ff348a0 100644
--- a/test/cucumber/steps/ResearchProjectSteps.groovy
+++ b/test/cucumber/steps/ResearchProjectSteps.groovy
@@ -1,14 +1,18 @@
 package steps
 
+import org.apache.shiro.SecurityUtils
+import org.apache.shiro.UnavailableSecurityManagerException
 import pages.researchProject.ResearchProjectPage
+import pages.researchProject.ResearchProjectPageCreatePage
+import rgms.authentication.User
+import rgms.member.Member
 import rgms.researchProject.ResearchProject
 
+import static cucumber.api.groovy.EN.*
+
 /**
  * Created by Bruno Soares on 24/02/14.
  */
-
-import static cucumber.api.groovy.EN.*
-
 def initialSize = 0
 
 //Create Research Project
@@ -16,7 +20,7 @@ Given(~'^the system has no research project named as "([^"]*)"$'){ String projec
     assert checkIfResearchProjectNoExists(projectName)
 }
 
-When(~'^I create a research project named as "([^"]*)"$'){ String projectName ->
+When(~'^I create a research project named as "([^"]*)" with all required data$'){ String projectName ->
     ResearchProjectTestDadaAndOperations.createResearchProject(projectName)
 }
 
@@ -33,12 +37,22 @@ Given(~'^the system has a research project named as "([^"]*)"$'){ String project
     assert ResearchProject.findByProjectName(projectName) != null
 }
 
-Then(~'^the research project "([^"]*)" is not store twice$'){ String projectName ->
-    assert ResearchProject.findAllByProjectName(projectName).size() == 1
+When(~'^I try to create a research project named as "([^"]*)"$'){ String projectName ->
+    // updated
+    ResearchProjectTestDadaAndOperations.oldProjects =  ResearchProject.findAll()
+    ResearchProjectTestDadaAndOperations.createResearchProject(projectName)
 }
 
+Then(~'^the research project "([^"]*)" is not stored twice$'){ String projectName ->
+    assert ResearchProject.findAllByProjectName(projectName).size() == 1
+}
 
 //Remove Research Project
+
+Given(~'^I am logged into the system as administrator of the research group named as "([^"]*)"$') { String projectName ->
+    assert checkIfLoggedUserIsAdminOfResearchProject(projectName);
+}
+
 When(~'^I remove the research project named as "([^"]*)"$'){ String projectName ->
     ResearchProjectTestDadaAndOperations.deleteResearchProject(projectName)
 }
@@ -54,7 +68,6 @@ When(~'^I create a research project named as "([^"]*)" without funders$'){ Strin
 
 //XML import
 Given(~'^the system has some research project stored$'){ ->
-    TestDataAndOperations.loginController(this)
     initialSize = ResearchProject.findAll().size()
 }
 
@@ -80,7 +93,120 @@ Then (~'^I\'m still on the research project page$'){ ->
 }
 
 Then (~'^the system shows an error message at the research project page$'){ ->
-    assert page.hasInvalidXMLSubmited()
+
+}
+
+// ------------------------------------------------------------------------------------------------------------------------------
+// filter research projects by name
+
+When(~'^I fill the project name field$') { ->
+
+}
+
+When(~'^I select the option "Filtrar Projetos de Pesquisa"$') { ->
+    page.select("Filtrar Projetos de Pesquisa");
+}
+
+Then(~'^the system shows the research projects listed by the research projects name$') { ->
+
+}
+
+// ------------------------------------------------------------------------------------------------------------------------------
+// remove research project that does not exist
+
+Given(~'^I am logged into the system as administrator$') { ->
+    to LoginPage;
+    at LoginPage;
+    page.fillLoginData("admin", "adminadmin");
+}
+
+When(~'^I try to remove a research project named "([^"]*)"$') { String projectName ->
+
+}
+
+Then(~'^nothing happens to the research projects stored$') { ->
+
+}
+// ------------------------------------------------------------------------------------------------------------------------------
+
+// ------------------------------------------------------------------------------------------------------------------------------
+// list research projects where I am a member
+
+Given(~'^I am at the research project list page$') { ->
+    at ResearchProjectPage;
+}
+
+When(~'^I select the "Meus Projetos de Pesquisa" option at research project menu$') { ->
+    page.select("Meus Projetos de Pesquisa");
+}
+
+Then(~'^the system shows a list with the research projects where I am a member$') { ->
+
+}
+
+// ------------------------------------------------------------------------------------------------------------------------------
+// edit existing research project
+Then(~'^the data of the research project named "([^"]*)" is updated in the system$') { String projectName ->
+
+}
+// ------------------------------------------------------------------------------------------------------------------------------
+
+// NOVOS Vilmar
+Then(~'^no research project stored is affected'){ ->
+    assert checkIfNoResearchProjectAffected()
+}
+
+Given(~'^I am logged in the system$'){ ->
+    TestDataAndOperations.loginController(this)
+}
+
+Then(~'^the research project "([^"]*)" is not stored by the system because it is invalid$'){ String projectName ->
+    assert ResearchProject.findByProjectName(projectName) == null
+}
+
+When(~'^I try to create a research project named as "([^"]*)" with description field blank$'){ String projectName ->
+    ResearchProjectTestDadaAndOperations.oldProjects =  ResearchProject.findAll()
+    ResearchProjectTestDadaAndOperations.createResearchProject(projectName)
+}
+
+When(~'^I create a research project named as "([^"]*)" with member field duplicated$'){ String projectName ->
+    ResearchProjectTestDadaAndOperations.createResearchProject(projectName)
+}
+
+Then(~'^the research project "([^"]*)" does not have duplicated members$'){ projectName ->
+    ResearchProject project  = ResearchProject.findByProjectName(projectName);
+    boolean check = true
+    // Não vai ter nunca porque é um SET
+    Iterator i = project.members.iterator()
+    while (i.hasNext()) {
+        String m = i.next()
+        project.members.remove(m)
+        if (project.members.contains(m)) {
+            check = false
+            break
+        }
+    }
+
+    assert check
+}
+
+Given (~'^I am at new research project page$'){ ->
+    to ResearchProjectPage
+    page.selectNewReseachGroup()
+    at ResearchProjectPageCreatePage
+    page.fillResearchProjectDetails()
+}
+
+Then(~'^it is shown in the research project list with name "([^"]*)"$'){ String projectName ->
+    // Como verificar lista
+}
+
+Then(~'^it is not shown duplicated in the research project list$'){ ->
+    // Como mostrar erro
+}
+
+Then(~'^the system shows an warning message at the research project page$'){ ->
+    // Como mostrar erro
 }
 
 //Aux Functions
@@ -93,4 +219,35 @@ def checkIfResearchProjectExists(String projectName){
     ResearchProject project = ResearchProject.findByProjectName(projectName)
     ResearchProject project2 = ResearchProjectTestDadaAndOperations.findResearchProjectByProjectName(projectName)
     project.equals(project2)
+}
+
+def checkIfNoResearchProjectAffected() {
+    boolean check = true;
+    List<ResearchProject> beforeProjects = ResearchProjectTestDadaAndOperations.oldProjects
+    List<ResearchProject> afterProjects = ResearchProject.findAll()
+
+    for(int i = 0; i < beforeProjects.size();i++) {
+        if (!beforeProjects.get(i).equals(afterProjects.get(i))) {
+            check = false
+            if (!check) break
+        }
+    }
+
+    check
+}
+
+def checkIfLoggedUserIsAdminOfResearchProject(String projectName) {
+    ResearchProject project = ResearchProject.findByProjectName(projectName);
+    Member author = null;
+
+    try {
+        if(SecurityUtils.subject?.principal != null) {
+            User user = User.findByUsername(SecurityUtils.subject.principal);
+            author = user.getAuthor();
+        }
+    } catch(UnavailableSecurityManagerException e) {
+        return false;
+    }
+
+    return author.name == project.responsible;
 }
\ No newline at end of file
diff --git a/test/functional/pages/researchProject/ResearchProjectPageCreatePage.groovy b/test/functional/pages/researchProject/ResearchProjectPageCreatePage.groovy
index dafd188d..6919ff3f 100644
--- a/test/functional/pages/researchProject/ResearchProjectPageCreatePage.groovy
+++ b/test/functional/pages/researchProject/ResearchProjectPageCreatePage.groovy
@@ -2,6 +2,7 @@ package pages.researchProject
 
 import pages.FormPage
 import pages.GetPageTitle
+import steps.FunderTestDataAndOperations
 
 /**
  * Created by Bruno Soares on 24/02/14.
@@ -22,4 +23,12 @@ class ResearchProjectPageCreatePage extends FormPage{
         }
     }
 
+    def fillResearchProjectDetails() {
+        $("form").projectName = "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+        $("form").description = "Neste projeto pretendemso definir e validar um método para a implementação de aplicações orientadas a objetos complexas. Em particular, este método deve suportar uma abordagem progressiva para implementação orientada a objetos, de forma que aspectos de distribuição, concorrência, e persistência não sejam inicialmente considerados pelo processo de implementação, mas sejam gradualmente introduzidos, preservando os requisitos funcionais da aplicação."
+        $("form").status = "CONCLUIDO"
+        $("form").startYear = 2000
+        $("form").endYear = 2003
+        $("form").members = "Rubens Lopes da Silva"
+    }
 }
diff --git a/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy b/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
index e402a19b..0cbf3507 100644
--- a/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
+++ b/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
@@ -11,6 +11,8 @@ class ResearchProjectTestDadaAndOperations {
 
     static ResearchProjectController cont = new ResearchProjectController()
 
+    static List<ResearchProject> oldProjects
+
     static researchProjects =[
             [projectName:"Implementação Progressiva de Aplicações Orientadas a Objetos Complexas",
                     description:"Neste projeto pretendemso definir e validar um método para a implementação de aplicações orientadas a objetos complexas. Em particular, este método deve suportar uma abordagem progressiva para implementação orientada a objetos, de forma que aspectos de distribuição, concorrência, e persistência não sejam inicialmente considerados pelo processo de implementação, mas sejam gradualmente introduzidos, preservando os requisitos funcionais da aplicação.",
@@ -28,6 +30,23 @@ class ResearchProjectTestDadaAndOperations {
                     startYear: 2001,
                     endYear: 2004,
                     members: ["Bruno Soares da Silva","Dyego Felipe Oliveira de Penha", "Pedro Henrique Torres Gonçalves"]
+            ],
+            [projectName:"Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas",
+             description:"",
+             status:"CONCLUIDO",
+             responsible: "Paulo Henrique Monteiro Borba",
+             startYear: 2001,
+             endYear: 2004,
+             members: ["Bruno Soares da Silva","Dyego Felipe Oliveira de Penha", "Pedro Henrique Torres Gonçalves"]
+            ],
+            [projectName:"Implementação Progressiva de Aplicações Orientadas a Objetos Complexas members duplicated",
+               description:"Neste projeto pretendemso definir e validar um método para a implementação de aplicações orientadas a objetos complexas. Em particular, este método deve suportar uma abordagem progressiva para implementação orientada a objetos, de forma que aspectos de distribuição, concorrência, e persistência não sejam inicialmente considerados pelo processo de implementação, mas sejam gradualmente introduzidos, preservando os requisitos funcionais da aplicação.",
+               status:"CONCLUIDO",
+               responsible: "Paulo Henrique Monteiro Borba",
+               startYear: 2000,
+               endYear: 2003,
+               funders: FunderTestDataAndOperations.funder[0],
+               members: ["Rubens Lopes da Silva", "Rubens Lopes da Silva"]
             ]
     ]
 

From 1f532792c45613389f1f6b36e6eee5766247d7af Mon Sep 17 00:00:00 2001
From: vsnepomuceno <vnepomuceno@gmail.com>
Date: Thu, 12 Jun 2014 23:16:24 -0300
Subject: [PATCH 02/19] =?UTF-8?q?Altera=C3=A7=C3=B5es=20nos=20testes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/cucumber/ResearchProject.feature                 |  4 ++--
 test/cucumber/steps/ResearchProjectSteps.groovy       | 11 ++++++++---
 .../pages/researchProject/ResearchProjectPage.groovy  | 11 +++++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/test/cucumber/ResearchProject.feature b/test/cucumber/ResearchProject.feature
index 21d015c7..ae3fbd84 100644
--- a/test/cucumber/ResearchProject.feature
+++ b/test/cucumber/ResearchProject.feature
@@ -94,7 +94,7 @@ Feature: research project
     And the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
     When I try to create a research project named as ""
     Then the research project "" is not stored by the system because it is invalid
-    And  the system shows an error message at the research project page
+    And  I'm still on the new research project page
     And no research project stored is affected
 
   Scenario: new invalid research project with blank description web
@@ -102,7 +102,7 @@ Feature: research project
     And the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas"
     When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas" with description field blank
     Then the research project "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas" is not stored by the system because it is invalid
-    And  the system shows an error message at the research project page
+    And  I'm still on the new research project page
     And no research project stored is affected
 
   Scenario: duplicated research project web
diff --git a/test/cucumber/steps/ResearchProjectSteps.groovy b/test/cucumber/steps/ResearchProjectSteps.groovy
index 8ff348a0..27e69a87 100644
--- a/test/cucumber/steps/ResearchProjectSteps.groovy
+++ b/test/cucumber/steps/ResearchProjectSteps.groovy
@@ -93,7 +93,7 @@ Then (~'^I\'m still on the research project page$'){ ->
 }
 
 Then (~'^the system shows an error message at the research project page$'){ ->
-
+    assert page.hasInvalidXMLSubmited()
 }
 
 // ------------------------------------------------------------------------------------------------------------------------------
@@ -173,7 +173,7 @@ When(~'^I create a research project named as "([^"]*)" with member field duplica
     ResearchProjectTestDadaAndOperations.createResearchProject(projectName)
 }
 
-Then(~'^the research project "([^"]*)" does not have duplicated members$'){ projectName ->
+Then(~'^the research project "([^"]*)" does not have duplicated members$'){String projectName ->
     ResearchProject project  = ResearchProject.findByProjectName(projectName);
     boolean check = true
     // Não vai ter nunca porque é um SET
@@ -197,8 +197,13 @@ Given (~'^I am at new research project page$'){ ->
     page.fillResearchProjectDetails()
 }
 
+Then (~'^I\'m still on the new research project page$'){ ->
+    at ResearchProjectPageCreatePage
+}
+
 Then(~'^it is shown in the research project list with name "([^"]*)"$'){ String projectName ->
-    // Como verificar lista
+    to ResearchProjectPage
+    page.checkResearchGroupAtList(projectName)
 }
 
 Then(~'^it is not shown duplicated in the research project list$'){ ->
diff --git a/test/functional/pages/researchProject/ResearchProjectPage.groovy b/test/functional/pages/researchProject/ResearchProjectPage.groovy
index cdfe5921..6264e5f4 100644
--- a/test/functional/pages/researchProject/ResearchProjectPage.groovy
+++ b/test/functional/pages/researchProject/ResearchProjectPage.groovy
@@ -2,6 +2,7 @@ package pages.researchProject
 
 import pages.FormPage
 import pages.GetPageTitle
+import rgms.researchProject.ResearchProject
 
 /**
  * Created by Bruno Soares on 24/02/14.
@@ -43,4 +44,14 @@ class ResearchProjectPage extends FormPage {
         $("a", text: name).click()
     }
 
+    def checkResearchGroupAtList(projectName) {
+        def listDiv = $('div', id: 'list-researchProject')
+        def researchGroupTable = (listDiv.find('table'))[0]
+        def researchGroupRows = researchGroupTable.find('tbody').find('tr')
+        int size = researchGroupRows.size();
+        def researchGroupColumns = researchGroupRows[size - 1].find('td')
+
+        assert researchGroupColumns[0].text() == projectName
+    }
+
 }

From efcccd8733de7ab8ef4b8c5f8acc2697133c4a67 Mon Sep 17 00:00:00 2001
From: vsnepomuceno <vnepomuceno@gmail.com>
Date: Fri, 13 Jun 2014 15:20:22 -0300
Subject: [PATCH 03/19] Implementacao dos cenarios  new invalid research
 project with blank description web e duplicated research project web

---
 test/cucumber/ResearchProject.feature         | 23 +++++-----
 .../steps/ResearchProjectSteps.groovy         | 42 ++++++++++++++++---
 .../ResearchProjectPage.groovy                | 17 ++++++++
 .../ResearchProjectPageCreatePage.groovy      | 34 ++++++++++++---
 ...esearchProjectTestDadaAndOperations.groovy | 10 ++++-
 5 files changed, 100 insertions(+), 26 deletions(-)

diff --git a/test/cucumber/ResearchProject.feature b/test/cucumber/ResearchProject.feature
index ae3fbd84..2a1cb127 100644
--- a/test/cucumber/ResearchProject.feature
+++ b/test/cucumber/ResearchProject.feature
@@ -84,10 +84,9 @@ Feature: research project
 
   Scenario: new research project web
     Given I am at new research project page
-    And the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    When I create a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" with all required data
-    Then the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is properly stored by the system
-    And it is shown in the research project list with name "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    And the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web"
+    When I can create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" with all required data
+    Then it is shown in the research project list with name "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web"
 
   Scenario: new invalid research project with blank name web
     Given I am at new research project page
@@ -99,16 +98,16 @@ Feature: research project
 
   Scenario: new invalid research project with blank description web
     Given I am at new research project page
-    And the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas"
-    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas" with description field blank
-    Then the research project "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas" is not stored by the system because it is invalid
+    And the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web"
+    When I can try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" with description field blank
+    Then the research project "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" is not stored by the system because it is invalid
     And  I'm still on the new research project page
     And no research project stored is affected
 
   Scenario: duplicated research project web
     Given I am at new research project page
-    And the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    Then the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is not stored twice
-    And it is not shown duplicated in the research project list
-    And  the system shows an warning message at the research project page
+    And the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web"
+    When I can try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web"
+    Then  the system shows an warning message at the new research project page
+    And the research project "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" is not shown duplicated in the research project list
+
diff --git a/test/cucumber/steps/ResearchProjectSteps.groovy b/test/cucumber/steps/ResearchProjectSteps.groovy
index 27e69a87..3b373678 100644
--- a/test/cucumber/steps/ResearchProjectSteps.groovy
+++ b/test/cucumber/steps/ResearchProjectSteps.groovy
@@ -17,7 +17,10 @@ def initialSize = 0
 
 //Create Research Project
 Given(~'^the system has no research project named as "([^"]*)"$'){ String projectName ->
-    assert checkIfResearchProjectNoExists(projectName)
+
+    if (!checkIfResearchProjectNoExists(projectName)) {
+        ResearchProject.findByProjectName(projectName).delete()
+    }
 }
 
 When(~'^I create a research project named as "([^"]*)" with all required data$'){ String projectName ->
@@ -194,7 +197,12 @@ Given (~'^I am at new research project page$'){ ->
     to ResearchProjectPage
     page.selectNewReseachGroup()
     at ResearchProjectPageCreatePage
-    page.fillResearchProjectDetails()
+
+}
+
+When(~'^I can create a research project named as "([^"]*)" with all required data$'){ String projectName ->
+    page.fillResearchProjectDetails(projectName)
+    page.createResearchProject()
 }
 
 Then (~'^I\'m still on the new research project page$'){ ->
@@ -206,12 +214,30 @@ Then(~'^it is shown in the research project list with name "([^"]*)"$'){ String
     page.checkResearchGroupAtList(projectName)
 }
 
-Then(~'^it is not shown duplicated in the research project list$'){ ->
-    // Como mostrar erro
+When(~'^I can try to create a research project named as "([^"]*)" with description field blank$'){ String projectName ->
+    // updated
+    ResearchProjectTestDadaAndOperations.oldProjects =  ResearchProject.findAll()
+    page.fillResearchProjectDetailsWithBlankDescription(projectName)
+    page.createResearchProject()
 }
 
-Then(~'^the system shows an warning message at the research project page$'){ ->
-    // Como mostrar erro
+
+When(~'^I can try to create a research project named as "([^"]*)"$'){ String projectName ->
+    // updated
+    ResearchProjectTestDadaAndOperations.oldProjects =  ResearchProject.findAll()
+    at ResearchProjectPageCreatePage
+    page.fillResearchProjectDetails(projectName)
+    page.createResearchProject()
+}
+
+Then(~'^the research project "([^"]*)" is not shown duplicated in the research project list$'){ projectName ->
+    to ResearchProjectPage
+    page.checkResearchGroupDuplicatedAtList(projectName)
+}
+
+Then(~'^the system shows an warning message at the new research project page$'){ ->
+    at ResearchProjectPageCreatePage
+    page.checkHasErrorMsg()
 }
 
 //Aux Functions
@@ -222,6 +248,10 @@ def checkIfResearchProjectNoExists(String projectName){
 
 def checkIfResearchProjectExists(String projectName){
     ResearchProject project = ResearchProject.findByProjectName(projectName)
+    Console.println(projectName)
+    if (project == null) {
+        Console.println("Project NUll")
+    }
     ResearchProject project2 = ResearchProjectTestDadaAndOperations.findResearchProjectByProjectName(projectName)
     project.equals(project2)
 }
diff --git a/test/functional/pages/researchProject/ResearchProjectPage.groovy b/test/functional/pages/researchProject/ResearchProjectPage.groovy
index 6264e5f4..e912173a 100644
--- a/test/functional/pages/researchProject/ResearchProjectPage.groovy
+++ b/test/functional/pages/researchProject/ResearchProjectPage.groovy
@@ -54,4 +54,21 @@ class ResearchProjectPage extends FormPage {
         assert researchGroupColumns[0].text() == projectName
     }
 
+    def checkResearchGroupDuplicatedAtList(projectName) {
+        boolean check = true;
+        def listDiv = $('div', id: 'list-researchProject')
+        def researchGroupTable = (listDiv.find('table'))[0]
+        def researchGroupRows = researchGroupTable.find('tbody').find('tr')
+        int size = researchGroupRows.size();
+        if (size > 1) {
+            def researchGroupColumns = researchGroupRows[size - 1].find('td')
+            def researchGroupColumnsPreviews = researchGroupRows[size - 2].find('td')
+            if ((researchGroupColumns[0].text() == projectName) &&
+                    researchGroupColumnsPreviews[0].text() == projectName) {
+                check = false
+            }
+        }
+        assert check
+    }
+
 }
diff --git a/test/functional/pages/researchProject/ResearchProjectPageCreatePage.groovy b/test/functional/pages/researchProject/ResearchProjectPageCreatePage.groovy
index 6919ff3f..fbf65101 100644
--- a/test/functional/pages/researchProject/ResearchProjectPageCreatePage.groovy
+++ b/test/functional/pages/researchProject/ResearchProjectPageCreatePage.groovy
@@ -23,12 +23,34 @@ class ResearchProjectPageCreatePage extends FormPage{
         }
     }
 
-    def fillResearchProjectDetails() {
-        $("form").projectName = "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-        $("form").description = "Neste projeto pretendemso definir e validar um método para a implementação de aplicações orientadas a objetos complexas. Em particular, este método deve suportar uma abordagem progressiva para implementação orientada a objetos, de forma que aspectos de distribuição, concorrência, e persistência não sejam inicialmente considerados pelo processo de implementação, mas sejam gradualmente introduzidos, preservando os requisitos funcionais da aplicação."
+    def fillResearchProjectDetails(projectName) {
+        $("form").projectName = projectName
+        $("form").description = "Neste projeto pretendemso definir e validar um método para a implementação de aplicações orientadas a Aspectos Complexas web. Em particular, este método deve suportar uma abordagem progressiva para implementação orientada a objetos, de forma que aspectos de distribuição, concorrência, e persistência não sejam inicialmente considerados pelo processo de implementação, mas sejam gradualmente introduzidos, preservando os requisitos funcionais da aplicação."
         $("form").status = "CONCLUIDO"
-        $("form").startYear = 2000
-        $("form").endYear = 2003
-        $("form").members = "Rubens Lopes da Silva"
+        $("form").startYear = 2001
+        $("form").endYear = 2004
+        $("form").responsible = "Paulo Henrique Monteiro Borba"
+    }
+
+    def fillResearchProjectDetailsWithBlankDescription(projectName) {
+        $("form").projectName = projectName
+        $("form").description = ""
+        $("form").status = "CONCLUIDO"
+        $("form").startYear = 2001
+        $("form").endYear = 2004
+        $("form").responsible = "Paulo Henrique Monteiro Borba"
+    }
+
+    def createResearchProject() {
+        $("form").create().click()
+    }
+
+    def checkHasErrorMsg() {
+        def listDiv = $('div', id: 'create-researchProject')
+        def researchGroupUl = (listDiv.find('ul'))[0]
+        def researchGroupRows = researchGroupUl.find('li')
+        int size = researchGroupRows.size();
+
+        assert (size > 0)
     }
 }
diff --git a/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy b/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
index 0cbf3507..db5a3fce 100644
--- a/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
+++ b/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
@@ -37,7 +37,7 @@ class ResearchProjectTestDadaAndOperations {
              responsible: "Paulo Henrique Monteiro Borba",
              startYear: 2001,
              endYear: 2004,
-             members: ["Bruno Soares da Silva","Dyego Felipe Oliveira de Penha", "Pedro Henrique Torres Gonçalves"]
+             members: ["Bruno Soares da Silva"]
             ],
             [projectName:"Implementação Progressiva de Aplicações Orientadas a Objetos Complexas members duplicated",
                description:"Neste projeto pretendemso definir e validar um método para a implementação de aplicações orientadas a objetos complexas. Em particular, este método deve suportar uma abordagem progressiva para implementação orientada a objetos, de forma que aspectos de distribuição, concorrência, e persistência não sejam inicialmente considerados pelo processo de implementação, mas sejam gradualmente introduzidos, preservando os requisitos funcionais da aplicação.",
@@ -45,8 +45,14 @@ class ResearchProjectTestDadaAndOperations {
                responsible: "Paulo Henrique Monteiro Borba",
                startYear: 2000,
                endYear: 2003,
-               funders: FunderTestDataAndOperations.funder[0],
                members: ["Rubens Lopes da Silva", "Rubens Lopes da Silva"]
+            ],
+            [projectName:"Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web",
+                    description:"Neste projeto pretendemso definir e validar um método para a implementação de aplicações orientadas a Aspectos Complexas web. Em particular, este método deve suportar uma abordagem progressiva para implementação orientada a objetos, de forma que aspectos de distribuição, concorrência, e persistência não sejam inicialmente considerados pelo processo de implementação, mas sejam gradualmente introduzidos, preservando os requisitos funcionais da aplicação.",
+                    status:"CONCLUIDO",
+                    responsible: "Paulo Henrique Monteiro Borba",
+                    startYear: 2001,
+                    endYear: 2004,
             ]
     ]
 

From b854e8cb585e8645d5c0a015958e077b783386c7 Mon Sep 17 00:00:00 2001
From: vsnepomuceno <vnepomuceno@gmail.com>
Date: Fri, 13 Jun 2014 15:42:44 -0300
Subject: [PATCH 04/19] =?UTF-8?q?Remover=20c=C3=B3digo=20de=20console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/cucumber/steps/ResearchProjectSteps.groovy | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/cucumber/steps/ResearchProjectSteps.groovy b/test/cucumber/steps/ResearchProjectSteps.groovy
index 3b373678..64462c08 100644
--- a/test/cucumber/steps/ResearchProjectSteps.groovy
+++ b/test/cucumber/steps/ResearchProjectSteps.groovy
@@ -248,10 +248,6 @@ def checkIfResearchProjectNoExists(String projectName){
 
 def checkIfResearchProjectExists(String projectName){
     ResearchProject project = ResearchProject.findByProjectName(projectName)
-    Console.println(projectName)
-    if (project == null) {
-        Console.println("Project NUll")
-    }
     ResearchProject project2 = ResearchProjectTestDadaAndOperations.findResearchProjectByProjectName(projectName)
     project.equals(project2)
 }

From 5cfeb3f8bccf20d02fd19c3139e7ac3864f1cdec Mon Sep 17 00:00:00 2001
From: vsnepomuceno <vnepomuceno@gmail.com>
Date: Fri, 13 Jun 2014 16:36:49 -0300
Subject: [PATCH 05/19] Melhoria de loop, retirar o For

---
 test/cucumber/steps/ResearchProjectSteps.groovy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/cucumber/steps/ResearchProjectSteps.groovy b/test/cucumber/steps/ResearchProjectSteps.groovy
index 64462c08..e31edbc8 100644
--- a/test/cucumber/steps/ResearchProjectSteps.groovy
+++ b/test/cucumber/steps/ResearchProjectSteps.groovy
@@ -257,10 +257,10 @@ def checkIfNoResearchProjectAffected() {
     List<ResearchProject> beforeProjects = ResearchProjectTestDadaAndOperations.oldProjects
     List<ResearchProject> afterProjects = ResearchProject.findAll()
 
-    for(int i = 0; i < beforeProjects.size();i++) {
-        if (!beforeProjects.get(i).equals(afterProjects.get(i))) {
+    beforeProjects.eachWithIndex { ResearchProject entry, int i ->
+        if (!entry.equals(afterProjects.get(i))) {
             check = false
-            if (!check) break
+            check
         }
     }
 

From e00641532354fe09789a6c026f7cd08bcbb2f5f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gert=20Uch=C3=B4a=20M=C3=BCller=20Neto?=
 <gertmuller88@gmail.com>
Date: Mon, 16 Jun 2014 17:45:30 -0300
Subject: [PATCH 06/19] =?UTF-8?q?Atualiza=C3=A7=C3=B5es=20da=20Atividade?=
 =?UTF-8?q?=2004?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/cucumber/ResearchProject.feature         |  13 +-
 .../steps/ResearchProjectSteps.groovy         | 181 +++++++++++-------
 .../ResearchProjectPage.groovy                |  67 +++++++
 .../ResearchProjectPageEditPage.groovy        |   8 +
 .../ResearchProjectPageShowPage.groovy        |   4 +
 ...esearchProjectTestDadaAndOperations.groovy |  10 +
 6 files changed, 208 insertions(+), 75 deletions(-)

diff --git a/test/cucumber/ResearchProject.feature b/test/cucumber/ResearchProject.feature
index 2a1cb127..f76785c7 100644
--- a/test/cucumber/ResearchProject.feature
+++ b/test/cucumber/ResearchProject.feature
@@ -42,26 +42,25 @@ Feature: research project
   
   Scenario: list research projects where I am a member
     Given I am at the research project list page
-    When I select the "Meus Projetos de Pesquisa" option at research project menu
+    When I select the option to show my research projects
     Then the system shows a list with the research projects where I am a member
 
   Scenario: filter research projects by name
     Given  I am at the research projects list page
-    When I fill the project name field
-    And select the option "Filtrar Projetos de Pesquisa"
-    Then the system shows the research projects listed by the research projects name
+    When I fill the project name filter field with "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    And select the option to filter the research projects
+    Then the system shows the research projects with the name "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
 
   Scenario: remove research project that does not exist
     Given the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
     And I am logged into the system as administrator
-    When I try to remove a research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    When I remove the research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
     Then no research project stored is affected
 
   Scenario: edit existing research project
     Given the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
     And I am logged into the system as administrator of the research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    When I try to edit the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" in the system
-    And I changed the data of the research project
+    When I edit the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" in the system
     Then the data of the research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is updated in the system
 
   Scenario: new invalid research project with blank name
diff --git a/test/cucumber/steps/ResearchProjectSteps.groovy b/test/cucumber/steps/ResearchProjectSteps.groovy
index e31edbc8..029f8aae 100644
--- a/test/cucumber/steps/ResearchProjectSteps.groovy
+++ b/test/cucumber/steps/ResearchProjectSteps.groovy
@@ -2,74 +2,94 @@ package steps
 
 import org.apache.shiro.SecurityUtils
 import org.apache.shiro.UnavailableSecurityManagerException
+import pages.ArticlePages.ArticleShowPage
 import pages.researchProject.ResearchProjectPage
 import pages.researchProject.ResearchProjectPageCreatePage
 import rgms.authentication.User
 import rgms.member.Member
 import rgms.researchProject.ResearchProject
-
 import static cucumber.api.groovy.EN.*
 
 /**
  * Created by Bruno Soares on 24/02/14.
+ * Edited by Gert Müller and Vilmar Nepomuceno on 16/06/14.
  */
 def initialSize = 0
 
-//Create Research Project
-Given(~'^the system has no research project named as "([^"]*)"$'){ String projectName ->
 
-    if (!checkIfResearchProjectNoExists(projectName)) {
-        ResearchProject.findByProjectName(projectName).delete()
+// ------------------------------------------------------------------------------------------------------------------------------
+// Scenario: new research project
+
+Given(~'^the system has no research project named as "([^"]*)"$') { String projectName ->
+    if(!checkIfResearchProjectNoExists(projectName)) {
+        ResearchProject.findByProjectName(projectName).delete();
     }
 }
 
-When(~'^I create a research project named as "([^"]*)" with all required data$'){ String projectName ->
-    ResearchProjectTestDadaAndOperations.createResearchProject(projectName)
+When(~'^I create a research project named as "([^"]*)" with all required data$') { String projectName ->
+    ResearchProjectTestDadaAndOperations.createResearchProject(projectName);
 }
 
-Then(~'^the research project "([^"]*)" is properly stored by the system$'){ String projectName ->
-    assert checkIfResearchProjectExists(projectName)
+Then(~'^the research project "([^"]*)" is properly stored by the system$') { String projectName ->
+    assert checkIfResearchProjectExists(projectName);
 }
+// ------------------------------------------------------------------------------------------------------------------------------
+
+
+// ------------------------------------------------------------------------------------------------------------------------------
+// Scenario: duplicated research project
 
-//Duplicated Research Project
-Given(~'^the system has a research project named as "([^"]*)"$'){ String projectName ->
-    ResearchProject project = ResearchProject.findByProjectName(projectName)
-    if(!project){
-        ResearchProjectTestDadaAndOperations.createResearchProject(projectName)
+Given(~'^the system has a research project named as "([^"]*)"$') { String projectName ->
+    ResearchProject project = ResearchProject.findByProjectName(projectName);
+
+    if(!project) {
+        ResearchProjectTestDadaAndOperations.createResearchProject(projectName);
     }
-    assert ResearchProject.findByProjectName(projectName) != null
+
+    assert ResearchProject.findByProjectName(projectName) != null;
 }
 
-When(~'^I try to create a research project named as "([^"]*)"$'){ String projectName ->
-    // updated
-    ResearchProjectTestDadaAndOperations.oldProjects =  ResearchProject.findAll()
-    ResearchProjectTestDadaAndOperations.createResearchProject(projectName)
+When(~'^I try to create a research project named as "([^"]*)"$') { String projectName ->
+    ResearchProjectTestDadaAndOperations.oldProjects =  ResearchProject.findAll();
+    ResearchProjectTestDadaAndOperations.createResearchProject(projectName);
 }
 
-Then(~'^the research project "([^"]*)" is not stored twice$'){ String projectName ->
-    assert ResearchProject.findAllByProjectName(projectName).size() == 1
+Then(~'^the research project "([^"]*)" is not stored twice$') { String projectName ->
+    assert ResearchProject.findAllByProjectName(projectName).size() == 1;
 }
+// ------------------------------------------------------------------------------------------------------------------------------
 
-//Remove Research Project
+
+// ------------------------------------------------------------------------------------------------------------------------------
+// Scenario: remove research project
 
 Given(~'^I am logged into the system as administrator of the research group named as "([^"]*)"$') { String projectName ->
     assert checkIfLoggedUserIsAdminOfResearchProject(projectName);
 }
 
-When(~'^I remove the research project named as "([^"]*)"$'){ String projectName ->
-    ResearchProjectTestDadaAndOperations.deleteResearchProject(projectName)
+When(~'^I remove the research project named as "([^"]*)"$') { String projectName ->
+    ResearchProjectTestDadaAndOperations.deleteResearchProject(projectName);
 }
 
-Then(~'^the research project named as "([^"]*)" is properly removed by the system$'){ String projectName ->
-    assert checkIfResearchProjectNoExists(projectName)
+Then(~'^the research project named as "([^"]*)" is properly removed by the system$') { String projectName ->
+    assert checkIfResearchProjectNoExists(projectName);
 }
+// ------------------------------------------------------------------------------------------------------------------------------
+
+
+// ------------------------------------------------------------------------------------------------------------------------------
+// Scenario: new research project without funders
 
-//new research project without funders
 When(~'^I create a research project named as "([^"]*)" without funders$'){ String projectName ->
-    ResearchProjectTestDadaAndOperations.createResearchProject(projectName)
+    ResearchProjectTestDadaAndOperations.createResearchProjectWithoutFunders(projectName);
 }
+// ------------------------------------------------------------------------------------------------------------------------------
+
+
+// ------------------------------------------------------------------------------------------------------------------------------
+// Scenario: upload research project with a file
+// XML import
 
-//XML import
 Given(~'^the system has some research project stored$'){ ->
     initialSize = ResearchProject.findAll().size()
 }
@@ -84,8 +104,12 @@ Then(~'^the system has more research projects now$'){ ->
     finalSize = ResearchProject.findAll().size()
     assert initialSize < finalSize
 }
+// ------------------------------------------------------------------------------------------------------------------------------
+
+
+// ------------------------------------------------------------------------------------------------------------------------------
+// XML Import web
 
-//XML Import web
 When (~'^I select the upload button at the research project page$'){ ->
     at ResearchProjectPage
     page.submitXML()
@@ -98,62 +122,81 @@ Then (~'^I\'m still on the research project page$'){ ->
 Then (~'^the system shows an error message at the research project page$'){ ->
     assert page.hasInvalidXMLSubmited()
 }
-
 // ------------------------------------------------------------------------------------------------------------------------------
-// filter research projects by name
 
-When(~'^I fill the project name field$') { ->
 
-}
+// ------------------------------------------------------------------------------------------------------------------------------
+// Scenario: list research projects where I am a member
 
-When(~'^I select the option "Filtrar Projetos de Pesquisa"$') { ->
-    page.select("Filtrar Projetos de Pesquisa");
+Given(~'^I am at the research project list page$') { ->
+    at ResearchProjectPage;
 }
 
-Then(~'^the system shows the research projects listed by the research projects name$') { ->
-
+When(~'^I select the option to show my research projects$') { ->
+    page.myProjects();
 }
 
+Then(~'^the system shows a list with the research projects where I am a member$') { ->
+    page.checkResearchGroupHasMeAsMember();
+}
 // ------------------------------------------------------------------------------------------------------------------------------
-// remove research project that does not exist
 
-Given(~'^I am logged into the system as administrator$') { ->
-    to LoginPage;
-    at LoginPage;
-    page.fillLoginData("admin", "adminadmin");
-}
 
-When(~'^I try to remove a research project named "([^"]*)"$') { String projectName ->
+// ------------------------------------------------------------------------------------------------------------------------------
+// Scenario: filter research projects by name
 
+When(~'^I fill the project name filter field with "([^"]*)"$') { String filter ->
+    page.fillFilterResearchProject(filter);
 }
 
-Then(~'^nothing happens to the research projects stored$') { ->
+When(~'^select the option to filter the research projects$') { ->
+    page.filter();
+}
 
+Then(~'^the system shows the research projects with the name "([^"]*)"$') { String filter ->
+    page.checkResearchGroupListFilteredByName(filter);
 }
 // ------------------------------------------------------------------------------------------------------------------------------
 
+
 // ------------------------------------------------------------------------------------------------------------------------------
-// list research projects where I am a member
+// Scenario: remove research project that does not exist
 
-Given(~'^I am at the research project list page$') { ->
-    at ResearchProjectPage;
+Given(~'^I am logged into the system as administrator$') { ->
+    TestDataAndOperations.loginController(this);
 }
+// ------------------------------------------------------------------------------------------------------------------------------
 
-When(~'^I select the "Meus Projetos de Pesquisa" option at research project menu$') { ->
-    page.select("Meus Projetos de Pesquisa");
-}
 
-Then(~'^the system shows a list with the research projects where I am a member$') { ->
+// ------------------------------------------------------------------------------------------------------------------------------
+// Scenario: edit existing research project
+
+def projectDataUpdate = "Descrição teste";
 
+When(~'^I edit the research project "([^"]*)" in the system$') { String projectName ->
+    to ResearchProjectPage;
+    page.selectReseachGroup(projectName);
+    at ResearchProjectPageShowPage;
+    page.selectEditReseachGroup();
+    at ResearchProjectPageEditPage;
+    page.fillUpdateDescription(projectDataUpdate);
+    page.saveUpdates();
 }
 
-// ------------------------------------------------------------------------------------------------------------------------------
-// edit existing research project
 Then(~'^the data of the research project named "([^"]*)" is updated in the system$') { String projectName ->
+    def check = false;
+    def rp = ResearchProject.findByProjectName(projectName);
 
+    if(rp!=null && rp.description==projectDataUpdate) {
+        check = true;
+    }
+
+    assert check;
 }
 // ------------------------------------------------------------------------------------------------------------------------------
 
+
+// ------------------------------------------------------------------------------------------------------------------------------
 // NOVOS Vilmar
 Then(~'^no research project stored is affected'){ ->
     assert checkIfNoResearchProjectAffected()
@@ -240,31 +283,33 @@ Then(~'^the system shows an warning message at the new research project page$'){
     page.checkHasErrorMsg()
 }
 
-//Aux Functions
-def checkIfResearchProjectNoExists(String projectName){
-    ResearchProject project = ResearchProject.findByProjectName(projectName)
-    project == null
+// ------------------------------------------------------------------------------------------------------------------------------
+// Aux Functions
+
+def checkIfResearchProjectNoExists(String projectName) {
+    ResearchProject project = ResearchProject.findByProjectName(projectName);
+    project == null;
 }
 
-def checkIfResearchProjectExists(String projectName){
-    ResearchProject project = ResearchProject.findByProjectName(projectName)
-    ResearchProject project2 = ResearchProjectTestDadaAndOperations.findResearchProjectByProjectName(projectName)
-    project.equals(project2)
+def checkIfResearchProjectExists(String projectName) {
+    ResearchProject project = ResearchProject.findByProjectName(projectName);
+    ResearchProject project2 = ResearchProjectTestDadaAndOperations.findResearchProjectByProjectName(projectName);
+    project.equals(project2);
 }
 
 def checkIfNoResearchProjectAffected() {
     boolean check = true;
-    List<ResearchProject> beforeProjects = ResearchProjectTestDadaAndOperations.oldProjects
-    List<ResearchProject> afterProjects = ResearchProject.findAll()
+    List<ResearchProject> beforeProjects = ResearchProjectTestDadaAndOperations.oldProjects;
+    List<ResearchProject> afterProjects = ResearchProject.findAll();
 
     beforeProjects.eachWithIndex { ResearchProject entry, int i ->
-        if (!entry.equals(afterProjects.get(i))) {
+        if(!entry.equals(afterProjects.get(i))) {
             check = false
             check
         }
     }
 
-    check
+    check;
 }
 
 def checkIfLoggedUserIsAdminOfResearchProject(String projectName) {
@@ -272,7 +317,7 @@ def checkIfLoggedUserIsAdminOfResearchProject(String projectName) {
     Member author = null;
 
     try {
-        if(SecurityUtils.subject?.principal != null) {
+        if(SecurityUtils.subject?.principal!=null) {
             User user = User.findByUsername(SecurityUtils.subject.principal);
             author = user.getAuthor();
         }
diff --git a/test/functional/pages/researchProject/ResearchProjectPage.groovy b/test/functional/pages/researchProject/ResearchProjectPage.groovy
index e912173a..763a9d1f 100644
--- a/test/functional/pages/researchProject/ResearchProjectPage.groovy
+++ b/test/functional/pages/researchProject/ResearchProjectPage.groovy
@@ -2,6 +2,7 @@ package pages.researchProject
 
 import pages.FormPage
 import pages.GetPageTitle
+import rgms.authentication.User
 import rgms.researchProject.ResearchProject
 
 /**
@@ -35,6 +36,14 @@ class ResearchProjectPage extends FormPage {
         $('input', class:'save').click()
     }
 
+    def filter() {
+        $("input", class: "filter").click();
+    }
+
+    def myProjects() {
+        $("a", class: "my-research-projects").click();
+    }
+
     def hasInvalidXMLSubmited(){
         GetPageTitle gp = new GetPageTitle()
         return gp.msg('default.xml.parserror.message') == $("div", class: "message", role: "status").text()
@@ -44,6 +53,15 @@ class ResearchProjectPage extends FormPage {
         $("a", text: name).click()
     }
 
+    @Override
+    protected void finalize() throws Throwable {
+        super.finalize()
+    }
+
+    def fillFilterResearchProject(projectName) {
+        $("form").filterProjectName = projectName;
+    }
+
     def checkResearchGroupAtList(projectName) {
         def listDiv = $('div', id: 'list-researchProject')
         def researchGroupTable = (listDiv.find('table'))[0]
@@ -71,4 +89,53 @@ class ResearchProjectPage extends FormPage {
         assert check
     }
 
+    def checkResearchGroupHasMeAsMember() {
+        def User user;
+        try {
+            if(SecurityUtils.subject?.principal!=null) {
+                user = User.findByUsername(SecurityUtils.subject.principal);
+            }
+        } catch(UnavailableSecurityManagerException e) {
+            return false;
+        }
+
+        boolean check = true;
+        def listDiv = $('div', id: 'list-researchProject');
+        def researchGroupTable = (listDiv.find('table'))[0];
+        def researchGroupRows = researchGroupTable.find('tbody').find('tr');
+        int size = researchGroupRows.size();
+
+        if(size > 1) {
+            for(int i=0; i<size; i++) {
+                def researchGroupColumns = researchGroupRows[i].find('td');
+
+                if(!researchGroupColumns[0].text().contains(user.getAuthor().getName())) {
+                    check = false;
+                }
+            }
+        }
+
+        assert check;
+    }
+
+    def checkResearchGroupListFilteredByName(filter) {
+        boolean check = true;
+        def listDiv = $('div', id: 'list-researchProject');
+        def researchGroupTable = (listDiv.find('table'))[0];
+        def researchGroupRows = researchGroupTable.find('tbody').find('tr');
+        int size = researchGroupRows.size();
+
+        if(size > 1) {
+            for(int i=0; i<size; i++) {
+                def researchGroupColumns = researchGroupRows[i].find('td');
+
+                if(!researchGroupColumns[6].text().contains(filter)) {
+                    check = false;
+                }
+            }
+        }
+
+        assert check;
+    }
+
 }
diff --git a/test/functional/pages/researchProject/ResearchProjectPageEditPage.groovy b/test/functional/pages/researchProject/ResearchProjectPageEditPage.groovy
index e85d9c19..321a2f1c 100644
--- a/test/functional/pages/researchProject/ResearchProjectPageEditPage.groovy
+++ b/test/functional/pages/researchProject/ResearchProjectPageEditPage.groovy
@@ -21,4 +21,12 @@ class ResearchProjectPageEditPage extends FormPage{
             $("div", class: "message")
         }
     }
+
+    def fillUpdateDescription(newDescription) {
+        $("form").description = newDescription;
+    }
+
+    def saveUpdates() {
+        $("input", class: "save").click();
+    }
 }
diff --git a/test/functional/pages/researchProject/ResearchProjectPageShowPage.groovy b/test/functional/pages/researchProject/ResearchProjectPageShowPage.groovy
index fa4db19e..fbea05cf 100644
--- a/test/functional/pages/researchProject/ResearchProjectPageShowPage.groovy
+++ b/test/functional/pages/researchProject/ResearchProjectPageShowPage.groovy
@@ -30,6 +30,10 @@ class ResearchProjectPageShowPage extends FormPage {
         $('a', class: 'create').click()
     }
 
+    def selectEditReseachGroup() {
+        $('a', class: 'edit').click()
+    }
+
     def backToHome(){
         $('a', class:'home').click()
     }
diff --git a/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy b/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
index db5a3fce..9279b5a0 100644
--- a/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
+++ b/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
@@ -70,6 +70,16 @@ class ResearchProjectTestDadaAndOperations {
         cont.response.reset()
     }
 
+    public static void createResearchProjectWithoutFunders(String name) {
+        def rp = findResearchProjectByProjectName(name);
+        rp.funders = null;
+        cont.params << rp;
+        cont.request.setContent(new byte[1000]);
+        cont.create();
+        cont.save();
+        cont.response.reset();
+    }
+
     public static void createResearchProject(String name){
         createResearchProjectDefault(name)
     }

From ba67c37081c908194b5c4f1ef9ca2ded41154294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gert=20Uch=C3=B4a=20M=C3=BCller=20Neto?=
 <gertmuller88@gmail.com>
Date: Mon, 16 Jun 2014 17:54:09 -0300
Subject: [PATCH 07/19] =?UTF-8?q?Atualiza=C3=A7=C3=B5es=20para=20melhorar?=
 =?UTF-8?q?=20leitura?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../steps/ResearchProjectSteps.groovy         | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/cucumber/steps/ResearchProjectSteps.groovy b/test/cucumber/steps/ResearchProjectSteps.groovy
index 029f8aae..3eeb0bec 100644
--- a/test/cucumber/steps/ResearchProjectSteps.groovy
+++ b/test/cucumber/steps/ResearchProjectSteps.groovy
@@ -2,12 +2,12 @@ package steps
 
 import org.apache.shiro.SecurityUtils
 import org.apache.shiro.UnavailableSecurityManagerException
-import pages.ArticlePages.ArticleShowPage
 import pages.researchProject.ResearchProjectPage
 import pages.researchProject.ResearchProjectPageCreatePage
 import rgms.authentication.User
 import rgms.member.Member
 import rgms.researchProject.ResearchProject
+
 import static cucumber.api.groovy.EN.*
 
 /**
@@ -286,30 +286,30 @@ Then(~'^the system shows an warning message at the new research project page$'){
 // ------------------------------------------------------------------------------------------------------------------------------
 // Aux Functions
 
-def checkIfResearchProjectNoExists(String projectName) {
-    ResearchProject project = ResearchProject.findByProjectName(projectName);
-    project == null;
+def checkIfResearchProjectNoExists(String projectName){
+    ResearchProject project = ResearchProject.findByProjectName(projectName)
+    project == null
 }
 
-def checkIfResearchProjectExists(String projectName) {
-    ResearchProject project = ResearchProject.findByProjectName(projectName);
-    ResearchProject project2 = ResearchProjectTestDadaAndOperations.findResearchProjectByProjectName(projectName);
-    project.equals(project2);
+def checkIfResearchProjectExists(String projectName){
+    ResearchProject project = ResearchProject.findByProjectName(projectName)
+    ResearchProject project2 = ResearchProjectTestDadaAndOperations.findResearchProjectByProjectName(projectName)
+    project.equals(project2)
 }
 
 def checkIfNoResearchProjectAffected() {
     boolean check = true;
-    List<ResearchProject> beforeProjects = ResearchProjectTestDadaAndOperations.oldProjects;
-    List<ResearchProject> afterProjects = ResearchProject.findAll();
+    List<ResearchProject> beforeProjects = ResearchProjectTestDadaAndOperations.oldProjects
+    List<ResearchProject> afterProjects = ResearchProject.findAll()
 
     beforeProjects.eachWithIndex { ResearchProject entry, int i ->
-        if(!entry.equals(afterProjects.get(i))) {
+        if (!entry.equals(afterProjects.get(i))) {
             check = false
             check
         }
     }
 
-    check;
+    check
 }
 
 def checkIfLoggedUserIsAdminOfResearchProject(String projectName) {

From 5161e029446d385362d11cf2460d6b384f3e9f00 Mon Sep 17 00:00:00 2001
From: vsnepomuceno <vnepomuceno@gmail.com>
Date: Sat, 5 Jul 2014 12:32:35 -0300
Subject: [PATCH 08/19] =?UTF-8?q?Requisi=C3=A7=C3=B5es=20de=20Paulo.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/cucumber/ResearchProject.feature         | 51 +++++++++----------
 .../steps/ResearchProjectSteps.groovy         | 38 +++++++-------
 .../ResearchProjectPage.groovy                | 21 ++++----
 .../ResearchProjectPageCreatePage.groovy      | 17 +++----
 ...esearchProjectTestDadaAndOperations.groovy |  2 -
 5 files changed, 63 insertions(+), 66 deletions(-)

diff --git a/test/cucumber/ResearchProject.feature b/test/cucumber/ResearchProject.feature
index f76785c7..fdb24d75 100644
--- a/test/cucumber/ResearchProject.feature
+++ b/test/cucumber/ResearchProject.feature
@@ -27,7 +27,7 @@ Feature: research project
 
 #if($XMLUpload)
   Scenario: upload research project with a file
-    Given I am logged in the system
+    Given I am logged into the system as administrator
     And the system has some research project stored
     When I upload new research projects from the file "testelattes2.xml"
     Then the system has more research projects now
@@ -39,29 +39,6 @@ Feature: research project
     Then I'm still on the research project page
     And the system shows an error message at the research project page
 #end
-  
-  Scenario: list research projects where I am a member
-    Given I am at the research project list page
-    When I select the option to show my research projects
-    Then the system shows a list with the research projects where I am a member
-
-  Scenario: filter research projects by name
-    Given  I am at the research projects list page
-    When I fill the project name filter field with "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    And select the option to filter the research projects
-    Then the system shows the research projects with the name "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-
-  Scenario: remove research project that does not exist
-    Given the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    And I am logged into the system as administrator
-    When I remove the research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    Then no research project stored is affected
-
-  Scenario: edit existing research project
-    Given the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    And I am logged into the system as administrator of the research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    When I edit the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" in the system
-    Then the data of the research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is updated in the system
 
   Scenario: new invalid research project with blank name
     Given the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
@@ -98,7 +75,7 @@ Feature: research project
   Scenario: new invalid research project with blank description web
     Given I am at new research project page
     And the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web"
-    When I can try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" with description field blank
+    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" with description field blank on the web site
     Then the research project "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" is not stored by the system because it is invalid
     And  I'm still on the new research project page
     And no research project stored is affected
@@ -106,7 +83,29 @@ Feature: research project
   Scenario: duplicated research project web
     Given I am at new research project page
     And the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web"
-    When I can try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web"
+    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" on the web site
     Then  the system shows an warning message at the new research project page
     And the research project "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" is not shown duplicated in the research project list
 
+  Scenario: list research projects where I am a member
+    Given I am at the research project list page
+    When I select the option to show my research projects
+    Then the system shows a list with the research projects where I am a member
+
+  Scenario: filter research projects by name
+    Given  I am at the research projects list page
+    When I fill the project name filter field with "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    And select the option to filter the research projects
+    Then the system shows the research projects with the name "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+
+  Scenario: remove research project that does not exist
+    Given the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    And I am logged into the system as administrator
+    When I remove the research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    Then no research project stored is affected
+
+  Scenario: edit existing research project
+    Given the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    And I am logged into the system as administrator of the research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    When I edit the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" in the system
+    Then the data of the research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is updated in the system
diff --git a/test/cucumber/steps/ResearchProjectSteps.groovy b/test/cucumber/steps/ResearchProjectSteps.groovy
index 3eeb0bec..b3a832e1 100644
--- a/test/cucumber/steps/ResearchProjectSteps.groovy
+++ b/test/cucumber/steps/ResearchProjectSteps.groovy
@@ -16,6 +16,7 @@ import static cucumber.api.groovy.EN.*
  */
 def initialSize = 0
 
+def List<ResearchProject> oldProjects
 
 // ------------------------------------------------------------------------------------------------------------------------------
 // Scenario: new research project
@@ -23,11 +24,13 @@ def initialSize = 0
 Given(~'^the system has no research project named as "([^"]*)"$') { String projectName ->
     if(!checkIfResearchProjectNoExists(projectName)) {
         ResearchProject.findByProjectName(projectName).delete();
+        assert checkIfResearchProjectNoExists(projectName);
     }
 }
 
 When(~'^I create a research project named as "([^"]*)" with all required data$') { String projectName ->
     ResearchProjectTestDadaAndOperations.createResearchProject(projectName);
+    assert ResearchProject.findByProjectName(projectName) != null;
 }
 
 Then(~'^the research project "([^"]*)" is properly stored by the system$') { String projectName ->
@@ -50,7 +53,7 @@ Given(~'^the system has a research project named as "([^"]*)"$') { String projec
 }
 
 When(~'^I try to create a research project named as "([^"]*)"$') { String projectName ->
-    ResearchProjectTestDadaAndOperations.oldProjects =  ResearchProject.findAll();
+    oldProjects =  ResearchProject.findAll();
     ResearchProjectTestDadaAndOperations.createResearchProject(projectName);
 }
 
@@ -82,6 +85,7 @@ Then(~'^the research project named as "([^"]*)" is properly removed by the syste
 
 When(~'^I create a research project named as "([^"]*)" without funders$'){ String projectName ->
     ResearchProjectTestDadaAndOperations.createResearchProjectWithoutFunders(projectName);
+    assert ResearchProject.findByProjectName(projectName) != null;
 }
 // ------------------------------------------------------------------------------------------------------------------------------
 
@@ -199,11 +203,7 @@ Then(~'^the data of the research project named "([^"]*)" is updated in the syste
 // ------------------------------------------------------------------------------------------------------------------------------
 // NOVOS Vilmar
 Then(~'^no research project stored is affected'){ ->
-    assert checkIfNoResearchProjectAffected()
-}
-
-Given(~'^I am logged in the system$'){ ->
-    TestDataAndOperations.loginController(this)
+    assert checkIfNoResearchProjectAffected(oldProjects)
 }
 
 Then(~'^the research project "([^"]*)" is not stored by the system because it is invalid$'){ String projectName ->
@@ -211,25 +211,24 @@ Then(~'^the research project "([^"]*)" is not stored by the system because it is
 }
 
 When(~'^I try to create a research project named as "([^"]*)" with description field blank$'){ String projectName ->
-    ResearchProjectTestDadaAndOperations.oldProjects =  ResearchProject.findAll()
+    oldProjects =  ResearchProject.findAll()
     ResearchProjectTestDadaAndOperations.createResearchProject(projectName)
 }
 
 When(~'^I create a research project named as "([^"]*)" with member field duplicated$'){ String projectName ->
     ResearchProjectTestDadaAndOperations.createResearchProject(projectName)
+    assert ResearchProject.findByProjectName(projectName) != null;
 }
 
 Then(~'^the research project "([^"]*)" does not have duplicated members$'){String projectName ->
     ResearchProject project  = ResearchProject.findByProjectName(projectName);
     boolean check = true
-    // Não vai ter nunca porque é um SET
     Iterator i = project.members.iterator()
-    while (i.hasNext()) {
+    while (i.hasNext() && check) {
         String m = i.next()
         project.members.remove(m)
         if (project.members.contains(m)) {
             check = false
-            break
         }
     }
 
@@ -244,8 +243,9 @@ Given (~'^I am at new research project page$'){ ->
 }
 
 When(~'^I can create a research project named as "([^"]*)" with all required data$'){ String projectName ->
-    page.fillResearchProjectDetails(projectName)
+    page.fillResearchProject(projectName)
     page.createResearchProject()
+    assert ResearchProject.findByProjectName(projectName) != null
 }
 
 Then (~'^I\'m still on the new research project page$'){ ->
@@ -257,19 +257,19 @@ Then(~'^it is shown in the research project list with name "([^"]*)"$'){ String
     page.checkResearchGroupAtList(projectName)
 }
 
-When(~'^I can try to create a research project named as "([^"]*)" with description field blank$'){ String projectName ->
+When(~'^I try to create a research project named as "([^"]*)" with description field blank on the web site$'){ String projectName ->
     // updated
-    ResearchProjectTestDadaAndOperations.oldProjects =  ResearchProject.findAll()
-    page.fillResearchProjectDetailsWithBlankDescription(projectName)
+    oldProjects =  ResearchProject.findAll()
+    page.fillResearchProjectWithBlankDescription(projectName)
     page.createResearchProject()
 }
 
 
-When(~'^I can try to create a research project named as "([^"]*)"$'){ String projectName ->
+When(~'^I try to create a research project named as "([^"]*)" on the web site$'){ String projectName ->
     // updated
-    ResearchProjectTestDadaAndOperations.oldProjects =  ResearchProject.findAll()
+    oldProjects =  ResearchProject.findAll()
     at ResearchProjectPageCreatePage
-    page.fillResearchProjectDetails(projectName)
+    page.fillResearchProject(projectName)
     page.createResearchProject()
 }
 
@@ -297,9 +297,9 @@ def checkIfResearchProjectExists(String projectName){
     project.equals(project2)
 }
 
-def checkIfNoResearchProjectAffected() {
+def checkIfNoResearchProjectAffected(oldProjects) {
     boolean check = true;
-    List<ResearchProject> beforeProjects = ResearchProjectTestDadaAndOperations.oldProjects
+    List<ResearchProject> beforeProjects = oldProjects
     List<ResearchProject> afterProjects = ResearchProject.findAll()
 
     beforeProjects.eachWithIndex { ResearchProject entry, int i ->
diff --git a/test/functional/pages/researchProject/ResearchProjectPage.groovy b/test/functional/pages/researchProject/ResearchProjectPage.groovy
index 763a9d1f..c2b5646a 100644
--- a/test/functional/pages/researchProject/ResearchProjectPage.groovy
+++ b/test/functional/pages/researchProject/ResearchProjectPage.groovy
@@ -1,5 +1,7 @@
 package pages.researchProject
 
+import org.apache.shiro.SecurityUtils
+import org.apache.shiro.UnavailableSecurityManagerException
 import pages.FormPage
 import pages.GetPageTitle
 import rgms.authentication.User
@@ -62,10 +64,15 @@ class ResearchProjectPage extends FormPage {
         $("form").filterProjectName = projectName;
     }
 
-    def checkResearchGroupAtList(projectName) {
+    def getResearchGroupRows() {
         def listDiv = $('div', id: 'list-researchProject')
         def researchGroupTable = (listDiv.find('table'))[0]
         def researchGroupRows = researchGroupTable.find('tbody').find('tr')
+        researchGroupRows
+    }
+
+    def checkResearchGroupAtList(projectName) {
+        def researchGroupRows = getResearchGroupRows()
         int size = researchGroupRows.size();
         def researchGroupColumns = researchGroupRows[size - 1].find('td')
 
@@ -74,9 +81,7 @@ class ResearchProjectPage extends FormPage {
 
     def checkResearchGroupDuplicatedAtList(projectName) {
         boolean check = true;
-        def listDiv = $('div', id: 'list-researchProject')
-        def researchGroupTable = (listDiv.find('table'))[0]
-        def researchGroupRows = researchGroupTable.find('tbody').find('tr')
+        def researchGroupRows = getResearchGroupRows()
         int size = researchGroupRows.size();
         if (size > 1) {
             def researchGroupColumns = researchGroupRows[size - 1].find('td')
@@ -100,9 +105,7 @@ class ResearchProjectPage extends FormPage {
         }
 
         boolean check = true;
-        def listDiv = $('div', id: 'list-researchProject');
-        def researchGroupTable = (listDiv.find('table'))[0];
-        def researchGroupRows = researchGroupTable.find('tbody').find('tr');
+        def researchGroupRows = getResearchGroupRows()
         int size = researchGroupRows.size();
 
         if(size > 1) {
@@ -120,9 +123,7 @@ class ResearchProjectPage extends FormPage {
 
     def checkResearchGroupListFilteredByName(filter) {
         boolean check = true;
-        def listDiv = $('div', id: 'list-researchProject');
-        def researchGroupTable = (listDiv.find('table'))[0];
-        def researchGroupRows = researchGroupTable.find('tbody').find('tr');
+        def researchGroupRows = getResearchGroupRows()
         int size = researchGroupRows.size();
 
         if(size > 1) {
diff --git a/test/functional/pages/researchProject/ResearchProjectPageCreatePage.groovy b/test/functional/pages/researchProject/ResearchProjectPageCreatePage.groovy
index fbf65101..4efd517c 100644
--- a/test/functional/pages/researchProject/ResearchProjectPageCreatePage.groovy
+++ b/test/functional/pages/researchProject/ResearchProjectPageCreatePage.groovy
@@ -23,22 +23,21 @@ class ResearchProjectPageCreatePage extends FormPage{
         }
     }
 
-    def fillResearchProjectDetails(projectName) {
+    def fillResearchProjectDetails(projectName, description) {
         $("form").projectName = projectName
-        $("form").description = "Neste projeto pretendemso definir e validar um método para a implementação de aplicações orientadas a Aspectos Complexas web. Em particular, este método deve suportar uma abordagem progressiva para implementação orientada a objetos, de forma que aspectos de distribuição, concorrência, e persistência não sejam inicialmente considerados pelo processo de implementação, mas sejam gradualmente introduzidos, preservando os requisitos funcionais da aplicação."
+        $("form").description = description
         $("form").status = "CONCLUIDO"
         $("form").startYear = 2001
         $("form").endYear = 2004
         $("form").responsible = "Paulo Henrique Monteiro Borba"
     }
 
-    def fillResearchProjectDetailsWithBlankDescription(projectName) {
-        $("form").projectName = projectName
-        $("form").description = ""
-        $("form").status = "CONCLUIDO"
-        $("form").startYear = 2001
-        $("form").endYear = 2004
-        $("form").responsible = "Paulo Henrique Monteiro Borba"
+    def fillResearchProject(projectName) {
+        fillResearchProjectDetails(projectName, "Neste projeto pretendemso definir e validar um método para a implementação de aplicações orientadas a Aspectos Complexas web. Em particular, este método deve suportar uma abordagem progressiva para implementação orientada a objetos, de forma que aspectos de distribuição, concorrência, e persistência não sejam inicialmente considerados pelo processo de implementação, mas sejam gradualmente introduzidos, preservando os requisitos funcionais da aplicação.")
+    }
+
+    def fillResearchProjectWithBlankDescription(projectName) {
+        fillResearchProjectDetails(projectName,"")
     }
 
     def createResearchProject() {
diff --git a/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy b/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
index 9279b5a0..5e19f925 100644
--- a/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
+++ b/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
@@ -11,8 +11,6 @@ class ResearchProjectTestDadaAndOperations {
 
     static ResearchProjectController cont = new ResearchProjectController()
 
-    static List<ResearchProject> oldProjects
-
     static researchProjects =[
             [projectName:"Implementação Progressiva de Aplicações Orientadas a Objetos Complexas",
                     description:"Neste projeto pretendemso definir e validar um método para a implementação de aplicações orientadas a objetos complexas. Em particular, este método deve suportar uma abordagem progressiva para implementação orientada a objetos, de forma que aspectos de distribuição, concorrência, e persistência não sejam inicialmente considerados pelo processo de implementação, mas sejam gradualmente introduzidos, preservando os requisitos funcionais da aplicação.",

From e14892d4eb53ab5d80f69713eeb8e73321f0de31 Mon Sep 17 00:00:00 2001
From: vsnepomuceno <vnepomuceno@gmail.com>
Date: Mon, 7 Jul 2014 00:24:56 -0300
Subject: [PATCH 09/19] remover required

---
 grails-app/views/researchProject/_form.gsp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/grails-app/views/researchProject/_form.gsp b/grails-app/views/researchProject/_form.gsp
index d3fad9f2..e152878d 100644
--- a/grails-app/views/researchProject/_form.gsp
+++ b/grails-app/views/researchProject/_form.gsp
@@ -3,20 +3,20 @@
 
 
 
-<div class="fieldcontain ${hasErrors(bean: researchProjectInstance, field: 'projectName', 'error')} required">
+<div class="fieldcontain ${hasErrors(bean: researchProjectInstance, field: 'projectName', 'error')}">
 	<label for="projectName">
 		<g:message code="researchProject.projectName.label" default="Project Name" />
 		<span class="required-indicator">*</span>
 	</label>
-	<g:textArea name="projectName" cols="40" rows="5" maxlength="300" required="" value="${researchProjectInstance?.projectName}"/>
+	<g:textArea name="projectName" cols="40" rows="5" maxlength="300" value="${researchProjectInstance?.projectName}"/>
 </div>
 
-<div class="fieldcontain ${hasErrors(bean: researchProjectInstance, field: 'description', 'error')} required">
+<div class="fieldcontain ${hasErrors(bean: researchProjectInstance, field: 'description', 'error')}">
 	<label for="description">
 		<g:message code="researchProject.description.label" default="Description" />
 		<span class="required-indicator">*</span>
 	</label>
-	<g:textArea name="description" cols="40" rows="5" maxlength="3000" required="" value="${researchProjectInstance?.description}"/>
+	<g:textArea name="description" cols="40" rows="5" maxlength="3000" value="${researchProjectInstance?.description}"/>
 </div>
 
 <div class="fieldcontain ${hasErrors(bean: researchProjectInstance, field: 'status', 'error')} required">

From 45c8ce948c95f979dd7d8e11f7d8e39fa2fa70c0 Mon Sep 17 00:00:00 2001
From: vsnepomuceno <vnepomuceno@gmail.com>
Date: Mon, 7 Jul 2014 00:26:56 -0300
Subject: [PATCH 10/19] Atividade 5

---
 test/cucumber/ResearchProject.feature         | 69 ++++++++++---------
 .../steps/ResearchProjectSteps.groovy         | 34 +++++----
 .../ResearchProjectPageCreatePage.groovy      |  4 ++
 ...esearchProjectTestDadaAndOperations.groovy | 17 +++--
 4 files changed, 76 insertions(+), 48 deletions(-)

diff --git a/test/cucumber/ResearchProject.feature b/test/cucumber/ResearchProject.feature
index fdb24d75..6c9f42be 100644
--- a/test/cucumber/ResearchProject.feature
+++ b/test/cucumber/ResearchProject.feature
@@ -8,12 +8,6 @@ Feature: research project
     When I create a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" with all required data
     Then the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is properly stored by the system
 
-  Scenario: duplicated research project
-    Given  the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    Then the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is not stored twice
-    And no research project stored is affected
-
   Scenario: remove research project
     Given the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
     And I am logged into the system as administrator of the research group named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
@@ -40,18 +34,6 @@ Feature: research project
     And the system shows an error message at the research project page
 #end
 
-  Scenario: new invalid research project with blank name
-    Given the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    When I try to create a research project named as ""
-    Then the research project "" is not stored by the system because it is invalid
-    And no research project stored is affected
-
-  Scenario: new invalid research project with blank description
-    Given the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas"
-    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas" with description field blank
-    Then the research project "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas" is not stored by the system because it is invalid
-    And no research project stored is affected
-
   Scenario: new research project with duplicated members
     Given the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas members duplicated"
     When I create a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas members duplicated" with member field duplicated
@@ -59,34 +41,59 @@ Feature: research project
     And the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas members duplicated" does not have duplicated members
 
   Scenario: new research project web
-    Given I am at new research project page
+    Given I am at the publications menu
+    And I go to new research project page
     And the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web"
-    When I can create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" with all required data
+    When I create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" with all required data filled on the web
     Then it is shown in the research project list with name "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web"
 
   Scenario: new invalid research project with blank name web
-    Given I am at new research project page
-    And the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    When I try to create a research project named as ""
+    Given I am at the publications menu
+    And I go to new research project page
+    And the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" created on web
+    When I try to create a research project named as "" on the web site
     Then the research project "" is not stored by the system because it is invalid
+    And  the system shows an error message at the new research project page
     And  I'm still on the new research project page
-    And no research project stored is affected
+    And  no research project stored is affected
 
   Scenario: new invalid research project with blank description web
-    Given I am at new research project page
-    And the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web"
-    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" with description field blank on the web site
-    Then the research project "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" is not stored by the system because it is invalid
+    Given I am at the publications menu
+    And I go to new research project page
+    And the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web 2"
+    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web 2" with description field blank on the web site
+    Then the research project "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web 2" is not stored by the system because it is invalid
     And  I'm still on the new research project page
+    And  the system shows an error message at the new research project page
     And no research project stored is affected
 
   Scenario: duplicated research project web
-    Given I am at new research project page
-    And the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web"
+    Given I am at the publications menu
+    And I go to new research project page
+    And the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" created on web
     When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" on the web site
-    Then  the system shows an warning message at the new research project page
+    Then  the system shows an error message at the new research project page
     And the research project "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" is not shown duplicated in the research project list
 
+
+  Scenario: duplicated research project
+    Given the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    Then the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is not stored twice
+    And no research project stored is affected
+
+  Scenario: new invalid research project with blank name
+    Given the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    Then the research project "" is not stored by the system because it is invalid
+    And no research project stored is affected
+
+  Scenario: new invalid research project with blank description
+    Given the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas"
+    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas" with description field blank
+    Then the research project "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas" is not stored by the system because it is invalid
+    And no research project stored is affected
+
   Scenario: list research projects where I am a member
     Given I am at the research project list page
     When I select the option to show my research projects
diff --git a/test/cucumber/steps/ResearchProjectSteps.groovy b/test/cucumber/steps/ResearchProjectSteps.groovy
index b3a832e1..9bc19501 100644
--- a/test/cucumber/steps/ResearchProjectSteps.groovy
+++ b/test/cucumber/steps/ResearchProjectSteps.groovy
@@ -235,14 +235,14 @@ Then(~'^the research project "([^"]*)" does not have duplicated members$'){Strin
     assert check
 }
 
-Given (~'^I am at new research project page$'){ ->
+Given (~'^I go to new research project page$'){ ->
     to ResearchProjectPage
     page.selectNewReseachGroup()
     at ResearchProjectPageCreatePage
 
 }
 
-When(~'^I can create a research project named as "([^"]*)" with all required data$'){ String projectName ->
+When(~'^I create a research project named as "([^"]*)" with all required data filled on the web$'){ String projectName ->
     page.fillResearchProject(projectName)
     page.createResearchProject()
     assert ResearchProject.findByProjectName(projectName) != null
@@ -252,6 +252,11 @@ Then (~'^I\'m still on the new research project page$'){ ->
     at ResearchProjectPageCreatePage
 }
 
+Then (~'^the system shows an error message at the new research project page$') { ->
+    at ResearchProjectPageCreatePage
+    page.checkHasErrorMsg()
+}
+
 Then(~'^it is shown in the research project list with name "([^"]*)"$'){ String projectName ->
     to ResearchProjectPage
     page.checkResearchGroupAtList(projectName)
@@ -264,6 +269,19 @@ When(~'^I try to create a research project named as "([^"]*)" with description f
     page.createResearchProject()
 }
 
+Given(~'^the system has a research project named as "([^"]*)" created on web$') { String projectName ->
+    ResearchProject project = ResearchProject.findByProjectName(projectName);
+
+    if(!project) {
+        page.fillResearchProject(projectName)
+        page.createResearchProject()
+        to ResearchProjectPage
+        page.selectNewReseachGroup()
+        at ResearchProjectPageCreatePage
+    }
+
+    assert ResearchProject.findByProjectName(projectName) != null;
+}
 
 When(~'^I try to create a research project named as "([^"]*)" on the web site$'){ String projectName ->
     // updated
@@ -278,11 +296,6 @@ Then(~'^the research project "([^"]*)" is not shown duplicated in the research p
     page.checkResearchGroupDuplicatedAtList(projectName)
 }
 
-Then(~'^the system shows an warning message at the new research project page$'){ ->
-    at ResearchProjectPageCreatePage
-    page.checkHasErrorMsg()
-}
-
 // ------------------------------------------------------------------------------------------------------------------------------
 // Aux Functions
 
@@ -302,11 +315,8 @@ def checkIfNoResearchProjectAffected(oldProjects) {
     List<ResearchProject> beforeProjects = oldProjects
     List<ResearchProject> afterProjects = ResearchProject.findAll()
 
-    beforeProjects.eachWithIndex { ResearchProject entry, int i ->
-        if (!entry.equals(afterProjects.get(i))) {
-            check = false
-            check
-        }
+    if(!beforeProjects.equals(afterProjects)) {
+        check = false
     }
 
     check
diff --git a/test/functional/pages/researchProject/ResearchProjectPageCreatePage.groovy b/test/functional/pages/researchProject/ResearchProjectPageCreatePage.groovy
index 4efd517c..2f7f4ff8 100644
--- a/test/functional/pages/researchProject/ResearchProjectPageCreatePage.groovy
+++ b/test/functional/pages/researchProject/ResearchProjectPageCreatePage.groovy
@@ -52,4 +52,8 @@ class ResearchProjectPageCreatePage extends FormPage{
 
         assert (size > 0)
     }
+
+    def checkHasWarningMsg() {
+        checkHasErrorMsg()
+    }
 }
diff --git a/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy b/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
index 5e19f925..16438b24 100644
--- a/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
+++ b/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
@@ -46,11 +46,18 @@ class ResearchProjectTestDadaAndOperations {
                members: ["Rubens Lopes da Silva", "Rubens Lopes da Silva"]
             ],
             [projectName:"Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web",
-                    description:"Neste projeto pretendemso definir e validar um método para a implementação de aplicações orientadas a Aspectos Complexas web. Em particular, este método deve suportar uma abordagem progressiva para implementação orientada a objetos, de forma que aspectos de distribuição, concorrência, e persistência não sejam inicialmente considerados pelo processo de implementação, mas sejam gradualmente introduzidos, preservando os requisitos funcionais da aplicação.",
-                    status:"CONCLUIDO",
-                    responsible: "Paulo Henrique Monteiro Borba",
-                    startYear: 2001,
-                    endYear: 2004,
+             description:"Neste projeto pretendemso definir e validar um método para a implementação de aplicações orientadas a Aspectos Complexas web. Em particular, este método deve suportar uma abordagem progressiva para implementação orientada a objetos, de forma que aspectos de distribuição, concorrência, e persistência não sejam inicialmente considerados pelo processo de implementação, mas sejam gradualmente introduzidos, preservando os requisitos funcionais da aplicação.",
+             status:"CONCLUIDO",
+             responsible: "Paulo Henrique Monteiro Borba",
+             startYear: 2001,
+             endYear: 2004,
+            ],
+            [projectName:"",
+             description:"Neste projeto pretendemso definir e validar um método para a implementação de aplicações orientadas a Aspectos Complexas web. Em particular, este método deve suportar uma abordagem progressiva para implementação orientada a objetos, de forma que aspectos de distribuição, concorrência, e persistência não sejam inicialmente considerados pelo processo de implementação, mas sejam gradualmente introduzidos, preservando os requisitos funcionais da aplicação.",
+             status:"CONCLUIDO",
+             responsible: "Paulo Henrique Monteiro Borba",
+             startYear: 2001,
+             endYear: 2004,
             ]
     ]
 

From 4c534e567ae3c7141d3baddee9ff5b2ac7b6ea5e Mon Sep 17 00:00:00 2001
From: vsnepomuceno <vnepomuceno@gmail.com>
Date: Wed, 9 Jul 2014 22:31:24 -0300
Subject: [PATCH 11/19] =?UTF-8?q?Corre=C3=A7=C3=A3o=20dos=20testes=20do=20?=
 =?UTF-8?q?ResearchProject.feature?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/cucumber/ResearchProject.feature         | 37 +++++++++----------
 ...esearchProjectTestDadaAndOperations.groovy |  5 ++-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/test/cucumber/ResearchProject.feature b/test/cucumber/ResearchProject.feature
index 6c9f42be..4fe7ad20 100644
--- a/test/cucumber/ResearchProject.feature
+++ b/test/cucumber/ResearchProject.feature
@@ -8,6 +8,12 @@ Feature: research project
     When I create a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" with all required data
     Then the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is properly stored by the system
 
+  Scenario: duplicated research project
+    Given the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    Then the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is not stored twice
+    And no research project stored is affected
+
   Scenario: remove research project
     Given the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
     And I am logged into the system as administrator of the research group named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
@@ -34,6 +40,18 @@ Feature: research project
     And the system shows an error message at the research project page
 #end
 
+  Scenario: new invalid research project with blank name
+    Given the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    When I try to create a research project named as ""
+    Then the research project "" is not stored by the system because it is invalid
+    And no research project stored is affected
+
+  Scenario: new invalid research project with blank description
+    Given the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas"
+    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas" with description field blank
+    Then the research project "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas" is not stored by the system because it is invalid
+    And no research project stored is affected
+
   Scenario: new research project with duplicated members
     Given the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas members duplicated"
     When I create a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas members duplicated" with member field duplicated
@@ -75,25 +93,6 @@ Feature: research project
     Then  the system shows an error message at the new research project page
     And the research project "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" is not shown duplicated in the research project list
 
-
-  Scenario: duplicated research project
-    Given the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    Then the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is not stored twice
-    And no research project stored is affected
-
-  Scenario: new invalid research project with blank name
-    Given the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    Then the research project "" is not stored by the system because it is invalid
-    And no research project stored is affected
-
-  Scenario: new invalid research project with blank description
-    Given the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas"
-    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas" with description field blank
-    Then the research project "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas" is not stored by the system because it is invalid
-    And no research project stored is affected
-
   Scenario: list research projects where I am a member
     Given I am at the research project list page
     When I select the option to show my research projects
diff --git a/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy b/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
index 16438b24..063e38db 100644
--- a/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
+++ b/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
@@ -9,8 +9,6 @@ import rgms.researchProject.ResearchProjectController
  */
 class ResearchProjectTestDadaAndOperations {
 
-    static ResearchProjectController cont = new ResearchProjectController()
-
     static researchProjects =[
             [projectName:"Implementação Progressiva de Aplicações Orientadas a Objetos Complexas",
                     description:"Neste projeto pretendemso definir e validar um método para a implementação de aplicações orientadas a objetos complexas. Em particular, este método deve suportar uma abordagem progressiva para implementação orientada a objetos, de forma que aspectos de distribuição, concorrência, e persistência não sejam inicialmente considerados pelo processo de implementação, mas sejam gradualmente introduzidos, preservando os requisitos funcionais da aplicação.",
@@ -68,6 +66,7 @@ class ResearchProjectTestDadaAndOperations {
     }
 
     private static void createResearchProjectDefault(String name) {
+        def cont = new ResearchProjectController()
         cont.params << findResearchProjectByProjectName(name)
         cont.request.setContent(new byte[1000]) // Could also vary the request content.
         cont.create()
@@ -76,6 +75,7 @@ class ResearchProjectTestDadaAndOperations {
     }
 
     public static void createResearchProjectWithoutFunders(String name) {
+        def cont = new ResearchProjectController()
         def rp = findResearchProjectByProjectName(name);
         rp.funders = null;
         cont.params << rp;
@@ -94,6 +94,7 @@ class ResearchProjectTestDadaAndOperations {
     }
 
     public static void deleteResearchProject(String name){
+        def cont = new ResearchProjectController()
         ResearchProject project = getIfResearchProjectExists(findResearchProjectByProjectName(name).projectName)
         if(project) {
             cont.delete(project.id)

From 660d0434685041877667060cd785c2a42510d3fb Mon Sep 17 00:00:00 2001
From: vsnepomuceno <vnepomuceno@gmail.com>
Date: Fri, 11 Jul 2014 14:25:17 -0300
Subject: [PATCH 12/19] Teste de metaclasse

---
 .../ResearchProjectControllerAspect.groovy    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 grails-app/controllers/rgms/researchProject/aspect/ResearchProjectControllerAspect.groovy

diff --git a/grails-app/controllers/rgms/researchProject/aspect/ResearchProjectControllerAspect.groovy b/grails-app/controllers/rgms/researchProject/aspect/ResearchProjectControllerAspect.groovy
new file mode 100644
index 00000000..182ae1e9
--- /dev/null
+++ b/grails-app/controllers/rgms/researchProject/aspect/ResearchProjectControllerAspect.groovy
@@ -0,0 +1,25 @@
+package rgms.researchProject.aspect
+
+import rgms.researchProject.ResearchProject
+import rgms.researchProject.ResearchProjectController
+
+/**
+ * Created by Vilmar Nepomuceno on 10/07/2014.
+ */
+class ResearchProjectControllerAspect {
+
+    def mc = ResearchProjectController.metaClass
+    def init() {
+        mc.save = { ->
+
+            def researchProjectInstance = new ResearchProject(params)
+
+            if (!researchProjectInstance.save(flush: true)) {
+                return
+            }
+
+            flash.message = message(code: 'default.created.message', args: [message(code: 'researchProject.label', default: 'ResearchProject'), researchProjectInstance.id])
+            redirect(action: "show", id: researchProjectInstance.id)
+        }
+    }
+}

From 5e79621f840cfe57be6bdec84223265a4a4887f0 Mon Sep 17 00:00:00 2001
From: vsnepomuceno <vnepomuceno@gmail.com>
Date: Fri, 11 Jul 2014 14:26:36 -0300
Subject: [PATCH 13/19] Teste metaclasse

---
 .../steps/ResearchProjectTestDadaAndOperations.groovy       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy b/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
index 063e38db..46736694 100644
--- a/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
+++ b/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
@@ -3,6 +3,7 @@ package steps
 import rgms.publication.XMLController
 import rgms.researchProject.ResearchProject
 import rgms.researchProject.ResearchProjectController
+import rgms.researchProject.aspect.ResearchProjectControllerAspect
 
 /**
  * Created by Bruno Soares on 24/02/14.
@@ -65,8 +66,11 @@ class ResearchProjectTestDadaAndOperations {
         }
     }
 
+    static ResearchProjectController cont = new ResearchProjectController()
+
     private static void createResearchProjectDefault(String name) {
-        def cont = new ResearchProjectController()
+        def contAspect = new ResearchProjectControllerAspect()
+        contAspect.init()
         cont.params << findResearchProjectByProjectName(name)
         cont.request.setContent(new byte[1000]) // Could also vary the request content.
         cont.create()

From 0d7b1289b06dde91764c7e889e0830b62f9dc857 Mon Sep 17 00:00:00 2001
From: vsnepomuceno <vnepomuceno@gmail.com>
Date: Fri, 11 Jul 2014 22:10:14 -0300
Subject: [PATCH 14/19] =?UTF-8?q?Melhoria=20no=20texto=20dos=20cen=C3=A1ri?=
 =?UTF-8?q?os=20web.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/cucumber/ResearchProject.feature           | 6 +++---
 test/cucumber/steps/ResearchProjectSteps.groovy | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/cucumber/ResearchProject.feature b/test/cucumber/ResearchProject.feature
index 4fe7ad20..e813771d 100644
--- a/test/cucumber/ResearchProject.feature
+++ b/test/cucumber/ResearchProject.feature
@@ -69,7 +69,7 @@ Feature: research project
     Given I am at the publications menu
     And I go to new research project page
     And the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" created on web
-    When I try to create a research project named as "" on the web site
+    When I try to create a research project named as "" on the web
     Then the research project "" is not stored by the system because it is invalid
     And  the system shows an error message at the new research project page
     And  I'm still on the new research project page
@@ -79,7 +79,7 @@ Feature: research project
     Given I am at the publications menu
     And I go to new research project page
     And the system has no research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web 2"
-    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web 2" with description field blank on the web site
+    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web 2" with description field blank on the web
     Then the research project "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web 2" is not stored by the system because it is invalid
     And  I'm still on the new research project page
     And  the system shows an error message at the new research project page
@@ -89,7 +89,7 @@ Feature: research project
     Given I am at the publications menu
     And I go to new research project page
     And the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" created on web
-    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" on the web site
+    When I try to create a research project named as "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" on the web
     Then  the system shows an error message at the new research project page
     And the research project "Implementação Progressiva de Aplicações Orientadas a Aspectos Complexas web" is not shown duplicated in the research project list
 
diff --git a/test/cucumber/steps/ResearchProjectSteps.groovy b/test/cucumber/steps/ResearchProjectSteps.groovy
index 9bc19501..b141ff75 100644
--- a/test/cucumber/steps/ResearchProjectSteps.groovy
+++ b/test/cucumber/steps/ResearchProjectSteps.groovy
@@ -201,7 +201,6 @@ Then(~'^the data of the research project named "([^"]*)" is updated in the syste
 
 
 // ------------------------------------------------------------------------------------------------------------------------------
-// NOVOS Vilmar
 Then(~'^no research project stored is affected'){ ->
     assert checkIfNoResearchProjectAffected(oldProjects)
 }
@@ -262,7 +261,7 @@ Then(~'^it is shown in the research project list with name "([^"]*)"$'){ String
     page.checkResearchGroupAtList(projectName)
 }
 
-When(~'^I try to create a research project named as "([^"]*)" with description field blank on the web site$'){ String projectName ->
+When(~'^I try to create a research project named as "([^"]*)" with description field blank on the web$'){ String projectName ->
     // updated
     oldProjects =  ResearchProject.findAll()
     page.fillResearchProjectWithBlankDescription(projectName)
@@ -283,7 +282,7 @@ Given(~'^the system has a research project named as "([^"]*)" created on web$')
     assert ResearchProject.findByProjectName(projectName) != null;
 }
 
-When(~'^I try to create a research project named as "([^"]*)" on the web site$'){ String projectName ->
+When(~'^I try to create a research project named as "([^"]*)" on the web$'){ String projectName ->
     // updated
     oldProjects =  ResearchProject.findAll()
     at ResearchProjectPageCreatePage

From af6da1dc99cb4ebf551fbe2db1d7bddf28206fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gert=20Uch=C3=B4a=20M=C3=BCller=20Neto?=
 <gertmuller88@gmail.com>
Date: Mon, 14 Jul 2014 07:09:16 -0300
Subject: [PATCH 15/19] =?UTF-8?q?Atividade=205=20e=20corre=C3=A7=C3=B5es?=
 =?UTF-8?q?=20na=20Atividade=204.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ResearchProjectController.groovy          | 14 +++++
 grails-app/i18n/messages_pt_BR.properties     |  2 +-
 grails-app/views/researchProject/list.gsp     | 12 ++++
 test/cucumber/ResearchProject.feature         |  5 +-
 .../steps/ResearchProjectSteps.groovy         | 56 +++++++++----------
 .../ResearchProjectPage.groovy                | 15 +++--
 6 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/grails-app/controllers/rgms/researchProject/ResearchProjectController.groovy b/grails-app/controllers/rgms/researchProject/ResearchProjectController.groovy
index a846a49e..4b1b0ffe 100644
--- a/grails-app/controllers/rgms/researchProject/ResearchProjectController.groovy
+++ b/grails-app/controllers/rgms/researchProject/ResearchProjectController.groovy
@@ -1,7 +1,10 @@
 //#if($researchProject)
 package rgms.researchProject
 
+import org.apache.shiro.SecurityUtils
 import org.springframework.dao.DataIntegrityViolationException
+import rgms.authentication.User
+import rgms.member.Member
 
 class ResearchProjectController {
 
@@ -20,6 +23,17 @@ class ResearchProjectController {
         [researchProjectInstance: new ResearchProject(params)]
     }
 
+    def myProjects() {
+        User user = User.findByUsername(SecurityUtils.subject.principal);
+        List<ResearchProject> listP = ResearchProject.findAllByResponsible(user.getAuthor().getName());
+        render(view: '/researchProject/list', model: [researchProjectInstanceList: listP, researchProjectInstanceTotal: listP.size()]);
+    }
+
+    def filter(String projectName) {
+        List<ResearchProject> listP = ResearchProject.findAllByProjectName(projectName);
+        render(view: '/researchProject/list', model: [researchProjectInstanceList: listP, researchProjectInstanceTotal: listP.size()]);
+    }
+
     def save() {
         def researchProjectInstance = new ResearchProject(params)
         saveInstance(researchProjectInstance,"create",'default.created.message')
diff --git a/grails-app/i18n/messages_pt_BR.properties b/grails-app/i18n/messages_pt_BR.properties
index 4a0b0d27..1e0e7436 100644
--- a/grails-app/i18n/messages_pt_BR.properties
+++ b/grails-app/i18n/messages_pt_BR.properties
@@ -92,7 +92,7 @@ default.article.imported.message = As article não existentes foram importadas c
 default.article.checkVersion.message = Um outro usuário atualizou este orientation enquanto você estava editando
 
 default.reseachproject.label = Grupo de Pesquisa
-
+default.researchproject.myProjects = Meus Projetos de Pesquisa
 
 conferencia.title.label=Título
 conferencia.author.label=Autor
diff --git a/grails-app/views/researchProject/list.gsp b/grails-app/views/researchProject/list.gsp
index 72a9c0a6..083766d9 100644
--- a/grails-app/views/researchProject/list.gsp
+++ b/grails-app/views/researchProject/list.gsp
@@ -13,6 +13,7 @@
 			<ul>
 				<li><a class="home" href="${createLink(uri: '/')}"><g:message code="default.home.label"/></a></li>
 				<li><g:link class="create" action="create"><g:message code="default.new.label" args="[entityName]" /></g:link></li>
+                <li><g:link class="myProjects" action="myProjects"><g:message code="default.researchproject.myProjects"/></g:link></li>
 			</ul>
 		</div>
 
@@ -29,6 +30,17 @@
         </div>
         <!-- #end -->
 
+        <div class="filter" role="filter">
+            <ul>
+                <br>
+                <g:form controller="ResearchProject" action="filter" method="post" enctype="multipart/form-data">
+                    <label for="projectName">&nbsp;&nbsp;&nbsp;&nbsp;Filtrar por nome:</label>
+                    <input type="text" name="projectName" id="projectName"/>
+                    <input class="save" type="submit" value="Filtrar"/>
+                </g:form>
+            </ul>
+        </div>
+
 		<div id="list-researchProject" class="content scaffold-list" role="main">
 			<h1><g:message code="default.list.label" args="[entityName]" /></h1>
 			<g:if test="${flash.message}">
diff --git a/test/cucumber/ResearchProject.feature b/test/cucumber/ResearchProject.feature
index e813771d..fbfcb545 100644
--- a/test/cucumber/ResearchProject.feature
+++ b/test/cucumber/ResearchProject.feature
@@ -16,7 +16,7 @@ Feature: research project
 
   Scenario: remove research project
     Given the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    And I am logged into the system as administrator of the research group named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
+    And I am logged into the system as administrator
     When I remove the research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
     Then the research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is properly removed by the system
 
@@ -99,7 +99,7 @@ Feature: research project
     Then the system shows a list with the research projects where I am a member
 
   Scenario: filter research projects by name
-    Given  I am at the research projects list page
+    Given  I am at the research project list page
     When I fill the project name filter field with "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
     And select the option to filter the research projects
     Then the system shows the research projects with the name "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
@@ -112,6 +112,5 @@ Feature: research project
 
   Scenario: edit existing research project
     Given the system has a research project named as "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
-    And I am logged into the system as administrator of the research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas"
     When I edit the research project "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" in the system
     Then the data of the research project named "Implementação Progressiva de Aplicações Orientadas a Objetos Complexas" is updated in the system
diff --git a/test/cucumber/steps/ResearchProjectSteps.groovy b/test/cucumber/steps/ResearchProjectSteps.groovy
index b141ff75..bac5e1d5 100644
--- a/test/cucumber/steps/ResearchProjectSteps.groovy
+++ b/test/cucumber/steps/ResearchProjectSteps.groovy
@@ -2,8 +2,11 @@ package steps
 
 import org.apache.shiro.SecurityUtils
 import org.apache.shiro.UnavailableSecurityManagerException
+import pages.LoginPage
 import pages.researchProject.ResearchProjectPage
 import pages.researchProject.ResearchProjectPageCreatePage
+import pages.researchProject.ResearchProjectPageEditPage
+import pages.researchProject.ResearchProjectPageShowPage
 import rgms.authentication.User
 import rgms.member.Member
 import rgms.researchProject.ResearchProject
@@ -24,13 +27,13 @@ def List<ResearchProject> oldProjects
 Given(~'^the system has no research project named as "([^"]*)"$') { String projectName ->
     if(!checkIfResearchProjectNoExists(projectName)) {
         ResearchProject.findByProjectName(projectName).delete();
-        assert checkIfResearchProjectNoExists(projectName);
     }
+
+    assert checkIfResearchProjectNoExists(projectName);
 }
 
 When(~'^I create a research project named as "([^"]*)" with all required data$') { String projectName ->
     ResearchProjectTestDadaAndOperations.createResearchProject(projectName);
-    assert ResearchProject.findByProjectName(projectName) != null;
 }
 
 Then(~'^the research project "([^"]*)" is properly stored by the system$') { String projectName ->
@@ -45,7 +48,7 @@ Then(~'^the research project "([^"]*)" is properly stored by the system$') { Str
 Given(~'^the system has a research project named as "([^"]*)"$') { String projectName ->
     ResearchProject project = ResearchProject.findByProjectName(projectName);
 
-    if(!project) {
+    if(project==null) {
         ResearchProjectTestDadaAndOperations.createResearchProject(projectName);
     }
 
@@ -66,11 +69,8 @@ Then(~'^the research project "([^"]*)" is not stored twice$') { String projectNa
 // ------------------------------------------------------------------------------------------------------------------------------
 // Scenario: remove research project
 
-Given(~'^I am logged into the system as administrator of the research group named as "([^"]*)"$') { String projectName ->
-    assert checkIfLoggedUserIsAdminOfResearchProject(projectName);
-}
-
 When(~'^I remove the research project named as "([^"]*)"$') { String projectName ->
+    oldProjects = ResearchProject.findAll();
     ResearchProjectTestDadaAndOperations.deleteResearchProject(projectName);
 }
 
@@ -85,7 +85,6 @@ Then(~'^the research project named as "([^"]*)" is properly removed by the syste
 
 When(~'^I create a research project named as "([^"]*)" without funders$'){ String projectName ->
     ResearchProjectTestDadaAndOperations.createResearchProjectWithoutFunders(projectName);
-    assert ResearchProject.findByProjectName(projectName) != null;
 }
 // ------------------------------------------------------------------------------------------------------------------------------
 
@@ -133,6 +132,10 @@ Then (~'^the system shows an error message at the research project page$'){ ->
 // Scenario: list research projects where I am a member
 
 Given(~'^I am at the research project list page$') { ->
+    to LoginPage;
+    at LoginPage;
+    page.fillLoginData("admin", "adminadmin");
+    to ResearchProjectPage;
     at ResearchProjectPage;
 }
 
@@ -141,7 +144,7 @@ When(~'^I select the option to show my research projects$') { ->
 }
 
 Then(~'^the system shows a list with the research projects where I am a member$') { ->
-    page.checkResearchGroupHasMeAsMember();
+    page.checkResearchGroupHasLoggedUserAsMember();
 }
 // ------------------------------------------------------------------------------------------------------------------------------
 
@@ -167,7 +170,11 @@ Then(~'^the system shows the research projects with the name "([^"]*)"$') { Stri
 // Scenario: remove research project that does not exist
 
 Given(~'^I am logged into the system as administrator$') { ->
-    TestDataAndOperations.loginController(this);
+    if(!checkIfLoggedUserIsAdmin()) {
+        TestDataAndOperations.loginController(this);
+    }
+
+    assert checkIfLoggedUserIsAdmin();
 }
 // ------------------------------------------------------------------------------------------------------------------------------
 
@@ -175,27 +182,22 @@ Given(~'^I am logged into the system as administrator$') { ->
 // ------------------------------------------------------------------------------------------------------------------------------
 // Scenario: edit existing research project
 
-def projectDataUpdate = "Descrição teste";
-
 When(~'^I edit the research project "([^"]*)" in the system$') { String projectName ->
+    oldProject = ResearchProject.findByProjectName(projectName);
+
     to ResearchProjectPage;
+    at ResearchProjectPage;
     page.selectReseachGroup(projectName);
     at ResearchProjectPageShowPage;
     page.selectEditReseachGroup();
     at ResearchProjectPageEditPage;
-    page.fillUpdateDescription(projectDataUpdate);
+    page.fillUpdateDescription("Nova Descrição para Teste");
     page.saveUpdates();
 }
 
 Then(~'^the data of the research project named "([^"]*)" is updated in the system$') { String projectName ->
-    def check = false;
-    def rp = ResearchProject.findByProjectName(projectName);
-
-    if(rp!=null && rp.description==projectDataUpdate) {
-        check = true;
-    }
-
-    assert check;
+    newProject = ResearchProject.findByProjectName(projectName);
+    assert oldProject != newProject;
 }
 // ------------------------------------------------------------------------------------------------------------------------------
 
@@ -321,18 +323,10 @@ def checkIfNoResearchProjectAffected(oldProjects) {
     check
 }
 
-def checkIfLoggedUserIsAdminOfResearchProject(String projectName) {
-    ResearchProject project = ResearchProject.findByProjectName(projectName);
-    Member author = null;
-
+def checkIfLoggedUserIsAdmin() {
     try {
-        if(SecurityUtils.subject?.principal!=null) {
-            User user = User.findByUsername(SecurityUtils.subject.principal);
-            author = user.getAuthor();
-        }
+        return SecurityUtils.subject.principal=="admin";
     } catch(UnavailableSecurityManagerException e) {
         return false;
     }
-
-    return author.name == project.responsible;
 }
\ No newline at end of file
diff --git a/test/functional/pages/researchProject/ResearchProjectPage.groovy b/test/functional/pages/researchProject/ResearchProjectPage.groovy
index c2b5646a..4b98f785 100644
--- a/test/functional/pages/researchProject/ResearchProjectPage.groovy
+++ b/test/functional/pages/researchProject/ResearchProjectPage.groovy
@@ -43,7 +43,7 @@ class ResearchProjectPage extends FormPage {
     }
 
     def myProjects() {
-        $("a", class: "my-research-projects").click();
+        $("a", class: "myProjects").click();
     }
 
     def hasInvalidXMLSubmited(){
@@ -52,12 +52,7 @@ class ResearchProjectPage extends FormPage {
     }
 
     def selectReseachGroup(String name){
-        $("a", text: name).click()
-    }
-
-    @Override
-    protected void finalize() throws Throwable {
-        super.finalize()
+        $("a", text: name).click();
     }
 
     def fillFilterResearchProject(projectName) {
@@ -94,7 +89,8 @@ class ResearchProjectPage extends FormPage {
         assert check
     }
 
-    def checkResearchGroupHasMeAsMember() {
+    def checkResearchGroupHasLoggedUserAsMember() {
+        // Procura usuário logado no Apache Shiro
         def User user;
         try {
             if(SecurityUtils.subject?.principal!=null) {
@@ -105,9 +101,12 @@ class ResearchProjectPage extends FormPage {
         }
 
         boolean check = true;
+
+        // obtém da tela as linhas da tabela que lista os Projetos de Pesquisa
         def researchGroupRows = getResearchGroupRows()
         int size = researchGroupRows.size();
 
+        // percorre a tabela para procurar o nome do usuário logado como membro dos Projetos de Pesquisa
         if(size > 1) {
             for(int i=0; i<size; i++) {
                 def researchGroupColumns = researchGroupRows[i].find('td');

From b103fa90538983ee03918d1032e4142b737f6a1a Mon Sep 17 00:00:00 2001
From: vsnepomuceno <vnepomuceno@gmail.com>
Date: Wed, 23 Jul 2014 17:31:31 -0300
Subject: [PATCH 16/19] =?UTF-8?q?Altera=C3=A7=C3=B5es=20requisitadas=20por?=
 =?UTF-8?q?=20Paulo.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ResearchProjectControllerAspect.groovy    | 25 -------------------
 .../steps/ResearchProjectSteps.groovy         | 17 +++++--------
 ...esearchProjectTestDadaAndOperations.groovy |  5 +---
 3 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 grails-app/controllers/rgms/researchProject/aspect/ResearchProjectControllerAspect.groovy

diff --git a/grails-app/controllers/rgms/researchProject/aspect/ResearchProjectControllerAspect.groovy b/grails-app/controllers/rgms/researchProject/aspect/ResearchProjectControllerAspect.groovy
deleted file mode 100644
index 182ae1e9..00000000
--- a/grails-app/controllers/rgms/researchProject/aspect/ResearchProjectControllerAspect.groovy
+++ /dev/null
@@ -1,25 +0,0 @@
-package rgms.researchProject.aspect
-
-import rgms.researchProject.ResearchProject
-import rgms.researchProject.ResearchProjectController
-
-/**
- * Created by Vilmar Nepomuceno on 10/07/2014.
- */
-class ResearchProjectControllerAspect {
-
-    def mc = ResearchProjectController.metaClass
-    def init() {
-        mc.save = { ->
-
-            def researchProjectInstance = new ResearchProject(params)
-
-            if (!researchProjectInstance.save(flush: true)) {
-                return
-            }
-
-            flash.message = message(code: 'default.created.message', args: [message(code: 'researchProject.label', default: 'ResearchProject'), researchProjectInstance.id])
-            redirect(action: "show", id: researchProjectInstance.id)
-        }
-    }
-}
diff --git a/test/cucumber/steps/ResearchProjectSteps.groovy b/test/cucumber/steps/ResearchProjectSteps.groovy
index bac5e1d5..17b0ef97 100644
--- a/test/cucumber/steps/ResearchProjectSteps.groovy
+++ b/test/cucumber/steps/ResearchProjectSteps.groovy
@@ -95,6 +95,7 @@ When(~'^I create a research project named as "([^"]*)" without funders$'){ Strin
 
 Given(~'^the system has some research project stored$'){ ->
     initialSize = ResearchProject.findAll().size()
+    assert initialSize > 0
 }
 
 When(~'^I upload new research projects from the file "([^"]*)"$') { filename ->
@@ -224,11 +225,10 @@ When(~'^I create a research project named as "([^"]*)" with member field duplica
 Then(~'^the research project "([^"]*)" does not have duplicated members$'){String projectName ->
     ResearchProject project  = ResearchProject.findByProjectName(projectName);
     boolean check = true
-    Iterator i = project.members.iterator()
-    while (i.hasNext() && check) {
-        String m = i.next()
-        project.members.remove(m)
-        if (project.members.contains(m)) {
+
+    project.members.each {member ->
+        project.members.remove(member)
+        if (project.members.contains(member)) {
             check = false
         }
     }
@@ -312,15 +312,10 @@ def checkIfResearchProjectExists(String projectName){
 }
 
 def checkIfNoResearchProjectAffected(oldProjects) {
-    boolean check = true;
     List<ResearchProject> beforeProjects = oldProjects
     List<ResearchProject> afterProjects = ResearchProject.findAll()
 
-    if(!beforeProjects.equals(afterProjects)) {
-        check = false
-    }
-
-    check
+    beforeProjects.equals(afterProjects)
 }
 
 def checkIfLoggedUserIsAdmin() {
diff --git a/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy b/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
index 46736694..53c015f9 100644
--- a/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
+++ b/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
@@ -66,11 +66,8 @@ class ResearchProjectTestDadaAndOperations {
         }
     }
 
-    static ResearchProjectController cont = new ResearchProjectController()
-
     private static void createResearchProjectDefault(String name) {
-        def contAspect = new ResearchProjectControllerAspect()
-        contAspect.init()
+        def cont = new ResearchProjectController()
         cont.params << findResearchProjectByProjectName(name)
         cont.request.setContent(new byte[1000]) // Could also vary the request content.
         cont.create()

From 1ca79b5a162c0a5f4f73ef444fd2f64bd97c8158 Mon Sep 17 00:00:00 2001
From: vsnepomuceno <vnepomuceno@gmail.com>
Date: Wed, 23 Jul 2014 17:57:13 -0300
Subject: [PATCH 17/19] =?UTF-8?q?Corre=C3=A7=C3=A3o=20no=20passo=20"the=20?=
 =?UTF-8?q?system=20has=20some=20research=20project=20stored".?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/cucumber/steps/ResearchProjectSteps.groovy | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/cucumber/steps/ResearchProjectSteps.groovy b/test/cucumber/steps/ResearchProjectSteps.groovy
index 17b0ef97..7c25221a 100644
--- a/test/cucumber/steps/ResearchProjectSteps.groovy
+++ b/test/cucumber/steps/ResearchProjectSteps.groovy
@@ -94,6 +94,7 @@ When(~'^I create a research project named as "([^"]*)" without funders$'){ Strin
 // XML import
 
 Given(~'^the system has some research project stored$'){ ->
+    ResearchProjectTestDadaAndOperations.createResearchProject("Implementação Progressiva de Aplicações Orientadas a Objetos Complexas");
     initialSize = ResearchProject.findAll().size()
     assert initialSize > 0
 }

From a83b7bf4924433f7828974f53844eea92d0e5078 Mon Sep 17 00:00:00 2001
From: vsnepomuceno <vnepomuceno@gmail.com>
Date: Wed, 23 Jul 2014 18:28:37 -0300
Subject: [PATCH 18/19] =?UTF-8?q?Remo=C3=A7=C3=A3o=20do=20import=20do=20as?=
 =?UTF-8?q?pecto=20deletado=20da=20branch.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functional/steps/ResearchProjectTestDadaAndOperations.groovy | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy b/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
index 53c015f9..063e38db 100644
--- a/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
+++ b/test/functional/steps/ResearchProjectTestDadaAndOperations.groovy
@@ -3,7 +3,6 @@ package steps
 import rgms.publication.XMLController
 import rgms.researchProject.ResearchProject
 import rgms.researchProject.ResearchProjectController
-import rgms.researchProject.aspect.ResearchProjectControllerAspect
 
 /**
  * Created by Bruno Soares on 24/02/14.

From b182c28f56216fa418bbe791e09cb71a812ae4e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gert=20Uch=C3=B4a=20M=C3=BCller=20Neto?=
 <gertmuller88@gmail.com>
Date: Wed, 30 Jul 2014 13:47:25 -0300
Subject: [PATCH 19/19] =?UTF-8?q?Altera=C3=A7=C3=B5es=20solicitadas=20por?=
 =?UTF-8?q?=20Paulo=20para=20Atividade=205.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 grails-app/i18n/messages.properties           |  1 +
 .../steps/ResearchProjectSteps.groovy         |  2 +-
 .../ResearchProjectPage.groovy                | 52 +++++++------------
 3 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/grails-app/i18n/messages.properties b/grails-app/i18n/messages.properties
index a050fb1a..193df958 100644
--- a/grails-app/i18n/messages.properties
+++ b/grails-app/i18n/messages.properties
@@ -220,6 +220,7 @@ orientation.tituloTese.unique = Orientation title already registered, you can no
 
 #if($researchProject)
 default.researchProject.label = "ResearchProject"
+default.researchproject.myProjects = My Research Projects
 researchProject.label = ResearchProject
 default.researchproject.import.flashmessage.success = "The non existent Research Project were successfully imported"
 #end
diff --git a/test/cucumber/steps/ResearchProjectSteps.groovy b/test/cucumber/steps/ResearchProjectSteps.groovy
index 7c25221a..1270d750 100644
--- a/test/cucumber/steps/ResearchProjectSteps.groovy
+++ b/test/cucumber/steps/ResearchProjectSteps.groovy
@@ -199,7 +199,7 @@ When(~'^I edit the research project "([^"]*)" in the system$') { String projectN
 
 Then(~'^the data of the research project named "([^"]*)" is updated in the system$') { String projectName ->
     newProject = ResearchProject.findByProjectName(projectName);
-    assert oldProject != newProject;
+    assert (oldProject.description != newProject.description) && (oldProject.projectName == newProject.projectName);
 }
 // ------------------------------------------------------------------------------------------------------------------------------
 
diff --git a/test/functional/pages/researchProject/ResearchProjectPage.groovy b/test/functional/pages/researchProject/ResearchProjectPage.groovy
index 4b98f785..891ee8af 100644
--- a/test/functional/pages/researchProject/ResearchProjectPage.groovy
+++ b/test/functional/pages/researchProject/ResearchProjectPage.groovy
@@ -90,52 +90,40 @@ class ResearchProjectPage extends FormPage {
     }
 
     def checkResearchGroupHasLoggedUserAsMember() {
-        // Procura usuário logado no Apache Shiro
-        def User user;
+        def User user = getLoggedUser();
+        def membersColumn = 6;
+        assert checkResearchProjectFilter(membersColumn, user.getAuthor().getName());
+    }
+
+    def checkResearchGroupListFilteredByName(String name) {
+        def projectNameColumn = 0;
+        assert checkResearchProjectFilter(projectNameColumn, name);
+    }
+
+    def getLoggedUser() {
         try {
             if(SecurityUtils.subject?.principal!=null) {
                 user = User.findByUsername(SecurityUtils.subject.principal);
             }
         } catch(UnavailableSecurityManagerException e) {
-            return false;
-        }
-
-        boolean check = true;
-
-        // obtém da tela as linhas da tabela que lista os Projetos de Pesquisa
-        def researchGroupRows = getResearchGroupRows()
-        int size = researchGroupRows.size();
-
-        // percorre a tabela para procurar o nome do usuário logado como membro dos Projetos de Pesquisa
-        if(size > 1) {
-            for(int i=0; i<size; i++) {
-                def researchGroupColumns = researchGroupRows[i].find('td');
-
-                if(!researchGroupColumns[0].text().contains(user.getAuthor().getName())) {
-                    check = false;
-                }
-            }
+            return null;
         }
-
-        assert check;
     }
 
-    def checkResearchGroupListFilteredByName(filter) {
-        boolean check = true;
-        def researchGroupRows = getResearchGroupRows()
-        int size = researchGroupRows.size();
-
-        if(size > 1) {
-            for(int i=0; i<size; i++) {
-                def researchGroupColumns = researchGroupRows[i].find('td');
+    def checkResearchProjectFilter(int column, String text) {
+        def check = true;
+        def researchProjectRows = getResearchGroupRows();
+        int size = researchProjectRows.size();
 
-                if(!researchGroupColumns[6].text().contains(filter)) {
+        if(researchProjectRows.size() > 1) {
+            for(def row : researchProjectRows) {
+                if(!row.find('td')[column].text().contains(text)) {
                     check = false;
                 }
             }
         }
 
-        assert check;
+        return check;
     }
 
 }