diff --git a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/journal/model/dao/JournalDAOImplTest.java b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/journal/model/dao/JournalDAOImplTest.java index f77b4c9801a4e2621b2cf68382bb7c8536cf7582..d7d201f69c8a72f99538b3ba56cf9a3c32947891 100644 --- a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/journal/model/dao/JournalDAOImplTest.java +++ b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/journal/model/dao/JournalDAOImplTest.java @@ -31,8 +31,7 @@ public class JournalDAOImplTest { public void createJournal() { // Create Journal - Journal createJournal = testJournal; - journalDAO.createJournal(createJournal); + journalDAO.createJournal(testJournal); connection.connect(); @@ -108,13 +107,12 @@ public class JournalDAOImplTest { @Test public void deleteJournal() { - Journal deleteJournal = testJournal; //createJournal connection.connect(); // build and execute request - create(deleteJournal); + create(testJournal); //check if Journal was added ArrayList<Journal> resultJournals = getJournals(); @@ -138,14 +136,13 @@ public class JournalDAOImplTest { @Test public void getJournal() { - //create Journal - Journal getJournal = testJournal; + //createJournal connection.connect(); // build and execute request - create(getJournal); + create(testJournal); //get that Journal Journal resultJournal = journalDAO.getJournal(testId); @@ -224,8 +221,7 @@ public class JournalDAOImplTest { connection.connect(); //create Journal - Journal closeJournal = testJournal; - create(closeJournal); + create(testJournal); Journal resultJournal = getJournals().get(0); diff --git a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/journal/model/dao/LinkDAOImplTest.java b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/journal/model/dao/LinkDAOImplTest.java index 82b1b95d2e5711e2df937329a858027e26e3e982..151b6e7945671bcbb45c8d036a0b55cda4723915 100644 --- a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/journal/model/dao/LinkDAOImplTest.java +++ b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/journal/model/dao/LinkDAOImplTest.java @@ -12,14 +12,14 @@ import static org.junit.Assert.assertFalse; public class LinkDAOImplTest { - MysqlConnect connection = new MysqlConnect(); - LinkDAO linkDAO = new LinkDAOImpl(); - - String testId = "-1"; - String testProjectDescription = "testproject"; - String testName = "testname"; - String testLink = "https://www.test.de"; - Link testLinkObj = new Link(testId, testProjectDescription, testName, testLink); + private final MysqlConnect connection = new MysqlConnect(); + private final LinkDAO linkDAO = new LinkDAOImpl(); + + private final String testId = "-1"; + private final String testProjectDescription = "testproject"; + private final String testName = "testname"; + private final String testLink = "https://www.test.de"; + private final Link testLinkObj = new Link(testId, testProjectDescription, testName, testLink); @Test public void addLink() { diff --git a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionImplDAOTest.java b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionImplDAOTest.java index a42e54b114f01e360cc00c686cff78781cd5b8bf..bcc98003103ad7c5d13e95336266e32b67657595 100644 --- a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionImplDAOTest.java +++ b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionImplDAOTest.java @@ -80,9 +80,7 @@ public class ProjectDescriptionImplDAOTest { public void getDescriptionSI() { connection.connect(); - ProjectDescription getDescription = testProjectDescription; - - create(getDescription); + create(testProjectDescription); ProjectDescription result = descriptionDAO.getDescription(new StudentIdentifier(testProjekt, testStudent)); @@ -99,9 +97,7 @@ public class ProjectDescriptionImplDAOTest { public void getDescriptionID() { connection.connect(); - ProjectDescription getDescription = testProjectDescription; - - create(getDescription); + create(testProjectDescription); ProjectDescription result = descriptionDAO.getDescription(testId); @@ -118,9 +114,7 @@ public class ProjectDescriptionImplDAOTest { public void deleteDescription() { connection.connect(); - ProjectDescription deleteDescription = testProjectDescription; - - create(deleteDescription); + create(testProjectDescription); ArrayList<ProjectDescription> resultDescriptions = getProjectDescription(); @@ -141,9 +135,7 @@ public class ProjectDescriptionImplDAOTest { public void closeDescription() { connection.connect(); - ProjectDescription closeDescription = testProjectDescription; - - create(closeDescription); + create(testProjectDescription); ArrayList<ProjectDescription> resultDescriptions = getProjectDescription();