diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/database/mysql/MysqlConnect.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/database/mysql/MysqlConnect.java index 80ed128cf20fc34528390e98806b166a9495fde7..d5c42e2cceb64410da5b040a276c63c10083d4ee 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/database/mysql/MysqlConnect.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/database/mysql/MysqlConnect.java @@ -1,12 +1,17 @@ package unipotsdam.gf.core.database.mysql; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import unipotsdam.gf.config.GFDatabaseConfig; +import unipotsdam.gf.modules.communication.view.CommunicationView; import java.sql.*; import java.util.Date; public class MysqlConnect { + private static final Logger log = LoggerFactory.getLogger(MysqlConnect.class); + public Connection conn = null; private static String createConnectionString() { @@ -41,6 +46,7 @@ public class MysqlConnect { conn.close(); } } catch (final SQLException e) { + log.error(e.toString()); throw new Error("could not close mysql"); } } @@ -56,6 +62,7 @@ public class MysqlConnect { } return ps; } catch (SQLException ex) { + log.error(ex.toString()); System.out.println(ex); } return null; @@ -68,6 +75,7 @@ public class MysqlConnect { ResultSet queryResult = ps.executeQuery(); return new VereinfachtesResultSet(queryResult); } catch (SQLException ex) { + log.error(ex.toString()); System.out.println(ex); } return null; @@ -78,6 +86,7 @@ public class MysqlConnect { try { this.conn.createStatement().execute(statement); } catch (SQLException ex) { + log.error(ex.toString()); System.out.println(ex); } } @@ -88,6 +97,7 @@ public class MysqlConnect { try { return ps.executeUpdate(); } catch (SQLException ex) { + log.error(ex.toString()); System.out.println(ex); } return null; @@ -99,6 +109,8 @@ public class MysqlConnect { try { ps.execute(); } catch (SQLException ex) { + + log.error(ex.toString()); System.out.println(ex); } } diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/DummyResearchReportManagement.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/DummyResearchReportManagement.java index 1f1ece9f5505f20a499f57a860595d1b985a75ca..54b41cd876fe93c69ea86032291ebf5d37057854 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/DummyResearchReportManagement.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/DummyResearchReportManagement.java @@ -1,16 +1,24 @@ package unipotsdam.gf.modules.researchreport; import sun.reflect.generics.reflectiveObjects.NotImplementedException; +import uk.co.jemos.podam.api.PodamFactory; +import uk.co.jemos.podam.api.PodamFactoryImpl; import unipotsdam.gf.core.management.project.Project; import unipotsdam.gf.core.management.user.User; import java.io.File; public class DummyResearchReportManagement implements ResearchReportManagement { + + /** + * Utility to creaty dummy data for students + */ + PodamFactory factory = new PodamFactoryImpl(); + @Override public String createResearchReport( ResearchReport researchReport, Project project, User student) { - throw new NotImplementedException(); + return factory.manufacturePojo(ResearchReport.class).getId(); } @Override diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchReport.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchReport.java index 89ab3ef6d5bb34f6dea4adb77aea9566fc729492..31f5d35640bc5c80f7084ace747202fa30c9bdd2 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchReport.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchReport.java @@ -6,7 +6,7 @@ public class ResearchReport { // TODO add properties private String title; private ResearchQuestion researchQuestion; - + private String id; private List<String> learningGoals; private String method; private String research; @@ -108,4 +108,12 @@ public class ResearchReport { public void setTimeplan(Timeplanning timeplan) { this.timeplan = timeplan; } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } } diff --git a/gemeinsamforschen/src/test/java/unipotsdam/gf/interfaces/ActivityFlowTest.java b/gemeinsamforschen/src/test/java/unipotsdam/gf/interfaces/ActivityFlowTest.java index c7836b4195300289c45b09c62b68880946409181..c20ca38e724098702531100f071fc10af1c9d687 100644 --- a/gemeinsamforschen/src/test/java/unipotsdam/gf/interfaces/ActivityFlowTest.java +++ b/gemeinsamforschen/src/test/java/unipotsdam/gf/interfaces/ActivityFlowTest.java @@ -6,6 +6,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoRule; @@ -47,7 +48,7 @@ public class ActivityFlowTest { @Inject ResearchReportManagement researchReportManagement; - @Inject + @Mock Feedback feedback; @Inject @@ -174,17 +175,10 @@ public class ActivityFlowTest { public void createCourse() { // add Titel - Project project = new Project(); - project.setId("testprojekt"); + Project project = factory.manufacturePojo(Project.class); management.create(project); - // select criteria, topics, phases, assessment criteria - HashMap<ProjectPhase, Boolean> phasesSelected = new HashMap<>(); - HashMap<Category, Boolean> criteriaSelected = new HashMap<>(); - HashMap<AssessmentMechanism, Boolean> assessemtsSelected = new HashMap<>(); - HashMap<GroupFormationMechanism, Boolean> groupFormationSelected = new HashMap<>(); - ProjectConfiguration projectConfiguration = new ProjectConfiguration(phasesSelected, criteriaSelected, - assessemtsSelected, groupFormationSelected); + ProjectConfiguration projectConfiguration = factory.manufacturePojo(ProjectConfiguration.class); management.create(projectConfiguration, project); //