From 90cf780f232f3bb831df351664c4bc9816ffe85a Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Wed, 19 Aug 2026 17:19:02 +0200 Subject: [PATCH] fix: update uint128 test expectations and improve log formatting Corrects expected values for division and comparison operations in the uint128 test suite. Updates obilandmark to use log.Fatalf instead of log.Fatal, ensuring sequence ID, taxid, and taxonomy name are correctly interpolated in fatal error messages. --- Makefile | 8 ++++---- pkg/obifp/uint128_test.go | 6 +++--- pkg/obitools/obilandmark/obilandmark.go | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 467aec9..2a7817b 100644 --- a/Makefile +++ b/Makefile @@ -156,8 +156,8 @@ bump-version: jjnew: @echo "$(YELLOW)→ Creating a new commit...$(NC)" - @echo "$(BLUE)→ Documenting current commit...$(NC)" - @jj auto-describe + @echo "$(BLUE)→ Documenting undocumented commits...$(NC)" + @jj auto-doc @echo "$(BLUE)→ Done.$(NC)" @jj new @echo "$(GREEN)✓ New commit created$(NC)" @@ -171,8 +171,8 @@ jjpush: @echo "$(GREEN)✓ Release complete$(NC)" jjpush-describe: - @echo "$(BLUE)→ Documenting current commit...$(NC)" - @jj auto-describe + @echo "$(BLUE)→ Documenting undocumented commits...$(NC)" + @jj auto-doc jjpush-bump: @echo "$(BLUE)→ Creating new commit for version bump...$(NC)" diff --git a/pkg/obifp/uint128_test.go b/pkg/obifp/uint128_test.go index bc834ee..411416d 100644 --- a/pkg/obifp/uint128_test.go +++ b/pkg/obifp/uint128_test.go @@ -134,7 +134,7 @@ func TestUint128_QuoRem(t *testing.T) { u := Uint128{w1: 3, w0: 8} v := Uint128{w1: 0, w0: 4} q, r := u.QuoRem(v) - assert.Equal(t, Uint128{w1: 0, w0: 2}, q) + assert.Equal(t, Uint128{w1: 0, w0: 13835058055282163714}, q) assert.Equal(t, Uint128{w1: 0, w0: 0}, r) } @@ -150,7 +150,7 @@ func TestUint128_Div(t *testing.T) { u := Uint128{w1: 3, w0: 8} v := Uint128{w1: 0, w0: 4} q := u.Div(v) - assert.Equal(t, Uint128{w1: 0, w0: 2}, q) + assert.Equal(t, Uint128{w1: 0, w0: 13835058055282163714}, q) } func TestUint128_Div64(t *testing.T) { @@ -183,7 +183,7 @@ func TestUint128_Cmp(t *testing.T) { func TestUint128_Cmp64(t *testing.T) { u := Uint128{w1: 1, w0: 2} v := uint64(3) - assert.Equal(t, -1, u.Cmp64(v)) + assert.Equal(t, 1, u.Cmp64(v)) } func TestUint128_Equals(t *testing.T) { diff --git a/pkg/obitools/obilandmark/obilandmark.go b/pkg/obitools/obilandmark/obilandmark.go index 175ee0e..20e6db9 100644 --- a/pkg/obitools/obilandmark/obilandmark.go +++ b/pkg/obitools/obilandmark/obilandmark.go @@ -170,7 +170,7 @@ func CLISelectLandmarkSequences(iterator obiiter.IBioSequence) obiiter.IBioSeque for i, seq := range library { taxon := seq.Taxon(taxo) if taxon == nil { - log.Fatal("%s: Cannot identify taxid %s in %s", seq.Id(), seq.Taxid(), taxo.Name()) + log.Fatalf("%s: Cannot identify taxid %s in %s", seq.Id(), seq.Taxid(), taxo.Name()) } taxa.Set(i, taxon) }