refactor: Move filter tests into filter_test packages

This allows removing MockFilter interface without causing an import
loop.

internal/filter/allDayEvents_test.go

@@ -1,8 +1,9 @@
-package filter
+package filter_test
 
 import (
 	"testing"
 
+	"github.com/inovex/CalendarSync/internal/filter"
 	"github.com/inovex/CalendarSync/internal/models"
 	"github.com/stretchr/testify/assert"
 )
@@ -34,9 +35,9 @@ func TestAllDayEventsFilter(t *testing.T) {
 
 	expectedSinkEvents := []models.Event{sourceEvents[1], sourceEvents[2]}
 
-	filter := AllDayEvents{}
+	eventFilter := filter.AllDayEvents{}
 
-	filteredEvents := FilterEvents(sourceEvents, filter)
+	filteredEvents := FilterEvents(sourceEvents, eventFilter)
 
 	assert.Equal(t, expectedSinkEvents, filteredEvents)
 }

internal/filter/declinedEvents_test.go

@@ -1,8 +1,9 @@
-package filter
+package filter_test
 
 import (
 	"testing"
 
+	"github.com/inovex/CalendarSync/internal/filter"
 	"github.com/inovex/CalendarSync/internal/models"
 	"github.com/stretchr/testify/assert"
 )
@@ -35,8 +36,8 @@ func TestDeclinedEventsFilter(t *testing.T) {
 
 	expectedSinkEvents := []models.Event{sourceEvents[1], sourceEvents[2]}
 
-	filter := DeclinedEvents{}
-	filteredEvents := FilterEvents(sourceEvents, filter)
+	eventFilter := filter.DeclinedEvents{}
+	filteredEvents := FilterEvents(sourceEvents, eventFilter)
 
 	assert.Equal(t, expectedSinkEvents, filteredEvents)
 }

internal/filter/regexTitle_test.go

@@ -1,8 +1,9 @@
-package filter
+package filter_test
 
 import (
 	"testing"
 
+	"github.com/inovex/CalendarSync/internal/filter"
 	"github.com/inovex/CalendarSync/internal/models"
 	"github.com/stretchr/testify/assert"
 )
@@ -33,11 +34,11 @@ func TestRegexTitleFilter(t *testing.T) {
 
 	expectedSinkEvents := []models.Event{sourceEvents[1], sourceEvents[2]}
 
-	filter := RegexTitle{
+	eventFilter := filter.RegexTitle{
 		ExludeRegexp: ".*test",
 	}
 
-	filteredEvents := FilterEvents(sourceEvents, filter)
+	filteredEvents := FilterEvents(sourceEvents, eventFilter)
 
 	assert.Equal(t, expectedSinkEvents, filteredEvents)
 }
@@ -46,11 +47,11 @@ func TestRegexTitleFilter(t *testing.T) {
 func TestRegexTitleFilterEmptyRegex(t *testing.T) {
 	expectedSinkEvents := sourceEvents
 
-	filter := RegexTitle{
+	eventFilter := filter.RegexTitle{
 		ExludeRegexp: "",
 	}
 
-	filteredEvents := FilterEvents(sourceEvents, filter)
+	filteredEvents := FilterEvents(sourceEvents, eventFilter)
 
 	assert.Equal(t, expectedSinkEvents, filteredEvents)
 }

internal/filter/util.go → internal/filter/util_test.go

@@ -1,17 +1,13 @@
-package filter
+package filter_test
 
 import (
 	"github.com/inovex/CalendarSync/internal/models"
+	"github.com/inovex/CalendarSync/internal/sync"
 )
 
-// Need to declare another interface similar to the sync.Filter interface here, otherwise we would land in an import loop
-type MockFilter interface {
-	Filter(models.Event) bool
-}
-
 // FilterEvents takes an array of events and a filter and executes the .Filter Method on each of the sourceEvents
 // Not exluded events get returned in the filteredEvents
-func FilterEvents(sourceEvents []models.Event, filter MockFilter) (filteredEvents []models.Event) {
+func FilterEvents(sourceEvents []models.Event, filter sync.Filter) (filteredEvents []models.Event) {
 	for _, event := range sourceEvents {
 		if filter.Filter(event) {
 			filteredEvents = append(filteredEvents, event)