You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/11/05 14:20:59 UTC

[openmeetings] branch master updated: [OPENMEETINGS-1856] code clean-up

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new ffcb4fa  [OPENMEETINGS-1856] code clean-up
ffcb4fa is described below

commit ffcb4fabf08921db7b2529d3d695de8dd50f5c3b
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Mon Nov 5 21:20:47 2018 +0700

    [OPENMEETINGS-1856] code clean-up
---
 .../src/test/java/org/apache/openmeetings/backup/TestBackup.java     | 3 ---
 .../apache/openmeetings/calendar/TestAppointmentAddAppointment.java  | 3 ---
 .../openmeetings/calendar/TestDatabaseStructureAppointment.java      | 5 -----
 .../calendar/TestDatabaseStructureGetAppointmentByRange.java         | 5 -----
 .../java/org/apache/openmeetings/calendar/TestGetAppointment.java    | 3 ---
 5 files changed, 19 deletions(-)

diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestBackup.java b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestBackup.java
index 3884b6d..ca78607 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestBackup.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestBackup.java
@@ -33,7 +33,6 @@ import java.io.FileInputStream;
 import java.io.InputStream;
 
 import org.apache.openmeetings.AbstractJUnitDefaults;
-import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
 import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
 import org.apache.openmeetings.db.dao.room.RoomDao;
 import org.apache.openmeetings.db.entity.basic.Configuration;
@@ -52,8 +51,6 @@ public class TestBackup extends AbstractJUnitDefaults {
 	@Autowired
 	private RoomDao roomDao;
 	@Autowired
-	private AppointmentDao appointmentDao;
-	@Autowired
 	private MeetingMemberDao meetingMemberDao;
 
 	@Override
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentAddAppointment.java b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentAddAppointment.java
index 4df4f0f..159d77a 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentAddAppointment.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentAddAppointment.java
@@ -30,7 +30,6 @@ import java.util.Calendar;
 import java.util.Date;
 
 import org.apache.openmeetings.AbstractWicketTester;
-import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
 import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
 import org.apache.openmeetings.db.entity.calendar.Appointment;
 import org.apache.openmeetings.db.entity.calendar.Appointment.Reminder;
@@ -52,8 +51,6 @@ public class TestAppointmentAddAppointment extends AbstractWicketTester {
 	@Autowired
 	private AppointmentLogic appointmentLogic;
 	@Autowired
-	private AppointmentDao appointmentDao;
-	@Autowired
 	private MeetingMemberDao meetingMemberDao;
 
 	private static void setTime(Appointment a) {
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java
index f864ea0..4eae902 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java
@@ -25,19 +25,14 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.apache.openmeetings.AbstractJUnitDefaults;
-import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
 import org.apache.openmeetings.db.entity.calendar.Appointment;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 
 public class TestDatabaseStructureAppointment extends AbstractJUnitDefaults {
 	private static final Logger log = LoggerFactory.getLogger(TestDatabaseStructureAppointment.class);
 
-	@Autowired
-	private AppointmentDao appointmentDao;
-
 	@Test
 	public void testAddingGroup() {
 		try {
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetAppointmentByRange.java b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetAppointmentByRange.java
index 3e1a61e..8ca2afb 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetAppointmentByRange.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetAppointmentByRange.java
@@ -24,20 +24,15 @@ import java.util.ArrayList;
 import java.util.Calendar;
 
 import org.apache.openmeetings.AbstractJUnitDefaults;
-import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
 import org.apache.openmeetings.db.entity.calendar.Appointment;
 import org.apache.openmeetings.db.entity.calendar.MeetingMember;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 
 public class TestDatabaseStructureGetAppointmentByRange extends AbstractJUnitDefaults {
 	private static final Logger log = LoggerFactory.getLogger(TestDatabaseStructureGetAppointmentByRange.class);
 
-	@Autowired
-	private AppointmentDao appointmentDao;
-
 	@Test
 	public void test() {
 		log.debug("Test started");
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestGetAppointment.java b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestGetAppointment.java
index 5572c0b..186242c 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestGetAppointment.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestGetAppointment.java
@@ -25,7 +25,6 @@ import java.util.Calendar;
 import java.util.Date;
 
 import org.apache.openmeetings.AbstractJUnitDefaults;
-import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
 import org.apache.openmeetings.db.dao.room.RoomDao;
 import org.apache.openmeetings.db.entity.calendar.Appointment;
 import org.junit.Test;
@@ -37,8 +36,6 @@ public class TestGetAppointment extends AbstractJUnitDefaults {
 	private static final Logger log = LoggerFactory.getLogger(TestGetAppointment.class);
 
 	@Autowired
-	private AppointmentDao appointmentDao;
-	@Autowired
 	private RoomDao roomDao;
 
 	@Test