Merge pull request #234 from GunnarFarneback/revert_eol_attributes

Revert eol attributes
JuliaData · Jul 18, 2024 · 2bf3845 · 2bf3845
2 parents a440b9a + a6cc71e
commit 2bf3845
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 46 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/test/julia/issue132.jl b/test/julia/issue132.jl
@@ -1,10 +1,4 @@
-Any[
-    Dict{Any, Any}(
-        "creator" => "LAMMPS",
-        "timestep" => 0,
-    ),
-    Dict{Any, Any}(
-        "creator" => "LAMMPS",
-        "timestep" => 1,
-    ),
-]
+Dict{Any, Any}(
+    "creator" => "LAMMPS",
+    "timestep" => 0,
+)
diff --git a/test/julia/utf-8-bom.crlf.jl → test/julia/utf-8-bom.jl b/test/julia/utf-8-bom.crlf.jl → test/julia/utf-8-bom.jl
diff --git a/test/julia/windows_newlines.crlf.jl → test/julia/windows_newlines.jl b/test/julia/windows_newlines.crlf.jl → test/julia/windows_newlines.jl
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -33,19 +33,20 @@ const tests = [
     "spec-02-23",
     "empty_scalar",
     "no_trailing_newline",
-    "windows_newlines.crlf",
+    "windows_newlines",
     "escape_sequences",
     "issue15",
     "issue30",
     "issue36",
     "issue39",
+    "issue132",
     "cartesian",
     "ar1",
     "ar1_cartesian",
     "merge-01",
     "version-colon",
     "multi-constructor",
-    "utf-8-bom.crlf",
+    "utf-8-bom",
     "utf-32-be",
     "empty_tag",
     "empty_list_elem",
@@ -433,9 +434,11 @@ end
             timestep: 1
             ...
             """
+    input_crlf = replace(input, "\n" => "\r\n")
     expected = [Dict("creator" => "LAMMPS", "timestep" => 0),
                 Dict("creator" => "LAMMPS", "timestep" => 1)]
     @test collect(YAML.load_all(input)) == expected
+    @test collect(YAML.load_all(input_crlf)) == expected
 end
 
 # issue #148 - warn unknown directives
@@ -455,27 +458,6 @@ end
     @test YAML.load("---") === nothing
 end
 
-# issue #132
-@testset "issue #132" begin
-    docs_expected = evalfile(joinpath(testdir, "julia/issue132.jl"))
-    open(joinpath(testdir, "yaml/issue132.lf.yaml"), "r") do io
-        docs = YAML.load_all(io)
-        doc, i = iterate(docs)
-        @test isequal(doc, docs_expected[1])
-        doc, i = iterate(docs, i)
-        @test isequal(doc, docs_expected[2])
-        @test iterate(docs, i) === nothing
-    end
-    # open(joinpath(testdir, "yaml/issue132.crlf.yaml"), "r") do io
-    #     docs = YAML.load_all(io)
-    #     doc, i = iterate(docs)
-    #     @test isequal(doc, docs_expected[1])
-    #     doc, i = iterate(docs, i)
-    #     @test isequal(doc, docs_expected[2])
-    #     @test iterate(docs, i) === nothing
-    # end
-end
-
 # issue #226 - loadall stops on a null document
 @testset "issue #226" begin
     @test collect(YAML.load_all("null")) == [nothing]

diff --git a/test/yaml/issue132.lf.yaml b/test/yaml/issue132.lf.yaml
diff --git a/test/yaml/issue132.crlf.yaml → test/yaml/issue132.yaml b/test/yaml/issue132.crlf.yaml → test/yaml/issue132.yaml
diff --git a/test/yaml/utf-8-bom.crlf.yaml → test/yaml/utf-8-bom.yaml b/test/yaml/utf-8-bom.crlf.yaml → test/yaml/utf-8-bom.yaml
@@ -1,2 +1,2 @@
----
-attribute: 1
+---
+attribute: 1
diff --git a/test/yaml/windows_newlines.crlf.yaml → test/yaml/windows_newlines.yaml b/test/yaml/windows_newlines.crlf.yaml → test/yaml/windows_newlines.yaml
@@ -1 +1 @@
-hello:
+hello: