diff --git a/c_glib/test/dataset/test-file-system-dataset.rb b/c_glib/test/dataset/test-file-system-dataset.rb index 96deedf6b4e..25c50ef9e4f 100644 --- a/c_glib/test/dataset/test-file-system-dataset.rb +++ b/c_glib/test/dataset/test-file-system-dataset.rb @@ -91,15 +91,15 @@ def create_dataset dataset = @factory.finish expected_table = build_table(count: [ - build_int32_array([1, 10]), - build_int32_array([2]), - build_int32_array([3]), - ], - label: [ - build_string_array(["a", "a"]), - build_string_array(["b"]), - build_string_array(["c"]), - ]) + build_int32_array([1, 10]), + build_int32_array([2]), + build_int32_array([3]), + ], + label: [ + build_string_array(["a", "a"]), + build_string_array(["b"]), + build_string_array(["c"]), + ]) return dataset, expected_table end diff --git a/c_glib/test/test-array.rb b/c_glib/test/test-array.rb index aa129a4749a..18a54a29631 100644 --- a/c_glib/test/test-array.rb +++ b/c_glib/test/test-array.rb @@ -118,8 +118,9 @@ def test_to_s sub_test_case("#view") do def test_valid + int32_array = build_int32_array([0, 1069547520, -1071644672, nil]) assert_equal(build_float_array([0.0, 1.5, -2.5, nil]), - build_int32_array([0, 1069547520, -1071644672, nil]).view(Arrow::FloatDataType.new)) + int32_array.view(Arrow::FloatDataType.new)) end def test_invalid diff --git a/c_glib/test/test-chunked-array-datum.rb b/c_glib/test/test-chunked-array-datum.rb index b82f3eed8a7..99e35fc57b0 100644 --- a/c_glib/test/test-chunked-array-datum.rb +++ b/c_glib/test/test-chunked-array-datum.rb @@ -49,7 +49,14 @@ def test_false end def test_to_string - assert_equal("ChunkedArray([\n" + " [\n" + " true,\n" + " false\n" + " ]\n" + "])", @datum.to_s) + assert_equal(<<-DATUM.chomp, @datum.to_s) +ChunkedArray([ + [ + true, + false + ] +]) + DATUM end def test_value diff --git a/c_glib/test/test-large-list-array.rb b/c_glib/test/test-large-list-array.rb index 2f7efab5a07..fa9c92ec87d 100644 --- a/c_glib/test/test-large-list-array.rb +++ b/c_glib/test/test-large-list-array.rb @@ -88,10 +88,10 @@ def test_value_length def test_value_offsets array = build_large_list_array(Arrow::Int8DataType.new, - [ - [-29, 29], - [-1, 0, 1], - ]) + [ + [-29, 29], + [-1, 0, 1], + ]) assert_equal([0, 2, 5], array.value_offsets) end diff --git a/c_glib/test/test-record-batch-datum.rb b/c_glib/test/test-record-batch-datum.rb index ec572e0f130..c50e50f9029 100644 --- a/c_glib/test/test-record-batch-datum.rb +++ b/c_glib/test/test-record-batch-datum.rb @@ -49,7 +49,13 @@ def test_false end def test_to_string - assert_equal("RecordBatch(visible: [\n" + " true,\n" + " false\n" + " ]\n" + ")", @datum.to_s) + assert_equal(<<-DATUM.chomp, @datum.to_s) +RecordBatch(visible: [ + true, + false + ] +) + DATUM end def test_value diff --git a/c_glib/test/test-record-batch.rb b/c_glib/test/test-record-batch.rb index 90f72c3d522..ff821ddf028 100644 --- a/c_glib/test/test-record-batch.rb +++ b/c_glib/test/test-record-batch.rb @@ -243,7 +243,8 @@ def setup end def test_valid - record_batch = Arrow::RecordBatch.new(@schema, @n_rows, [@uint8_value, @valid_name_value]) + columns = [@uint8_value, @valid_name_value] + record_batch = Arrow::RecordBatch.new(@schema, @n_rows, columns) assert do record_batch.validate_full @@ -253,7 +254,8 @@ def test_valid def test_invalid message = "[record-batch][validate-full]: Invalid: " + "In column 1: Invalid: Invalid UTF8 sequence at string index 0" - record_batch = Arrow::RecordBatch.new(@schema, @n_rows, [@uint8_value, @invalid_name_value]) + columns = [@uint8_value, @invalid_name_value] + record_batch = Arrow::RecordBatch.new(@schema, @n_rows, columns) assert_raise(Arrow::Error::Invalid.new(message)) do record_batch.validate_full diff --git a/c_glib/test/test-struct-field-options.rb b/c_glib/test/test-struct-field-options.rb index 4a614de6df6..f9b492fc4da 100644 --- a/c_glib/test/test-struct-field-options.rb +++ b/c_glib/test/test-struct-field-options.rb @@ -42,7 +42,8 @@ def test_set_dot_path end def test_set_invalid - message = "[struct-field-options][set-field-ref]: Invalid: Dot path '[foo]' contained an unterminated index" + message = "[struct-field-options][set-field-ref]: " + + "Invalid: Dot path '[foo]' contained an unterminated index" assert_raise(Arrow::Error::Invalid.new(message)) do @options.field_ref = "[foo]" end diff --git a/c_glib/test/test-uint-array-builder.rb b/c_glib/test/test-uint-array-builder.rb index 89621189b45..3aa3a1c488d 100644 --- a/c_glib/test/test-uint-array-builder.rb +++ b/c_glib/test/test-uint-array-builder.rb @@ -32,9 +32,9 @@ def test_uint16 values = [0, border_value] assert_equal(build_uint_array([*values, nil]), Arrow::UInt16Array.new(3, - Arrow::Buffer.new(values.pack("S*")), - Arrow::Buffer.new([0b011].pack("C*")), - -1)) + Arrow::Buffer.new(values.pack("S*")), + Arrow::Buffer.new([0b011].pack("C*")), + -1)) end def test_uint32 @@ -42,9 +42,9 @@ def test_uint32 values = [0, border_value] assert_equal(build_uint_array([*values, nil]), Arrow::UInt32Array.new(3, - Arrow::Buffer.new(values.pack("L*")), - Arrow::Buffer.new([0b011].pack("C*")), - -1)) + Arrow::Buffer.new(values.pack("L*")), + Arrow::Buffer.new([0b011].pack("C*")), + -1)) end def test_uint64 diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb index 2081d7ab9d9..11beb7707aa 100644 --- a/dev/release/01-prepare-test.rb +++ b/dev/release/01-prepare-test.rb @@ -264,7 +264,8 @@ def test_version_pre_tag "-

