From 8199d212b8f5ecaa05b71d562a51a5f0ed48be62 Mon Sep 17 00:00:00 2001 From: Bojnourdi Date: Tue, 11 Aug 2015 18:18:54 +0200 Subject: [PATCH] Working on tests for Study --- .../test/com/edf/gde/dao/StudyDaoClient.java | 8 +-- .../test/com/edf/gde/test/base/BaseTest.java | 22 +++++++ .../com/edf/gde/test/dao/StudyDaoTest.java | 59 +++++++++++++++++-- .../com/edf/gde/test/dao/UserDaoTest.java | 47 +++++++++------ 4 files changed, 107 insertions(+), 29 deletions(-) create mode 100644 projects/GDE_App/GDE-war/test/com/edf/gde/test/base/BaseTest.java diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/StudyDaoClient.java b/projects/GDE_App/GDE-war/test/com/edf/gde/dao/StudyDaoClient.java index 75146a9..180e037 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/StudyDaoClient.java +++ b/projects/GDE_App/GDE-war/test/com/edf/gde/dao/StudyDaoClient.java @@ -54,8 +54,8 @@ public class StudyDaoClient extends BaseDao { commandTO.setLong("studyId", studyId); if (postAsJSonData(commandTO, daoResponseHandler)) { CommandResultTO resultTO = daoResponseHandler.getResultTO(); - if (resultTO.getCode() != CommandResultTO.OK) { - throw new RuntimeException("Server error"); + if (resultTO.getCode() == CommandResultTO.OK) { + return; } } throw new RuntimeException("Unable to change study state"); @@ -79,8 +79,8 @@ public class StudyDaoClient extends BaseDao { commandTO.setLong("studyId", studyId); if (postAsJSonData(commandTO, daoResponseHandler)) { CommandResultTO resultTO = daoResponseHandler.getResultTO(); - if (resultTO.getCode() != CommandResultTO.OK) { - throw new RuntimeException("Server error"); + if (resultTO.getCode() == CommandResultTO.OK) { + return; } } throw new RuntimeException("Unable to delete study"); diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/test/base/BaseTest.java b/projects/GDE_App/GDE-war/test/com/edf/gde/test/base/BaseTest.java new file mode 100644 index 0000000..ce6e57d --- /dev/null +++ b/projects/GDE_App/GDE-war/test/com/edf/gde/test/base/BaseTest.java @@ -0,0 +1,22 @@ +/* + * (C) 2015 EDF + */ +package com.edf.gde.test.base; + +/** + * + * @author Kavoos + */ +public class BaseTest { + + public BaseTest() { + } + + protected void testName(String message) { + System.out.print(message); + } + + protected void passed() { + System.out.println("\t\t[PASSED]"); + } +} diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/StudyDaoTest.java b/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/StudyDaoTest.java index e9d0030..871d3d7 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/StudyDaoTest.java +++ b/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/StudyDaoTest.java @@ -4,12 +4,14 @@ package com.edf.gde.test.dao; import com.edf.gde.dao.StudyDaoClient; +import com.edf.gde.test.base.BaseTest; import com.edf.gde.transferables.StudyTO; import java.util.Date; import org.junit.After; import org.junit.AfterClass; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -18,7 +20,7 @@ import org.junit.Test; * * @author Kavoos */ -public class StudyDaoTest { +public class StudyDaoTest extends BaseTest { @BeforeClass public static void setUpClass() { @@ -38,14 +40,59 @@ public class StudyDaoTest { @Test public void testCreateStudy() throws Exception { - System.out.println("createStudy"); + testName("createStudy"); StudyDaoClient daoClient = new StudyDaoClient(); - StudyTO studyTO = new StudyTO(); - studyTO.setName("My study"); - studyTO.setCreationDate(new Date(System.currentTimeMillis())); - studyTO.setValid(true); + StudyTO studyTO = createStudyTO("my study"); StudyTO newStudyTO = daoClient.createStudy(studyTO); assertNotNull(newStudyTO); assertEquals(studyTO.getName(), newStudyTO.getName()); + passed(); + } + + @Test + public void testSetStudyState() throws Exception { + testName("setStudyState"); + /* Create new study */ + StudyDaoClient daoClient = new StudyDaoClient(); + StudyTO studyTO = createStudyTO("state study"); + StudyTO newStudyTO = daoClient.createStudy(studyTO); + /* Change state of the study */ + daoClient.setStudyState(newStudyTO.getId(), 1); + passed(); + } + + @Test + public void testReadStudy() throws Exception { + testName("readStudy"); + /* Create new study */ + StudyDaoClient daoClient = new StudyDaoClient(); + StudyTO studyTO = createStudyTO("read study"); + StudyTO newStudyTO = daoClient.createStudy(studyTO); + /* Read the new study from server */ + StudyTO remoteStudyTO = daoClient.readStudy(newStudyTO.getId()); + assertEquals("read study", remoteStudyTO.getName()); + assertNotNull(remoteStudyTO.getCreationDate()); + assertTrue(remoteStudyTO.getCreationDate().before(new Date())); + passed(); + } + + @Test + public void testDeleteStudy() throws Exception { + testName("deleteStudy"); + /* Create new study */ + StudyDaoClient daoClient = new StudyDaoClient(); + StudyTO studyTO = createStudyTO("read study"); + StudyTO newStudyTO = daoClient.createStudy(studyTO); + /* delete the new study from server */ + daoClient.deleteStudy(newStudyTO.getId()); + passed(); + } + + private StudyTO createStudyTO(String name) { + StudyTO studyTO = new StudyTO(); + studyTO.setName(name); + studyTO.setCreationDate(new Date(System.currentTimeMillis())); + studyTO.setValid(false); + return studyTO; } } diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/UserDaoTest.java b/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/UserDaoTest.java index f2080f7..ff32d94 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/UserDaoTest.java +++ b/projects/GDE_App/GDE-war/test/com/edf/gde/test/dao/UserDaoTest.java @@ -4,6 +4,7 @@ package com.edf.gde.test.dao; import com.edf.gde.dao.UserDaoClient; +import com.edf.gde.test.base.BaseTest; import com.edf.gde.transferables.GroupTO; import com.edf.gde.transferables.UserTO; import java.io.IOException; @@ -18,7 +19,7 @@ import static org.junit.Assert.*; * * @author mordicus */ -public class UserDaoTest { +public class UserDaoTest extends BaseTest { public UserDaoTest() { } @@ -74,13 +75,13 @@ public class UserDaoTest { boolean result = daoClient.deleteGroup(groupID); return result; } - + private boolean addToGroup(long groupId, long userId) throws IOException { UserDaoClient daoClient = new UserDaoClient(); boolean result = daoClient.addToGroup(groupId, userId); return result; } - + private boolean removeFromGroup(long groupId, long userId) throws IOException { UserDaoClient daoClient = new UserDaoClient(); boolean result = daoClient.removeFromGroup(groupId, userId); @@ -92,12 +93,13 @@ public class UserDaoTest { */ @Test public void testCreateUser() throws Exception { - System.out.println("createUser"); + testName("createUser"); String userName = "Kavoos"; String password = "edf123"; long userId = createUser(userName, password); assertTrue((userId != -1) && (userId > 0)); assertTrue(deleteUser(userId)); + passed(); } /** @@ -105,17 +107,18 @@ public class UserDaoTest { */ @Test public void testDeleteUser() throws Exception { - System.out.println("deleteUser"); + testName("deleteUser"); long userId = createUser("Kavoos", "edf123"); assertTrue(userId > 0); boolean expResult = true; boolean result = deleteUser(userId); assertEquals(expResult, result); + passed(); } @Test public void testFindUser() throws Exception { - System.out.println("findUser"); + testName("findUser"); long userId = createUser("Kavoos", "edf123"); assertTrue(userId > 0); UserTO userTO = findUser("Kavoos"); @@ -123,20 +126,22 @@ public class UserDaoTest { assertTrue(userTO.getId() == userId); assertEquals("Kavoos", userTO.getName()); assertTrue(deleteUser(userId)); + passed(); } @Test public void testCreateGroup() throws Exception { - System.out.println("createGroup"); + testName("createGroup"); GroupTO groupTO = createGroup("Admin"); assertNotNull(groupTO); assertEquals("Admin", groupTO.getName()); assertTrue(deleteGroup(groupTO.getId())); + passed(); } @Test public void testFindGroup() throws Exception { - System.out.println("findGroup"); + testName("findGroup"); GroupTO groupTO = createGroup("Admin"); assertNotNull(groupTO); assertEquals("Admin", groupTO.getName()); @@ -144,54 +149,58 @@ public class UserDaoTest { assertNotNull(groupTO); assertEquals("Admin", groupTO.getName()); assertTrue(deleteGroup(groupTO.getId())); + passed(); } @Test public void testDeleteGroup() throws Exception { - System.out.println("deleteGroup"); + testName("deleteGroup"); GroupTO groupTO = createGroup("Admin"); assertNotNull(groupTO); assertEquals("Admin", groupTO.getName()); assertTrue(deleteGroup(groupTO.getId())); + passed(); } - + @Test public void testAddToGroup() throws Exception { - System.out.println("addToGroup"); + testName("addToGroup"); /* create a group */ GroupTO groupTO = createGroup("Admin"); assertNotNull(groupTO); - assertTrue(groupTO.getId()>0); + assertTrue(groupTO.getId() > 0); assertEquals("Admin", groupTO.getName()); /* Create a user */ long userId = createUser("Kavoos", "edf123"); - assertTrue(userId>0); + assertTrue(userId > 0); /* add the user to the group */ - boolean result = addToGroup(groupTO.getId(),userId); + boolean result = addToGroup(groupTO.getId(), userId); assertTrue(result); assertTrue(deleteGroup(groupTO.getId())); assertTrue(deleteUser(userId)); + passed(); } @Test public void testRemoveFromGroup() throws Exception { - System.out.println("removeFromGroup"); + testName("removeFromGroup"); /* create a group */ GroupTO groupTO = createGroup("Admin"); assertNotNull(groupTO); - assertTrue(groupTO.getId()>0); + assertTrue(groupTO.getId() > 0); assertEquals("Admin", groupTO.getName()); /* Create a user */ long userId = createUser("Kavoos", "edf123"); - assertTrue(userId>0); + assertTrue(userId > 0); /* add the user to the group */ - boolean result = addToGroup(groupTO.getId(),userId); + boolean result = addToGroup(groupTO.getId(), userId); assertTrue(result); /* Remove the user from the group */ - result = removeFromGroup(groupTO.getId(),userId); + result = removeFromGroup(groupTO.getId(), userId); assertTrue(result); assertTrue(deleteGroup(groupTO.getId())); assertTrue(deleteUser(userId)); + passed(); } } -- 2.39.2