Arquivos de teste

test/cucumber/steps/AuthenticationSteps.groovy

@@ -18,6 +18,7 @@ import pages.PublicationsPage
 import pages.RootPage
 import pages.UnauthorizedPage
 import pages.UserRegisterPage
+import rgms.authentication.User
 import rgms.publication.Periodico
 import rgms.member.Member
 import rgms.member.MemberController
@@ -96,13 +97,16 @@ Then(~'A message indicating the user was successfully registered is displayed'){
 
 
 Given (~'The user of "([^"]*)" username is not yet enabled') { username ->
-    Member usuarioNaoHabilitado = Member.findByUsername("naoHabilitado")
+    User usuarioNaoHabilitado = User.findByUsername("naoHabilitado")
     if (!usuarioNaoHabilitado){
-        usuarioNaoHabilitado = new Member(name:"Usuario Nao Habilitado",username: 'naoHabilitado', passwordHash: new Sha256Hash("senha").toHex(),
-                email:"[email protected]", status:"Graduate Student", enabled:false, university:"UFPE")
+        usuarioNaoHabilitado = new User(username: 'naoHabilitado', passwordHash: new Sha256Hash("senha").toHex(), enabled:false)
+            def author = new Member(name:"Usuario Nao Habilitado", email:"[email protected]", status:"Graduate Student", university:"UFPE")
+        author.save()
+        usuarioNaoHabilitado.author = author;
         usuarioNaoHabilitado.save()
+
     }
-    def user = Member.findByUsername(username)
+    def user = User.findByUsername(username)
     assert( !user?.enabled )
 }
 

test/cucumber/steps/DissertacaoSteps.groovy

@@ -2,6 +2,7 @@ import pages.DissertationCreate
 import pages.DissertationEditPage
 import pages.DissertationPage
 import pages.DissertationShowPage
+import rgms.authentication.User
 import rgms.member.Member
 import rgms.publication.Dissertacao
 import steps.TestDataDissertacao
@@ -150,7 +151,7 @@ Then(~'^I see my user listed as an author member of dissertation by default$') {
 
 Then(~'^I see my school name as school of dissertation by default$') {->
     at DissertationCreate
-    userData = Member.findByUsername('admin').university
+    userData = User.findByUsername('admin')?.author?.university
     assert page.currentSchool() == userData
 }
 

test/cucumber/steps/MemberSteps.groovy

@@ -2,13 +2,15 @@ import pages.LoginPage
 import pages.member.MemberCreatePage
 import pages.member.MemberViewPage
 import pages.RegisterPage
+import rgms.authentication.User
 import rgms.member.Member
 import steps.MemberTestDataAndOperations
 
 import static cucumber.api.groovy.EN.*
 
 Given(~'^the system has no member with username "([^"]*)"$') { String username ->
-    member = Member.findByUsername(username);
+    user = User.findByUsername(username);
+    member = user?.author
     assert member == null
 }
 
@@ -21,13 +23,15 @@ When(~'^I create a member with username, phone "([^"]*)" "([^"]*)"$') { String u
 }
 
 Then(~'^the member with username "([^"]*)" is properly stored by the system$') { String username ->
-    member = Member.findByUsername(username)
+    user = User.findByUsername(username);
+    member = user?.author
     //assert TestDataAndOperations.memberCompatibleTo(member, username)
     assert member != null
 }
 
 Then(~'^the system has no member with a username "([^"]*)"$') { String username ->
-    member = Member.findByUsername(username);
+    user = User.findByUsername(username);
+    member = user?.author
     assert member == null
 }
 
@@ -64,7 +68,8 @@ Then(~'^I am still on the register page with the message user created$') {->
 
 Given(~'^the system has member with username "([^"]*)"$') { String username ->
     MemberTestDataAndOperations.createMember(username, "")
-    member = Member.findByUsername(username);
+    user = User.findByUsername(username);
+    member = user?.author
     assert member != null
 }
 
@@ -73,13 +78,15 @@ When(~'^I delete a member with username "([^"]*)"$') { String username ->
 }
 
 Then(~'^the member with "([^"]*)" doesnt exist$') { String username ->
-    member = Member.findByUsername(username)
+    user = User.findByUsername(username);
+    member = user?.author
     assert member == null
 }
 
 /*Given(~'^the system has member with username "([^"]*)"$') { String username ->
     TestDataAndOperations.createMember(username)
-    member = Member.findByUsername(username);
+    user = User.findByUsername(username);
+    member = user?.author
     assert member != null
 }*/
 
@@ -88,8 +95,8 @@ When(~'^I create the member with username "([^"]*)"$') { String username ->
 }
 
 Then(~'^the member "([^"]*)" is not registered$') { String username ->
-    members = Member.findAllByUsername(username)
-    assert members.size() == 1
+    users = User.findAllByUsername(username);
+    assert users.size() == 1
 }
 
 Given(~'^I am at the create member page$') {->
@@ -147,7 +154,8 @@ Then(~'my list members contains member "([^"]*)"$') { String username ->
 }
 
 Then(~'the member with username "([^"]*)" is created$') { String username ->
-    member = Member.findByUsername(username)
+    user = User.findByUsername(username)
+    member = user?.author
     assert member != null
 }
 

test/cucumber/steps/TechnicalReportSteps.groovy

@@ -4,6 +4,7 @@ import pages.technicalReport.TechnicalReportCreatePage
 import pages.technicalReport.TechnicalReportEditPage
 import pages.technicalReport.TechnicalReportPage
 import pages.technicalReport.TechnicalReportShowPage
+import rgms.authentication.User
 import rgms.member.Member
 import rgms.publication.TechnicalReport
 import steps.TestDataAndOperations
@@ -136,7 +137,7 @@ Then(~'^I see my user listed as an author member of technical report by default$
 
 Then(~'^I see my school name as institution of technical report by default$') {->
     at TechnicalReportCreatePage
-    userData = Member.findByUsername('admin').university
+    userData = User.findByUsername('admin')?.author?.university
     assert page.currentInstitution() == userData
 }
 

test/cucumber/steps/ThesisSteps.groovy

@@ -1,3 +1,4 @@
+import rgms.authentication.User
 import steps.ThesisTestDataAndOperations
 import pages.LoginPage
 import pages.thesis.ThesisCreatePage
@@ -86,6 +87,6 @@ Then(~'^I see my user listed as an author member of thesis by default$') {->
 
 Then(~'^I see my school name as school of thesis by default$') {->
     at ThesisCreatePage
-    userData = Member.findByUsername('admin').university
+    userData = User.findByUsername('admin')?.author?.university
     assert page.currentSchool() == userData
 }

test/functional/pages/UserRegisterPage.groovy

@@ -1,8 +1,10 @@
 package pages
 
 import geb.Page
+import rgms.authentication.User
 import rgms.member.Member
-
+import steps.MemberTestDataAndOperations
+import steps.TestDataAndOperations
 import steps.TestDataAuthentication
 
 class UserRegisterPage extends Page {
@@ -41,12 +43,12 @@ class UserRegisterPage extends Page {
 		//facebook_id.value("teste");
 		//access_token.value(user.access_token);
         submitForm();
-        Member.findByUsername(user.username)
+        User.findByUsername(user.username)
     }
 
 	def fillFormData(String userName){
 		println("userName="+userName)
-		def userData = TestDataAndOperations.findByUsername(userName)
+		def userData = MemberTestDataAndOperations.findByUsername(userName)
 		$("form").university = userData.university
 		$("form").name = userData.name
 		$("form").username = userName

test/functional/steps/MemberTestDataAndOperations.groovy

@@ -1,5 +1,6 @@
 package steps
 
+import rgms.authentication.User
 import rgms.member.Member
 import rgms.member.MemberController
 
@@ -47,9 +48,9 @@ class MemberTestDataAndOperations {
         cont.response.reset()
     }
     static public boolean containsMember(username) {
-        def member = Member.findByUsername(username)
+        def member = User.findByUsername(username)
         def cont = new MemberController()
-        def result = cont.list().memberInstanceList
+        def result = cont.list().userMemberInstanceList
         return result.contains(member)
     }
 }

test/functional/steps/TestDataAndOperations.groovy

@@ -1,5 +1,6 @@
 package steps
 
+import rgms.authentication.User
 import rgms.member.*
 import rgms.news.News
 import rgms.news.NewsController
@@ -161,7 +162,7 @@ class TestDataAndOperations {
     static public void deleteMembership(String username, String rgroup, String date1, String date2) {
         java.text.DateFormat df = new java.text.SimpleDateFormat("dd-MM-yyyy");
         def cont = new MembershipController()
-        def identificador = Membership.findByMemberAndResearchGroupAndDateJoinedAndDateLeft(Member.findByUsername(username),
+        def identificador = Membership.findByMemberAndResearchGroupAndDateJoinedAndDateLeft(User.findByUsername(username)?.author,
                 ResearchGroup.findByName(rgroup), df.parse(date1), df.parse(date2)).id
         cont.params << [id: identificador]
         cont.request.setContent(new byte[1000]) // Could also vary the request content.
@@ -214,7 +215,7 @@ class TestDataAndOperations {
 
 
     static public boolean containsMember(username, members) {
-        def testmember = Member.findByUsername(username)
+        def testmember = User.findByUsername(username)?.author
         def cont = new MemberController()
         def result = cont.list().memberInstanceList
         return result.contains(testmember)

test/functional/steps/TestDataAndOperationsPublication.groovy

@@ -1,11 +1,12 @@
 package steps
 
+import rgms.authentication.User
 import rgms.member.*
 
 class TestDataAndOperationsPublication {
 
     static public boolean containsUser(members){
-        def userData = Member.findByUsername('admin').id.toString()
+        def userData = User.findByUsername('admin')?.author?.id.toString()
         return members.contains(userData)
     }
 

test/functional/steps/TestDataAuthentication.groovy

@@ -1,7 +1,9 @@
 package steps
 
 import org.apache.shiro.crypto.hash.Sha256Hash
+import rgms.authentication.User
 import rgms.member.Member
+import twitter4j.auth.BasicAuthorization
 
 class TestDataAuthentication{
     static users = [
@@ -20,10 +22,11 @@ class TestDataAuthentication{
     }
 
     static public def generateUnregisteredUser(){
-        Member user = null;
+        User user = null;
+        Member author = null;
         while( user == null ||
                 !user.validate() ||
-                Member.findByUsername(user.username) != null){
+                User.findByUsername(user.username) != null){
             println "user: " + user
             println "validate: " + user?.validate()
             println "errors: " + user?.errors
@@ -36,11 +39,13 @@ class TestDataAuthentication{
             String status = "Graduate Student";
 			//String facebook_id = "12312fdsfsd".toString();
 			String access_token = "134gdsf";
-            user = new Member(name: nome, username: username, passwordHash: new Sha256Hash(password).toHex(),
-                        email: email, university: university, status: status, enabled: false, access_token: access_token, facebook_id: "teste")
+            author = new Member(name: nome, email: email, university: university, status: status,  access_token: access_token, facebook_id: "teste")
+            user = new User( username: username, passwordHash: new Sha256Hash(password).toHex(), enabled: false, author: author)
         }
         def userMapping = user.properties as LinkedHashMap
+        userMapping << author.properties as LinkedHashMap
         userMapping << [password: "12345"]
+        println userMapping
         users << userMapping;
         return userMapping
     }