Move assert from //internal/... to //utils/internal/... This puts all the non-proto-generated code under //utils, which is a bit more normal. Bug: 454371831 Change-Id: I3029330f5c07c52be3598d5922077e2c6a6a6964 Reviewed-on: https://chromium-review.googlesource.com/c/infra/turboci/proto/+/8096682 Reviewed-by: Tim Bain <tbain@google.com> Reviewed-by: Hector Tellez <htellez@google.com> Commit-Queue: Robbie Iannucci <iannucci@google.com>
diff --git a/go/utils/ids/from_string_test.go b/go/utils/ids/from_string_test.go index 21c9250..f7c7f31 100644 --- a/go/utils/ids/from_string_test.go +++ b/go/utils/ids/from_string_test.go
@@ -8,7 +8,7 @@ "fmt" "testing" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) func ExampleFromString() {
diff --git a/go/utils/ids/ids_test.go b/go/utils/ids/ids_test.go index afe7894..0cfeaea 100644 --- a/go/utils/ids/ids_test.go +++ b/go/utils/ids/ids_test.go
@@ -13,7 +13,7 @@ "google.golang.org/protobuf/types/known/timestamppb" idspb "go.chromium.org/turboci/proto/go/graph/ids/v1" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) func TestCheckErr(t *testing.T) {
diff --git a/go/utils/ids/strings_test.go b/go/utils/ids/strings_test.go index 20da6cb..f741667 100644 --- a/go/utils/ids/strings_test.go +++ b/go/utils/ids/strings_test.go
@@ -9,7 +9,7 @@ "time" idspb "go.chromium.org/turboci/proto/go/graph/ids/v1" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) func shouldWrap[I Identifier](ident I, err error) (*idspb.Identifier, error) {
diff --git a/go/utils/ids/wrap_test.go b/go/utils/ids/wrap_test.go index 712bab1..577f20c 100644 --- a/go/utils/ids/wrap_test.go +++ b/go/utils/ids/wrap_test.go
@@ -9,7 +9,7 @@ "time" idspb "go.chromium.org/turboci/proto/go/graph/ids/v1" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) func TestWrap(t *testing.T) {
diff --git a/go/internal/test/assert/assert.go b/go/utils/internal/test/assert/assert.go similarity index 100% rename from go/internal/test/assert/assert.go rename to go/utils/internal/test/assert/assert.go
diff --git a/go/utils/value/data_source_test.go b/go/utils/value/data_source_test.go index 3e142bb..36c53a2 100644 --- a/go/utils/value/data_source_test.go +++ b/go/utils/value/data_source_test.go
@@ -12,7 +12,7 @@ orchestratorpb "go.chromium.org/turboci/proto/go/graph/orchestrator/v1" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) func TestPickData(t *testing.T) {
diff --git a/go/utils/value/decode_test.go b/go/utils/value/decode_test.go index ace3481..c712f33 100644 --- a/go/utils/value/decode_test.go +++ b/go/utils/value/decode_test.go
@@ -17,7 +17,7 @@ orchestratorpb "go.chromium.org/turboci/proto/go/graph/orchestrator/v1" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) func TestDecode(t *testing.T) {
diff --git a/go/utils/value/digest_test.go b/go/utils/value/digest_test.go index d25ef3f..1513b83 100644 --- a/go/utils/value/digest_test.go +++ b/go/utils/value/digest_test.go
@@ -17,7 +17,7 @@ orchestratorpb "go.chromium.org/turboci/proto/go/graph/orchestrator/v1" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) func TestComputeDigest(t *testing.T) {
diff --git a/go/utils/value/filter_test.go b/go/utils/value/filter_test.go index 3ff419e..4947551 100644 --- a/go/utils/value/filter_test.go +++ b/go/utils/value/filter_test.go
@@ -13,7 +13,7 @@ orchestratorpb "go.chromium.org/turboci/proto/go/graph/orchestrator/v1" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) // Tests [filterState.filterRef] by virtue of Stage.Args.
diff --git a/go/utils/value/make_test.go b/go/utils/value/make_test.go index 716d9f2..46244f5 100644 --- a/go/utils/value/make_test.go +++ b/go/utils/value/make_test.go
@@ -13,7 +13,7 @@ orchestratorpb "go.chromium.org/turboci/proto/go/graph/orchestrator/v1" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) func TestInline(t *testing.T) {
diff --git a/go/utils/value/matches_test.go b/go/utils/value/matches_test.go index 3e26c18..5e83000 100644 --- a/go/utils/value/matches_test.go +++ b/go/utils/value/matches_test.go
@@ -14,7 +14,7 @@ orchestratorpb "go.chromium.org/turboci/proto/go/graph/orchestrator/v1" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) func TestWriteMatchesRef(t *testing.T) {
diff --git a/go/utils/value/omit_test.go b/go/utils/value/omit_test.go index 1d01674..5bc9c07 100644 --- a/go/utils/value/omit_test.go +++ b/go/utils/value/omit_test.go
@@ -13,7 +13,7 @@ orchestratorpb "go.chromium.org/turboci/proto/go/graph/orchestrator/v1" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) func TestOmit(t *testing.T) {
diff --git a/go/utils/value/range_test.go b/go/utils/value/range_test.go index fd6e5c7..7ee3e93 100644 --- a/go/utils/value/range_test.go +++ b/go/utils/value/range_test.go
@@ -13,7 +13,7 @@ orchestratorpb "go.chromium.org/turboci/proto/go/graph/orchestrator/v1" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) type NodeType string
diff --git a/go/utils/value/set_test.go b/go/utils/value/set_test.go index 338bac7..1af1ae7 100644 --- a/go/utils/value/set_test.go +++ b/go/utils/value/set_test.go
@@ -13,7 +13,7 @@ orchestratorpb "go.chromium.org/turboci/proto/go/graph/orchestrator/v1" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) func TestSetAddIn(t *testing.T) {
diff --git a/go/utils/value/slot_test.go b/go/utils/value/slot_test.go index 5926919..7ed357d 100644 --- a/go/utils/value/slot_test.go +++ b/go/utils/value/slot_test.go
@@ -9,7 +9,7 @@ "testing" orchestratorpb "go.chromium.org/turboci/proto/go/graph/orchestrator/v1" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) func TestValueSlotSet(t *testing.T) {
diff --git a/go/utils/value/sync_data_source_test.go b/go/utils/value/sync_data_source_test.go index 7a68d20..537eef5 100644 --- a/go/utils/value/sync_data_source_test.go +++ b/go/utils/value/sync_data_source_test.go
@@ -21,7 +21,7 @@ orchestratorpb "go.chromium.org/turboci/proto/go/graph/orchestrator/v1" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) func TestDataSource(t *testing.T) {
diff --git a/go/utils/value/transcode_test.go b/go/utils/value/transcode_test.go index 98306d5..6511239 100644 --- a/go/utils/value/transcode_test.go +++ b/go/utils/value/transcode_test.go
@@ -17,7 +17,7 @@ orchestratorpb "go.chromium.org/turboci/proto/go/graph/orchestrator/v1" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) func TestHasUnknownFields(t *testing.T) {
diff --git a/go/utils/value/type_info_test.go b/go/utils/value/type_info_test.go index 94d8923..da2815b 100644 --- a/go/utils/value/type_info_test.go +++ b/go/utils/value/type_info_test.go
@@ -14,7 +14,7 @@ commonpb "go.chromium.org/turboci/proto/go/data/common/v1" orchestratorpb "go.chromium.org/turboci/proto/go/graph/orchestrator/v1" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) func TestMakeTypeMatcher(t *testing.T) {
diff --git a/go/utils/value/url_test.go b/go/utils/value/url_test.go index 6da2a6c..a9fee21 100644 --- a/go/utils/value/url_test.go +++ b/go/utils/value/url_test.go
@@ -9,7 +9,7 @@ "google.golang.org/protobuf/types/known/emptypb" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) func TestURL(t *testing.T) {
diff --git a/go/utils/value/write_test.go b/go/utils/value/write_test.go index 76daa2a..cfcb90b 100644 --- a/go/utils/value/write_test.go +++ b/go/utils/value/write_test.go
@@ -13,7 +13,7 @@ orchestratorpb "go.chromium.org/turboci/proto/go/graph/orchestrator/v1" - "go.chromium.org/turboci/proto/go/internal/test/assert" + "go.chromium.org/turboci/proto/go/utils/internal/test/assert" ) func TestWrite(t *testing.T) {