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

Fix/require-compare #11

Merged
merged 2 commits into from
Jul 5, 2024
Merged

Fix/require-compare #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf6a068
gix bug, assert no regression happens
jxsl13 Jul 5, 2024
3029cba
fix confusing text
jxsl13 Jul 5, 2024
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
23 changes: 15 additions & 8 deletions internal/testutils/require/compare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,42 @@ import (
func GreaterOrEqual(t *testing.T, expected, actual any, msgAndArgs ...any) {
t.Helper()

if compare(t, expected, actual) < 0 {
FailNow(t, fmt.Sprintf("expected: %v to be greater or equal to: %v", expected, actual), msgAndArgs...)
if compare(t, actual, expected) < 0 {
FailNow(t, fmt.Sprintf("expected actual value: %v to be greater or equal to: %v", actual, expected), msgAndArgs...)
}
}

func Greater(t *testing.T, expected, actual any, msgAndArgs ...any) {
t.Helper()

if compare(t, expected, actual) <= 0 {
FailNow(t, fmt.Sprintf("expected: %v to be greater than: %v", expected, actual), msgAndArgs...)
if compare(t, actual, expected) <= 0 {
FailNow(t, fmt.Sprintf("expected actual value: %v to be greater than: %v", actual, expected), msgAndArgs...)
}
}

func LessOrEqual(t *testing.T, expected, actual any, msgAndArgs ...any) {
t.Helper()

if compare(t, expected, actual) > 0 {
FailNow(t, fmt.Sprintf("expected: %v to be less or equal to: %v", expected, actual), msgAndArgs...)
if compare(t, actual, expected) > 0 {
FailNow(t, fmt.Sprintf("expected actual value: %v to be less or equal to: %v", actual, expected), msgAndArgs...)
}
}

func Less(t *testing.T, expected, actual any, msgAndArgs ...any) {
t.Helper()

if compare(t, expected, actual) >= 0 {
FailNow(t, fmt.Sprintf("expected: %v to be less than: %v", expected, actual), msgAndArgs...)
if compare(t, actual, expected) >= 0 {
FailNow(t, fmt.Sprintf("expected actual value: %v to be less than: %v", actual, expected), msgAndArgs...)
}
}

// compare returns
//
// -1 if expected is less than actual,
//
// 0 if expected equals actual,
//
// +1 if expected is greater than actual.
func compare(t *testing.T, expected, actual any) int {
t.Helper()

Expand Down
20 changes: 20 additions & 0 deletions internal/testutils/require/compare_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package require

import "testing"

func TestCompare(t *testing.T) {
GreaterOrEqual(t, 1, 2)
GreaterOrEqual(t, 1, 1)
Greater(t, 1, 2)
LessOrEqual(t, 2, 1)
LessOrEqual(t, 1, 1)
Less(t, 2, 1)

require := New(t)
require.GreaterOrEqual(1, 2)
require.GreaterOrEqual(1, 1)
require.Greater(1, 2)
require.LessOrEqual(2, 1)
require.LessOrEqual(1, 1)
require.Less(2, 1)
}
Loading