refactor: filter: deduplicate filter asserts

inovex · Nov 6, 2023 · e8700ff · e8700ff
1 parent 5bac9e0
commit e8700ff
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 18 deletions.
diff --git a/internal/filter/allDayEvents_test.go b/internal/filter/allDayEvents_test.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/inovex/CalendarSync/internal/filter"
 	"github.com/inovex/CalendarSync/internal/models"
-	"github.com/stretchr/testify/assert"
 )
 
 // All Day Events should be filtered
@@ -36,8 +35,5 @@ func TestAllDayEventsFilter(t *testing.T) {
 	expectedSinkEvents := []models.Event{sourceEvents[1], sourceEvents[2]}
 
 	eventFilter := filter.AllDayEvents{}
-
-	filteredEvents := FilterEvents(sourceEvents, eventFilter)
-
-	assert.Equal(t, expectedSinkEvents, filteredEvents)
+	checkEventFilter(t, eventFilter, sourceEvents, expectedSinkEvents)
 }
diff --git a/internal/filter/declinedEvents_test.go b/internal/filter/declinedEvents_test.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/inovex/CalendarSync/internal/filter"
 	"github.com/inovex/CalendarSync/internal/models"
-	"github.com/stretchr/testify/assert"
 )
 
 // Declined Events should be filtered
@@ -37,7 +36,5 @@ func TestDeclinedEventsFilter(t *testing.T) {
 	expectedSinkEvents := []models.Event{sourceEvents[1], sourceEvents[2]}
 
 	eventFilter := filter.DeclinedEvents{}
-	filteredEvents := FilterEvents(sourceEvents, eventFilter)
-
-	assert.Equal(t, expectedSinkEvents, filteredEvents)
+	checkEventFilter(t, eventFilter, sourceEvents, expectedSinkEvents)
 }
diff --git a/internal/filter/regexTitle_test.go b/internal/filter/regexTitle_test.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/inovex/CalendarSync/internal/filter"
 	"github.com/inovex/CalendarSync/internal/models"
-	"github.com/stretchr/testify/assert"
 )
 
 var sourceEvents = []models.Event{
@@ -37,10 +36,7 @@ func TestRegexTitleFilter(t *testing.T) {
 	eventFilter := filter.RegexTitle{
 		ExludeRegexp: ".*test",
 	}
-
-	filteredEvents := FilterEvents(sourceEvents, eventFilter)
-
-	assert.Equal(t, expectedSinkEvents, filteredEvents)
+	checkEventFilter(t, eventFilter, sourceEvents, expectedSinkEvents)
 }
 
 // All Events should be there
@@ -50,8 +46,5 @@ func TestRegexTitleFilterEmptyRegex(t *testing.T) {
 	eventFilter := filter.RegexTitle{
 		ExludeRegexp: "",
 	}
-
-	filteredEvents := FilterEvents(sourceEvents, eventFilter)
-
-	assert.Equal(t, expectedSinkEvents, filteredEvents)
+	checkEventFilter(t, eventFilter, sourceEvents, expectedSinkEvents)
 }
diff --git a/internal/filter/util_test.go b/internal/filter/util_test.go
@@ -3,6 +3,7 @@ package filter_test
 import (
 	"github.com/inovex/CalendarSync/internal/models"
 	"github.com/inovex/CalendarSync/internal/sync"
+	"github.com/stretchr/testify/assert"
 )
 
 // FilterEvents takes an array of events and a filter and executes the .Filter Method on each of the sourceEvents
@@ -15,3 +16,8 @@ func FilterEvents(sourceEvents []models.Event, filter sync.Filter) (filteredEven
 	}
 	return filteredEvents
 }
+
+func checkEventFilter(t assert.TestingT, filter sync.Filter, sourceEvents []models.Event, expectedEvents []models.Event) {
+	filteredEvents := FilterEvents(sourceEvents, filter)
+	assert.Equal(t, expectedEvents, filteredEvents)
+}