|
8 | 8 | "time" |
9 | 9 |
|
10 | 10 | "github.com/google/go-cmp/cmp" |
| 11 | + "github.com/stretchr/testify/assert" |
| 12 | + "github.com/stretchr/testify/require" |
11 | 13 | "github.com/twmb/franz-go/pkg/kadm" |
12 | 14 | "github.com/twmb/franz-go/pkg/kerr" |
13 | 15 | "k8s.io/apimachinery/pkg/util/json" |
@@ -504,76 +506,64 @@ func TestList(t *testing.T) { |
504 | 506 | // --- Unit tests for broker-level error propagation (no real Kafka needed) --- |
505 | 507 |
|
506 | 508 | func TestCreateBrokerError(t *testing.T) { |
| 509 | + t.Parallel() |
507 | 510 | cl := &fakeACLAdmin{ |
508 | 511 | createResults: kadm.CreateACLsResults{ |
509 | 512 | {Principal: "User:alice", Err: kerr.ClusterAuthorizationFailed}, |
510 | 513 | }, |
511 | 514 | } |
512 | 515 | err := Create(context.Background(), cl, &baseACL) |
513 | | - if err == nil { |
514 | | - t.Fatal("Create() expected error for broker-level Err, got nil") |
515 | | - } |
| 516 | + require.Error(t, err) |
516 | 517 | } |
517 | 518 |
|
518 | 519 | func TestCreateEmptyResponse(t *testing.T) { |
| 520 | + t.Parallel() |
519 | 521 | cl := &fakeACLAdmin{createResults: kadm.CreateACLsResults{}} |
520 | 522 | err := Create(context.Background(), cl, &baseACL) |
521 | | - if err == nil { |
522 | | - t.Fatal("Create() expected error for empty response, got nil") |
523 | | - } |
| 523 | + require.Error(t, err) |
524 | 524 | } |
525 | 525 |
|
526 | 526 | func TestListBrokerError(t *testing.T) { |
| 527 | + t.Parallel() |
527 | 528 | cl := &fakeACLAdmin{ |
528 | 529 | describeResults: kadm.DescribeACLsResults{ |
529 | 530 | {Err: kerr.ClusterAuthorizationFailed}, |
530 | 531 | }, |
531 | 532 | } |
532 | 533 | got, err := List(context.Background(), cl, &baseACL) |
533 | | - if err == nil { |
534 | | - t.Fatal("List() expected error for broker-level Err, got nil") |
535 | | - } |
536 | | - if got != nil { |
537 | | - t.Errorf("List() expected nil result on error, got %v", got) |
538 | | - } |
| 534 | + require.Error(t, err) |
| 535 | + assert.Nil(t, got) |
539 | 536 | } |
540 | 537 |
|
541 | 538 | func TestListNotFound(t *testing.T) { |
| 539 | + t.Parallel() |
542 | 540 | cl := &fakeACLAdmin{ |
543 | 541 | describeResults: kadm.DescribeACLsResults{ |
544 | 542 | {Described: kadm.DescribedACLs{}}, |
545 | 543 | }, |
546 | 544 | } |
547 | 545 | got, err := List(context.Background(), cl, &baseACL) |
548 | | - if err != nil { |
549 | | - t.Fatalf("List() unexpected error: %v", err) |
550 | | - } |
551 | | - if got != nil { |
552 | | - t.Errorf("List() expected nil for no matching ACL, got %v", got) |
553 | | - } |
| 546 | + require.NoError(t, err) |
| 547 | + assert.Nil(t, got) |
554 | 548 | } |
555 | 549 |
|
556 | 550 | func TestListEmptyResponse(t *testing.T) { |
| 551 | + t.Parallel() |
557 | 552 | cl := &fakeACLAdmin{describeResults: kadm.DescribeACLsResults{}} |
558 | 553 | got, err := List(context.Background(), cl, &baseACL) |
559 | | - if err != nil { |
560 | | - t.Fatalf("List() unexpected error: %v", err) |
561 | | - } |
562 | | - if got != nil { |
563 | | - t.Errorf("List() expected nil for empty response, got %v", got) |
564 | | - } |
| 554 | + require.NoError(t, err) |
| 555 | + assert.Nil(t, got) |
565 | 556 | } |
566 | 557 |
|
567 | 558 | func TestDeleteBrokerError(t *testing.T) { |
| 559 | + t.Parallel() |
568 | 560 | cl := &fakeACLAdmin{ |
569 | 561 | deleteResults: kadm.DeleteACLsResults{ |
570 | 562 | {Err: kerr.ClusterAuthorizationFailed}, |
571 | 563 | }, |
572 | 564 | } |
573 | 565 | err := Delete(context.Background(), cl, &baseACL) |
574 | | - if err == nil { |
575 | | - t.Fatal("Delete() expected error for broker-level Err, got nil") |
576 | | - } |
| 566 | + require.Error(t, err) |
577 | 567 | } |
578 | 568 |
|
579 | 569 | // TestListAtProviderNotFound verifies that List returns nil when the ACL does not exist. |
|
0 commit comments