Skip to content

Commit 14b60c5

Browse files
author
Viktor Pentyukhov
committed
Rewrited comments and testdata to eng
1 parent 4eb8ff5 commit 14b60c5

File tree

12 files changed

+45
-92
lines changed

12 files changed

+45
-92
lines changed

examples/authors/ydb/README.md

Lines changed: 0 additions & 47 deletions
This file was deleted.

examples/authors/ydb/db_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ func TestAuthors(t *testing.T) {
2323

2424
t.Run("InsertAuthors", func(t *testing.T) {
2525
authorsToInsert := []CreateOrUpdateAuthorParams{
26-
{P0: 1, P1: "Лев Толстой", P2: ptr("Русский писатель, автор \"Война и мир\"")},
27-
{P0: 2, P1: "Александр Пушкин", P2: ptr("Автор \"Евгения Онегина\"")},
28-
{P0: 3, P1: "Александр Пушкин", P2: ptr("Русский поэт, драматург и прозаик")},
29-
{P0: 4, P1: "Фёдор Достоевский", P2: ptr("Автор \"Преступление и наказание\"")},
30-
{P0: 5, P1: "Николай Гоголь", P2: ptr("Автор \"Мёртвые души\"")},
31-
{P0: 6, P1: "Антон Чехов", P2: nil},
32-
{P0: 7, P1: "Иван Тургенев", P2: ptr("Автор \"Отцы и дети\"")},
33-
{P0: 8, P1: "Михаил Лермонтов", P2: nil},
34-
{P0: 9, P1: "Даниил Хармс", P2: ptr("Абсурдист, писатель и поэт")},
35-
{P0: 10, P1: "Максим Горький", P2: ptr("Автор \"На дне\"")},
36-
{P0: 11, P1: "Владимир Маяковский", P2: nil},
37-
{P0: 12, P1: "Сергей Есенин", P2: ptr("Русский лирик")},
38-
{P0: 13, P1: "Борис Пастернак", P2: ptr("Автор \"Доктор Живаго\"")},
26+
{P0: 1, P1: "Leo Tolstoy", P2: ptr("Russian writer, author of \"War and Peace\"")},
27+
{P0: 2, P1: "Alexander Pushkin", P2: ptr("Author of \"Eugene Onegin\"")},
28+
{P0: 3, P1: "Alexander Pushkin", P2: ptr("Russian poet, playwright, and prose writer")},
29+
{P0: 4, P1: "Fyodor Dostoevsky", P2: ptr("Author of \"Crime and Punishment\"")},
30+
{P0: 5, P1: "Nikolai Gogol", P2: ptr("Author of \"Dead Souls\"")},
31+
{P0: 6, P1: "Anton Chekhov", P2: nil},
32+
{P0: 7, P1: "Ivan Turgenev", P2: ptr("Author of \"Fathers and Sons\"")},
33+
{P0: 8, P1: "Mikhail Lermontov", P2: nil},
34+
{P0: 9, P1: "Daniil Kharms", P2: ptr("Absurdist, writer and poet")},
35+
{P0: 10, P1: "Maxim Gorky", P2: ptr("Author of \"At the Bottom\"")},
36+
{P0: 11, P1: "Vladimir Mayakovsky", P2: nil},
37+
{P0: 12, P1: "Sergei Yesenin", P2: ptr("Russian lyric poet")},
38+
{P0: 13, P1: "Boris Pasternak", P2: ptr("Author of \"Doctor Zhivago\"")},
3939
}
4040

4141
for _, author := range authorsToInsert {
@@ -79,7 +79,7 @@ func TestAuthors(t *testing.T) {
7979
var i uint64
8080
for i = 1; i <= 13; i++ {
8181
if err := q.DeleteAuthor(ctx, i, query.WithIdempotent()); err != nil {
82-
t.Fatalf("failed to delete authors: %v", err)
82+
t.Fatalf("failed to delete author: %v", err)
8383
}
8484
}
8585
authors, err := q.ListAuthors(ctx)

internal/engine/ydb/catalog_tests/alter_group_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ func TestAlterGroup(t *testing.T) {
102102
t.Run(tc.stmt, func(t *testing.T) {
103103
stmts, err := p.Parse(strings.NewReader(tc.stmt))
104104
if err != nil {
105-
t.Fatalf("Ошибка парсинга запроса %q: %v", tc.stmt, err)
105+
t.Fatalf("Failed to parse query %q: %v", tc.stmt, err)
106106
}
107107
if len(stmts) == 0 {
108-
t.Fatalf("Запрос %q не распарсен", tc.stmt)
108+
t.Fatalf("Query %q was not parsed", tc.stmt)
109109
}
110110

111111
diff := cmp.Diff(tc.expected, &stmts[0],
@@ -115,7 +115,7 @@ func TestAlterGroup(t *testing.T) {
115115
cmpopts.IgnoreFields(ast.A_Const{}, "Location"),
116116
)
117117
if diff != "" {
118-
t.Errorf("Несовпадение AST (-ожидалось +получено):\n%s", diff)
118+
t.Errorf("AST mismatch for %q (-expected +got):\n%s", tc.stmt, diff)
119119
}
120120
})
121121
}

internal/engine/ydb/catalog_tests/alter_user_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ func TestAlterUser(t *testing.T) {
2828
Options: &ast.List{
2929
Items: []ast.Node{
3030
&ast.DefElem{
31-
Defname: strPtr("rename"),
32-
Arg: &ast.String{Str: "queen"},
31+
Defname: strPtr("rename"),
32+
Arg: &ast.String{Str: "queen"},
3333
Defaction: ast.DefElemAction(1),
3434
},
3535
},
@@ -133,10 +133,10 @@ func TestAlterUser(t *testing.T) {
133133
t.Run(tc.stmt, func(t *testing.T) {
134134
stmts, err := p.Parse(strings.NewReader(tc.stmt))
135135
if err != nil {
136-
t.Fatalf("Ошибка парсинга запроса %q: %v", tc.stmt, err)
136+
t.Fatalf("Failed to parse query %q: %v", tc.stmt, err)
137137
}
138138
if len(stmts) == 0 {
139-
t.Fatalf("Запрос %q не распарсен", tc.stmt)
139+
t.Fatalf("Query %q was not parsed", tc.stmt)
140140
}
141141

142142
diff := cmp.Diff(tc.expected, &stmts[0],
@@ -146,7 +146,7 @@ func TestAlterUser(t *testing.T) {
146146
cmpopts.IgnoreFields(ast.A_Const{}, "Location"),
147147
)
148148
if diff != "" {
149-
t.Errorf("Несовпадение AST (-ожидалось +получено):\n%s", diff)
149+
t.Errorf("AST mismatch for %q (-expected +got):\n%s", tc.stmt, diff)
150150
}
151151
})
152152
}

internal/engine/ydb/catalog_tests/create_group_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ func TestCreateGroup(t *testing.T) {
9090
t.Run(tc.stmt, func(t *testing.T) {
9191
stmts, err := p.Parse(strings.NewReader(tc.stmt))
9292
if err != nil {
93-
t.Fatalf("Ошибка парсинга запроса %q: %v", tc.stmt, err)
93+
t.Fatalf("Failed to parse query %q: %v", tc.stmt, err)
9494
}
9595
if len(stmts) == 0 {
96-
t.Fatalf("Запрос %q не распарсен", tc.stmt)
96+
t.Fatalf("Query %q was not parsed", tc.stmt)
9797
}
9898

9999
diff := cmp.Diff(tc.expected, &stmts[0],
@@ -103,7 +103,7 @@ func TestCreateGroup(t *testing.T) {
103103
cmpopts.IgnoreFields(ast.A_Const{}, "Location"),
104104
)
105105
if diff != "" {
106-
t.Errorf("Несовпадение AST (-ожидалось +получено):\n%s", diff)
106+
t.Errorf("AST mismatch for %q (-expected +got):\n%s", tc.stmt, diff)
107107
}
108108
})
109109
}

internal/engine/ydb/catalog_tests/create_user_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ func TestCreateUser(t *testing.T) {
110110
t.Run(tc.stmt, func(t *testing.T) {
111111
stmts, err := p.Parse(strings.NewReader(tc.stmt))
112112
if err != nil {
113-
t.Fatalf("Ошибка парсинга запроса %q: %v", tc.stmt, err)
113+
t.Fatalf("Failed to parse query %q: %v", tc.stmt, err)
114114
}
115115
if len(stmts) == 0 {
116-
t.Fatalf("Запрос %q не распарсен", tc.stmt)
116+
t.Fatalf("Query %q was not parsed", tc.stmt)
117117
}
118118

119119
diff := cmp.Diff(tc.expected, &stmts[0],
@@ -122,7 +122,7 @@ func TestCreateUser(t *testing.T) {
122122
cmpopts.IgnoreFields(ast.DefElem{}, "Location"),
123123
)
124124
if diff != "" {
125-
t.Errorf("Несовпадение AST (-ожидалось +получено):\n%s", diff)
125+
t.Errorf("AST mismatch for %q (-expected +got):\n%s", tc.stmt, diff)
126126
}
127127
})
128128
}

internal/engine/ydb/catalog_tests/delete_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,10 @@ func TestDelete(t *testing.T) {
178178
t.Run(tc.stmt, func(t *testing.T) {
179179
stmts, err := p.Parse(strings.NewReader(tc.stmt))
180180
if err != nil {
181-
t.Fatalf("Ошибка парсинга запроса %q: %v", tc.stmt, err)
181+
t.Fatalf("Failed to parse query %q: %v", tc.stmt, err)
182182
}
183183
if len(stmts) == 0 {
184-
t.Fatalf("Запрос %q не распарсен", tc.stmt)
184+
t.Fatalf("Query %q was not parsed", tc.stmt)
185185
}
186186

187187
diff := cmp.Diff(tc.expected, &stmts[0],
@@ -193,7 +193,7 @@ func TestDelete(t *testing.T) {
193193
cmpopts.IgnoreFields(ast.RangeVar{}, "Location"),
194194
)
195195
if diff != "" {
196-
t.Errorf("Несовпадение AST (-ожидалось +получено):\n%s", diff)
196+
t.Errorf("AST mismatch for %q (-expected +got):\n%s", tc.stmt, diff)
197197
}
198198
})
199199
}

internal/engine/ydb/catalog_tests/drop_role_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ func TestDropRole(t *testing.T) {
6969
t.Run(tc.stmt, func(t *testing.T) {
7070
stmts, err := p.Parse(strings.NewReader(tc.stmt))
7171
if err != nil {
72-
t.Fatalf("Error parsing %q: %v", tc.stmt, err)
72+
t.Fatalf("Failed to parse query %q: %v", tc.stmt, err)
7373
}
7474
if len(stmts) == 0 {
75-
t.Fatalf("Statement %q was not parsed", tc.stmt)
75+
t.Fatalf("Query %q was not parsed", tc.stmt)
7676
}
7777

7878
diff := cmp.Diff(tc.expected, &stmts[0],

internal/engine/ydb/catalog_tests/insert_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ func TestInsert(t *testing.T) {
120120
t.Run(tc.stmt, func(t *testing.T) {
121121
stmts, err := p.Parse(strings.NewReader(tc.stmt))
122122
if err != nil {
123-
t.Fatalf("Ошибка парсинга запроса %q: %v", tc.stmt, err)
123+
t.Fatalf("Failed to parse query %q: %v", tc.stmt, err)
124124
}
125125
if len(stmts) == 0 {
126-
t.Fatalf("Запрос %q не распарсен", tc.stmt)
126+
t.Fatalf("Query %q was not parsed", tc.stmt)
127127
}
128128

129129
diff := cmp.Diff(tc.expected, &stmts[0],
@@ -135,7 +135,7 @@ func TestInsert(t *testing.T) {
135135
cmpopts.IgnoreFields(ast.RangeVar{}, "Location"),
136136
)
137137
if diff != "" {
138-
t.Errorf("Несовпадение AST (-ожидалось +получено):\n%s", diff)
138+
t.Errorf("AST mismatch for %q (-expected +got):\n%s", tc.stmt, diff)
139139
}
140140
})
141141
}

internal/engine/ydb/catalog_tests/pragma_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ func TestPragma(t *testing.T) {
9898
t.Run(tc.stmt, func(t *testing.T) {
9999
stmts, err := p.Parse(strings.NewReader(tc.stmt))
100100
if err != nil {
101-
t.Fatalf("Ошибка парсинга запроса %q: %v", tc.stmt, err)
101+
t.Fatalf("Failed to parse query %q: %v", tc.stmt, err)
102102
}
103103
if len(stmts) == 0 {
104-
t.Fatalf("Запрос %q не распарсен", tc.stmt)
104+
t.Fatalf("Query %q was not parsed", tc.stmt)
105105
}
106106

107107
diff := cmp.Diff(tc.expected, &stmts[0],
@@ -111,7 +111,7 @@ func TestPragma(t *testing.T) {
111111
cmpopts.IgnoreFields(ast.A_Const{}, "Location"),
112112
)
113113
if diff != "" {
114-
t.Errorf("Несовпадение AST (-ожидалось +получено):\n%s", diff)
114+
t.Errorf("AST mismatch for %q (-expected +got):\n%s", tc.stmt, diff)
115115
}
116116
})
117117
}

0 commit comments

Comments
 (0)