#{@previous_r_version} (release)

", "+

#{@release_version}.9000 (dev)

", "+

#{@release_version} (release)

", - "+

#{@previous_r_version}

", + "+

" + + "#{@previous_r_version}

", ] ], }, diff --git a/dev/release/post-12-bump-versions-test.rb b/dev/release/post-12-bump-versions-test.rb index 229dc7e1e1b..188e8d3e0fd 100644 --- a/dev/release/post-12-bump-versions-test.rb +++ b/dev/release/post-12-bump-versions-test.rb @@ -302,7 +302,8 @@ def test_version_post_tag "-

#{@previous_r_version} (release)

", "+

#{@release_version}.9000 (dev)

", "+

#{@release_version} (release)

", - "+

#{@previous_r_version}

", + "+

" + + "#{@previous_r_version}

", ], ], }, diff --git a/ruby/red-arrow/test/each-raw-record/test-map-array.rb b/ruby/red-arrow/test/each-raw-record/test-map-array.rb index f256543a853..2637086b209 100644 --- a/ruby/red-arrow/test/each-raw-record/test-map-array.rb +++ b/ruby/red-arrow/test/each-raw-record/test-map-array.rb @@ -269,9 +269,10 @@ def test_time64_micro def test_time64_nano unit = Arrow::TimeUnit::NANO + # 00:10:00.123456789 + value = Arrow::Time.new(unit, (60 * 10) * 1_000_000_000 + 123_456_789) records = [ - # 00:10:00.123456789 - [{"key1" => Arrow::Time.new(unit, (60 * 10) * 1_000_000_000 + 123_456_789), "key2" => nil}], + [{"key1" => value, "key2" => nil}], [nil], ] target = build({ diff --git a/ruby/red-arrow/test/raw-records/test-map-array.rb b/ruby/red-arrow/test/raw-records/test-map-array.rb index c9d3f06ee04..c7137c07f06 100644 --- a/ruby/red-arrow/test/raw-records/test-map-array.rb +++ b/ruby/red-arrow/test/raw-records/test-map-array.rb @@ -269,9 +269,10 @@ def test_time64_micro def test_time64_nano unit = Arrow::TimeUnit::NANO + # 00:10:00.123456789 + value = Arrow::Time.new(unit, (60 * 10) * 1_000_000_000 + 123_456_789) records = [ - # 00:10:00.123456789 - [{"key1" => Arrow::Time.new(unit, (60 * 10) * 1_000_000_000 + 123_456_789), "key2" => nil}], + [{"key1" => value, "key2" => nil}], [nil], ] target = build({ diff --git a/ruby/red-arrow/test/test-table.rb b/ruby/red-arrow/test/test-table.rb index a69e9261568..2117e60df9c 100644 --- a/ruby/red-arrow/test/test-table.rb +++ b/ruby/red-arrow/test/test-table.rb @@ -1521,10 +1521,10 @@ def setup ["key2_right", [100, 20]], ["string", ["1-100", "2-20"]], ]), - table1.join(table2, - ["key1", "key2"], - left_suffix: "_left", - right_suffix: "_right")) + table1.join(table2, + ["key1", "key2"], + left_suffix: "_left", + right_suffix: "_right")) end end end diff --git a/ruby/red-arrow/test/values/test-map-array.rb b/ruby/red-arrow/test/values/test-map-array.rb index 401c2f33aaa..54e7fecfcc6 100644 --- a/ruby/red-arrow/test/values/test-map-array.rb +++ b/ruby/red-arrow/test/values/test-map-array.rb @@ -261,9 +261,10 @@ def test_time64_micro def test_time64_nano unit = Arrow::TimeUnit::NANO + # 00:10:00.123456789 + value = Arrow::Time.new(unit, (60 * 10) * 1_000_000_000 + 123_456_789) values = [ - # 00:10:00.123456789 - {"key1" => Arrow::Time.new(unit, (60 * 10) * 1_000_000_000 + 123_456_789), "key2" => nil}, + {"key1" => value, "key2" => nil}, nil, ] target = build({