AkkomaGang/jsonld-ex
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

json_ld: fix disabled tests with double literals

Browse source
This commit is contained in:
Marcel Otto 2017-04-27 22:21:29 +02:00
parent 454ccdb313
commit e508c6d28a
3 changed files with 25 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/json/ld/decoder.ex
View file

@ -134,7 +134,8 @@ defmodule JSON.LD.Decoder do
end
true ->
end
RDF.Literal.new(value, %{datatype: datatype, language: item["@language"]})
RDF.Literal.new(value,
%{datatype: datatype, language: item["@language"], canonicalize: true})
end
defp list_to_rdf(list, node_id_map) do

24
test/suite/to_rdf_test.exs
View file

@ -9,10 +9,8 @@ defmodule JSON.LD.TestSuite.ToRdfTest do
end
test_cases("toRdf")
# TODO: finish literal implementation
# |> Enum.filter(fn %{"@id" => id} -> id in ~w[#t0022] end)
# TODO: JSON-LD Data Round Tripping
# |> Enum.filter(fn %{"@id" => id} -> id in ~w[#t0035] end)
# |> Enum.filter(fn %{"@id" => id} -> id in ~w[#t0071] end)
# |> Enum.filter(fn %{"@id" => id} -> id in ~w[#t0101] end)
# TODO: Ordering problems
# |> Enum.filter(fn %{"@id" => id} -> id in ~w[#t0118] end)
@ -20,8 +18,8 @@ defmodule JSON.LD.TestSuite.ToRdfTest do
# |> Enum.filter(fn %{"@id" => id} -> id in ~w[#t0069] end)
# |> Enum.filter(fn %{"@id" => id} -> id in ~w[#t0102] end)
|> Enum.each(fn %{"name" => name, "input" => input} = test_case ->
if input in ~w[toRdf-0022-in.jsonld toRdf-0035-in.jsonld toRdf-0071-in.jsonld toRdf-0101-in.jsonld] do
@tag skip: "finish literal implementation"
if input in ~w[toRdf-0035-in.jsonld toRdf-0101-in.jsonld] do
@tag skip: "finish JSON-LD Data Round Tripping"
end
if input in ~w[toRdf-0069-in.jsonld toRdf-0102-in.jsonld] do
@tag skip: """
@ -41,8 +39,15 @@ defmodule JSON.LD.TestSuite.ToRdfTest do
test "#{input}: #{name}",
%{data: %{"input" => input, "expect" => output} = test_case, base_iri: base_iri} do
# This requires a special handling, since the N-Quad ouput file is not valid, by using blank nodes as predicates
if input == "toRdf-0118-in.jsonld" do
assert JSON.LD.read_file!(file(input), test_case_options(test_case, base_iri)) ==
dataset = if input == "toRdf-0118-in.jsonld",
do: toRdf_0118_dataset(),
else: RDF.NQuads.read_file!(file(output))
assert JSON.LD.read_file!(file(input), test_case_options(test_case, base_iri)) == dataset
end
end)
def toRdf_0118_dataset do
RDF.Dataset.new([
{RDF.bnode("b0"), ~I<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>, RDF.bnode("b0")},
{RDF.bnode("b0"), RDF.bnode("b0"), "plain value"},
@ -54,10 +59,5 @@ defmodule JSON.LD.TestSuite.ToRdfTest do
{RDF.bnode("b1"), RDF.bnode("b0"), "term"},
{RDF.bnode("b2"), RDF.bnode("b0"), "termId"},
])
else
assert JSON.LD.read_file!(file(input), test_case_options(test_case, base_iri)) ==
RDF.NQuads.read_file!(file(output))
end
end
end)
end

5
test/unit/decoder_test.exs
View file

@ -601,13 +601,11 @@ defmodule JSON.LD.DecoderTest do
describe "advanced features" do
%{
# TODO:
"number syntax (decimal)" =>
{
~s({"@context": { "measure": "http://example/measure#"}, "measure:cups": 5.3}),
{RDF.bnode("b0"), ~I<http://example/measure#cups>, RDF.literal("5.3E0", datatype: XSD.double)}
},
# TODO:
"number syntax (double)" =>
{
~s({"@context": { "measure": "http://example/measure#"}, "measure:cups": 5.3e0}),
@ -660,9 +658,6 @@ defmodule JSON.LD.DecoderTest do
}
}
|> Enum.each(fn ({title, data}) ->
if title in ["number syntax (decimal)", "number syntax (double)"] do
@tag skip: "support float literals with exponential notation"
end
@tag data: data
test title, %{data: {input, output}} do
assert JSON.LD.Decoder.decode!(input) == RDF.Dataset.new(output)