Permalink
Browse files

[IT-1380] removed mockito framework

  • Loading branch information...
marcusmeier committed Jan 11, 2017
1 parent a9418fd commit ec6d65920098dd27e78f85f0d0b9a97d2829d9bc
3 NOTICE
@@ -84,9 +84,6 @@ This project includes:
Less CSS Resources Plugin created by Paul Fairless, Apache License 2.0,
available at http://grails.org/plugin/lesscss-resources
Mockito Mocking Framework created by Szczepan Faber and friends, MIT License,
available at https://code.google.com/p/mockito/
PrettyCron created by dunse, LGPL version 3,
available at https://github.com/azza-bazoo/prettycron
@@ -125,7 +125,6 @@ dependencies {
assets 'com.bertramlabs.plugins:less-asset-pipeline:2.9.4'
testCompile 'org.hamcrest:hamcrest-all:1.3'
testCompile 'software.betamax:betamax-junit:2.0.0-alpha-1'
testCompile 'org.mockito:mockito-all:1.9.5'
testCompile('com.codeborne:phantomjsdriver:1.2.1') {
transitive = false
}
@@ -269,4 +268,4 @@ sourceSets {
}
'dbmChangelogSync' {
jvmArgs = ["-XX:MaxPermSize=512m", "-Xms1G", "-Xmx2G"]
}
}
@@ -18,7 +18,6 @@
package de.iteratec.osm.csi
import de.iteratec.osm.ConfigService
import de.iteratec.osm.csi.transformation.TimeToCsMappingService
import de.iteratec.osm.measurement.environment.Browser
import de.iteratec.osm.measurement.environment.Location
import de.iteratec.osm.measurement.environment.dao.BrowserDaoService
@@ -32,7 +31,6 @@ import de.iteratec.osm.report.UserspecificCsiDashboard
import de.iteratec.osm.report.UserspecificDashboardBase
import de.iteratec.osm.report.UserspecificDashboardService
import de.iteratec.osm.report.chart.*
import de.iteratec.osm.report.chart.dao.AggregatorTypeDaoService
import de.iteratec.osm.result.MeasuredEvent
import de.iteratec.osm.result.MvQueryParams
import de.iteratec.osm.result.dao.MeasuredEventDaoService
@@ -66,7 +64,6 @@ import static de.iteratec.osm.csi.Contract.requiresArgumentNotNull
*/
class CsiDashboardController {
AggregatorTypeDaoService aggregatorTypeDaoService
JobGroupDaoService jobGroupDaoService
PageDaoService pageDaoService
MeasuredEventDaoService measuredEventDaoService
@@ -80,7 +77,6 @@ class CsiDashboardController {
EventService eventService
SpringSecurityService springSecurityService
ConnectivityProfileDaoService connectivityProfileDaoService
TimeToCsMappingService timeToCsMappingService
ConfigService configService
CustomDashboardService customDashboardService
UserspecificDashboardService userspecificDashboardService
@@ -21,21 +21,16 @@ import de.iteratec.osm.ConfigService
import de.iteratec.osm.csi.Page
import de.iteratec.osm.measurement.environment.Browser
import de.iteratec.osm.measurement.environment.Location
import de.iteratec.osm.measurement.environment.LocationController
import de.iteratec.osm.measurement.environment.dao.BrowserDaoService
import de.iteratec.osm.measurement.environment.dao.LocationDaoService
import de.iteratec.osm.measurement.environment.wptserverproxy.AssetRequestPersisterService
import de.iteratec.osm.measurement.schedule.ConnectivityProfile
import de.iteratec.osm.measurement.schedule.Job
import de.iteratec.osm.measurement.schedule.JobGroup
import de.iteratec.osm.measurement.schedule.dao.JobGroupDaoService
import de.iteratec.osm.measurement.schedule.dao.PageDaoService
import de.iteratec.osm.p13n.CustomDashboardService
import de.iteratec.osm.report.UserspecificDashboardBase
import de.iteratec.osm.report.UserspecificDashboardService
import de.iteratec.osm.report.UserspecificEventResultDashboard
import de.iteratec.osm.report.chart.*
import de.iteratec.osm.report.chart.dao.AggregatorTypeDaoService
import de.iteratec.osm.util.AnnotationUtil
import de.iteratec.osm.util.ControllerUtils
import de.iteratec.osm.util.I18nService
@@ -44,12 +39,10 @@ import grails.converters.JSON
import grails.web.mapping.LinkGenerator
import org.grails.web.json.JSONObject
import org.joda.time.DateTime
import org.joda.time.Duration
import org.joda.time.Interval
import org.joda.time.format.DateTimeFormat
import org.joda.time.format.DateTimeFormatter
import org.springframework.dao.DataIntegrityViolationException
import org.springframework.web.servlet.FlashMap
import org.springframework.web.servlet.support.RequestContextUtils
import org.supercsv.encoder.DefaultCsvEncoder
import org.supercsv.io.CsvListWriter
@@ -62,14 +55,8 @@ class EventResultDashboardController {
static final int RESULT_DASHBOARD_MAX_POINTS_PER_SERIES = 100000
AggregatorTypeDaoService aggregatorTypeDaoService
JobGroupDaoService jobGroupDaoService
PageDaoService pageDaoService
BrowserDaoService browserDaoService
LocationDaoService locationDaoService
CsiAggregationUtilService csiAggregationUtilService
EventResultDashboardService eventResultDashboardService
PageService pageService
I18nService i18nService
EventService eventService
def springSecurityService
@@ -25,16 +25,13 @@ import de.iteratec.osm.measurement.environment.dao.BrowserDaoService
import de.iteratec.osm.measurement.environment.dao.LocationDaoService
import de.iteratec.osm.measurement.schedule.dao.JobGroupDaoService
import de.iteratec.osm.measurement.schedule.dao.PageDaoService
import de.iteratec.osm.persistence.OsmDataSourceService
import de.iteratec.osm.report.UserspecificCsiDashboardController
import de.iteratec.osm.report.UserspecificDashboardService
import de.iteratec.osm.report.ui.EventResultListing
import de.iteratec.osm.report.ui.EventResultListingRow
import de.iteratec.osm.report.ui.PaginationListing
import de.iteratec.osm.result.dao.EventResultDaoService
import de.iteratec.osm.result.dao.MeasuredEventDaoService
import de.iteratec.osm.util.ControllerUtils
import de.iteratec.osm.util.PerformanceLoggingService
import org.joda.time.DateTime
import org.joda.time.Interval
@@ -59,7 +56,6 @@ class TabularResultPresentationController {
MeasuredEventDaoService measuredEventDaoService
BrowserDaoService browserDaoService
LocationDaoService locationDaoService
PerformanceLoggingService performanceLoggingService
EventResultDaoService eventResultDaoService
PaginationService paginationService
Oops, something went wrong.

0 comments on commit ec6d659

Please sign in to comment.