-
-
Notifications
You must be signed in to change notification settings - Fork 748
Fix: FileWithLineNum #845
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.
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
Open
nickxudotme
wants to merge
1
commit into
go-gorm:master
Choose a base branch
from
nickxudotme:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Fix: FileWithLineNum #845
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,46 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "context" | ||
| "fmt" | ||
| "log/slog" | ||
| "path/filepath" | ||
| "runtime" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "gorm.io/playground/models" | ||
| "github.com/stretchr/testify/require" | ||
| "gorm.io/gorm/logger" | ||
| "gorm.io/gorm/utils" | ||
| ) | ||
|
|
||
| // GORM_REPO: https://github.com/go-gorm/gorm.git | ||
| // GORM_BRANCH: master | ||
| // TEST_DRIVERS: sqlite, mysql, postgres, sqlserver | ||
|
|
||
| func TestGORM(t *testing.T) { | ||
| user := models.User{Name: "jinzhu"} | ||
|
|
||
| DB.Create(&user) | ||
| func where() string { | ||
| return utils.FileWithLineNum() | ||
| } | ||
|
|
||
| var result models.User | ||
| if err := DB.First(&result, user.ID).Error; err != nil { | ||
| t.Errorf("Failed, got error: %v", err) | ||
| } | ||
| func TestFileWithLineNumExternal(t *testing.T) { | ||
| _, file, line, _ := runtime.Caller(0) | ||
| expectedLine := line + 2 | ||
| got := where() | ||
| expectedSuffix := fmt.Sprintf("%s:%d", filepath.ToSlash(file), expectedLine) | ||
| require.Equal(t, expectedSuffix, got) | ||
| } | ||
|
|
||
| // func TestGORMGen(t *testing.T) { | ||
| // user := models.User{Name: "jinzhu2"} | ||
| // ctx := context.Background() | ||
| func TestSlogCallerSource(t *testing.T) { | ||
| buf := &bytes.Buffer{} | ||
| handler := slog.NewTextHandler(buf, &slog.HandlerOptions{AddSource: true}) | ||
| l := logger.NewSlogLogger(slog.New(handler), logger.Config{LogLevel: logger.Info}) | ||
|
|
||
| // gorm.G[models.User](DB).Create(ctx, &user) | ||
| l.Trace(context.Background(), time.Now(), func() (string, int64) { | ||
| return "select 1", 0 | ||
| }, nil) | ||
|
|
||
| // if u, err := gorm.G[models.User](DB).Where(g.User.ID.Eq(user.ID)).First(ctx); err != nil { | ||
| // t.Errorf("Failed, got error: %v", err) | ||
| // } else if u.Name != user.Name { | ||
| // t.Errorf("Failed, got user name: %v", u.Name) | ||
| // } | ||
| // } | ||
| out := buf.String() | ||
| require.NotContains(t, out, "gorm/logger/slog.go") | ||
| require.Contains(t, out, "playground/main_test.go") | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The variable is named 'expectedSuffix' but is used in an exact equality check on line 31. If the intent is to check for an exact match, consider renaming to 'expected' or 'expectedPath' for clarity. If the intent is to verify a suffix match, the assertion should use a suffix check instead of exact equality.