Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove fixed issue link and clean up integration test provider setup #3052

Merged
merged 7 commits into from
Jul 17, 2023
Merged

Remove fixed issue link and clean up integration test provider setup #3052

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f176180
add skipped test
chilagrow Jul 14, 2023
517cbe1
replace long provider list with remove
chilagrow Jul 14, 2023
92bea20
use object comparison
chilagrow Jul 14, 2023
22ad9a0
AllProviders do not skip any provider
chilagrow Jul 14, 2023
224142f
one more exception
chilagrow Jul 14, 2023
50f885d
add todo for failing projection test
chilagrow Jul 14, 2023
d465cdc
Merge branch 'main' into issue-2184-analysis
AlekSi Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
AllProviders do not skip any provider
  • Loading branch information
@chilagrow
chilagrow committed Jul 14, 2023
commit 22ad9a0f0b4dde092f4f724f1c3d141c4fd3a2a3
5 changes: 4 additions & 1 deletion integration/aggregate_documents_compat_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,6 +1082,9 @@ func TestAggregateCompatGroupSum(t *testing.T) {
func TestAggregateCompatMatch(t *testing.T) {
t.Parallel()

// TODO https://github.com/FerretDB/FerretDB/issues/2291
providers := shareddata.AllProviders().Remove(shareddata.ArrayAndDocuments)

testCases := map[string]aggregateStagesCompatTestCase{
"ID": {
pipeline: bson.A{bson.D{{"$match", bson.D{{"_id", "string"}}}}},
Expand Down Expand Up @@ -1129,7 +1132,7 @@ func TestAggregateCompatMatch(t *testing.T) {
},
}

testAggregateStagesCompat(t, testCases)
testAggregateStagesCompatWithProviders(t, providers, testCases)
}

func TestAggregateCompatSort(t *testing.T) {
Expand Down
10 changes: 8 additions & 2 deletions integration/query_comparison_compat_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,6 +1035,9 @@ func TestQueryComparisonCompatLte(t *testing.T) {
func TestQueryComparisonCompatNin(t *testing.T) {
t.Parallel()

// TODO https://github.com/FerretDB/FerretDB/issues/2291
providers := shareddata.AllProviders().Remove(shareddata.ArrayAndDocuments)

var scalarDataTypesFilter bson.A
for _, scalarDataType := range shareddata.Scalars.Docs() {
scalarDataTypesFilter = append(scalarDataTypesFilter, scalarDataType.Map()["v"])
Expand Down Expand Up @@ -1071,12 +1074,15 @@ func TestQueryComparisonCompatNin(t *testing.T) {
},
}

testQueryCompat(t, testCases)
testQueryCompatWithProviders(t, providers, testCases)
}

func TestQueryComparisonCompatIn(t *testing.T) {
t.Parallel()

// TODO https://github.com/FerretDB/FerretDB/issues/2291
providers := shareddata.AllProviders().Remove(shareddata.ArrayAndDocuments)

var scalarDataTypesFilter bson.A
for _, scalarDataType := range shareddata.Scalars.Docs() {
scalarDataTypesFilter = append(scalarDataTypesFilter, scalarDataType.Map()["v"])
Expand Down Expand Up @@ -1113,7 +1119,7 @@ func TestQueryComparisonCompatIn(t *testing.T) {
},
}

testQueryCompat(t, testCases)
testQueryCompatWithProviders(t, providers, testCases)
}

func TestQueryComparisonCompatNe(t *testing.T) {
Expand Down
3 changes: 1 addition & 2 deletions integration/shareddata/shareddata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ func AllProviders() Providers {
ArrayDocuments,

Mixed,
// TODO https://github.com/FerretDB/FerretDB/issues/2291
// ArrayAndDocuments,
ArrayAndDocuments,
}

// check that names are unique and randomize order
Expand Down