Skip to content

Commit 32158a1

Browse files
committed
GH-45782: [GLib] Check only the first line for validation error
Validation error message may include error context when we build Apache Arrow C++ with `ARROW_EXTRA_ERROR_CONTEXT=ON`. We can check only the first line to make tests more stable for build options.
1 parent 2fe4da0 commit 32158a1

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

c_glib/test/test-array.rb

+6-2
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,11 @@ def test_valid
198198
def test_invalid
199199
message = "[array][validate]: Invalid: Array length is negative"
200200
array = Arrow::Int8Array.new(-1, Arrow::Buffer.new(""), Arrow::Buffer.new(""), -1)
201-
assert_raise(Arrow::Error::Invalid.new(message)) do
201+
error = assert_raise(Arrow::Error::Invalid) do
202202
array.validate
203203
end
204+
assert_equal(message,
205+
error.message.lines.first.chomp)
204206
end
205207
end
206208

@@ -224,9 +226,11 @@ def test_invalid
224226
Arrow::Buffer.new([0b01].pack("C*")),
225227
-1)
226228

227-
assert_raise(Arrow::Error::Invalid.new(message)) do
229+
error = assert_raise(Arrow::Error::Invalid) do
228230
array.validate_full
229231
end
232+
assert_equal(message,
233+
error.message.lines.first.chomp)
230234
end
231235
end
232236
end

c_glib/test/test-record-batch.rb

+6-2
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,11 @@ def test_invalid
216216
n_rows = @id_value.length + 1 # incorrect number of rows
217217

218218
record_batch = Arrow::RecordBatch.new(@schema, n_rows, @values)
219-
assert_raise(Arrow::Error::Invalid.new(message)) do
219+
error = assert_raise(Arrow::Error::Invalid) do
220220
record_batch.validate
221221
end
222+
assert_equal(message,
223+
error.message.lines.first.chomp)
222224
end
223225
end
224226

@@ -257,9 +259,11 @@ def test_invalid
257259
columns = [@uint8_value, @invalid_name_value]
258260
record_batch = Arrow::RecordBatch.new(@schema, @n_rows, columns)
259261

260-
assert_raise(Arrow::Error::Invalid.new(message)) do
262+
error = assert_raise(Arrow::Error::Invalid) do
261263
record_batch.validate_full
262264
end
265+
assert_equal(message,
266+
error.message.lines.first.chomp)
263267
end
264268
end
265269
end

c_glib/test/test-table.rb

+6-2
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,11 @@ def test_invalid
268268

269269
invalid_values = [@id_array, build_string_array(["abc", "def"])]
270270
table = Arrow::Table.new(@schema, invalid_values)
271-
assert_raise(Arrow::Error::Invalid.new(message)) do
271+
error = assert_raise(Arrow::Error::Invalid) do
272272
table.validate
273273
end
274+
assert_equal(message,
275+
error.message.lines.first.chomp)
274276
end
275277
end
276278

@@ -308,9 +310,11 @@ def test_invalid
308310
columns = [@id_values, @invalid_name_values]
309311
table = Arrow::Table.new(@schema, columns)
310312

311-
assert_raise(Arrow::Error::Invalid.new(message)) do
313+
error = assert_raise(Arrow::Error::Invalid) do
312314
table.validate_full
313315
end
316+
assert_equal(message,
317+
error.message.lines.first.chomp)
314318
end
315319
end
316320

0 commit comments

Comments
 (0)