test: consolidate unquoted CR tests, remove duplication

Author: jsxs0

test/csv/parse/test_general.rb

@@ -156,29 +156,13 @@ def test_unquoted_cr_with_custom_row_separator
     assert_equal(expected, CSV.parse(data, row_sep: "|"))
   end
 
-  def test_unquoted_cr_with_crlf_row_separator
-    data = "field1\r,field2,field3\r\nrow2,data,here\r\n"
-    assert_raise(CSV::MalformedCSVError) do
-      CSV.parse(data, row_sep: "\r\n")
-    end
-  end
-
   def test_unquoted_cr_rejected_when_included_in_row_separator
     data = "field1,field\r2,field3\r\nrow2,data,here\r\n"
     assert_raise(CSV::MalformedCSVError) do
       CSV.parse(data, row_sep: "\r\n")
     end
   end
 
-  def test_liberal_parsing_with_unquoted_cr_and_custom_row_separator
-    data = "field1,field\rwith\rcr,field3|row2,data,here|"
-    expected = [
-      ["field1", "field\rwith\rcr", "field3"],
-      ["row2", "data", "here"]
-    ]
-    assert_equal(expected, CSV.parse(data, row_sep: "|", liberal_parsing: true))
-  end
-
   def test_quoted_cr_with_custom_row_separator
     data = "field1,\"field\rwith\rcr\",field3|row2,data,here|"
     expected = [

test/csv/parse/test_liberal_parsing.rb

@@ -80,6 +80,15 @@ def test_space_quote
                  CSV.parse(input, liberal_parsing: true))
   end
 
+  def test_unquoted_cr_with_custom_row_separator
+    data = "field1,field\rwith\rcr,field3|row2,data,here|"
+    expected = [
+      ["field1", "field\rwith\rcr", "field3"],
+      ["row2", "data", "here"]
+    ]
+    assert_equal(expected, CSV.parse(data, row_sep: "|", liberal_parsing: true))
+  end
+
   def test_double_quote_outside_quote
     data = %Q{a,""b""}
     error = assert_raise(CSV::MalformedCSVError) do