Skip to content

Commit ba63075

Browse files
committed
Rename scope tests that were confused for map tests.
1 parent ff3f6c0 commit ba63075

37 files changed

+145
-145
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"@context": {
3+
"@vocab": "http://example/",
4+
"Foo": {"@context": {"bar": "http://example.org/bar"}}
5+
}
6+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"@context": {
3+
"@vocab": "http://example/",
4+
"Foo": {"@context": {"bar": "http://example.org/bar"}}
5+
},
6+
"a": {"@type": "Foo", "bar": "baz"}
7+
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"@context": {
33
"@vocab": "http://example/",
4-
"Foo": {"@context": {"bar": "http://example.org/bar"}}
4+
"typemap": {"@container": "@type"},
5+
"Type": {"@context": {"a": "http://example.org/a"}}
56
}
67
}
Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
[
2-
{
3-
"http://example/a": [{
4-
"@type": ["http://example/Foo"],
5-
"http://example.org/bar": [{"@value": "baz"}]
6-
}]
7-
}
8-
]
1+
[{
2+
"http://example/typemap": [
3+
{"http://example.org/a": [{"@value": "Object with @type <Type>"}], "@type": ["http://example/Type"]}
4+
]
5+
}]
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"@context": {
33
"@vocab": "http://example/",
4-
"Foo": {"@context": {"bar": "http://example.org/bar"}}
4+
"typemap": {"@container": "@type"},
5+
"Type": {"@context": {"a": "http://example.org/a"}}
56
},
6-
"a": {"@type": "Foo", "bar": "baz"}
7+
"typemap": {
8+
"Type": {"a": "Object with @type <Type>"}
9+
}
710
}

test-suite/tests/compact-m012-context.jsonld

Lines changed: 0 additions & 7 deletions
This file was deleted.

test-suite/tests/compact-m012-in.jsonld

Lines changed: 0 additions & 5 deletions
This file was deleted.

test-suite/tests/compact-m012-out.jsonld

Lines changed: 0 additions & 10 deletions
This file was deleted.

test-suite/tests/compact-manifest.jsonld

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -781,6 +781,51 @@
781781
"context": "compact-c005-context.jsonld",
782782
"expect": "compact-c005-out.jsonld",
783783
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
784+
}, {
785+
"@id": "#tc006",
786+
"@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
787+
"name": "adding new term",
788+
"purpose": "scoped context on @type",
789+
"input": "compact-c006-in.jsonld",
790+
"context": "compact-c006-context.jsonld",
791+
"expect": "compact-c006-out.jsonld",
792+
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
793+
}, {
794+
"@id": "#tc007",
795+
"@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
796+
"name": "overriding a term",
797+
"purpose": "scoped context on @type",
798+
"input": "compact-c007-in.jsonld",
799+
"context": "compact-c007-context.jsonld",
800+
"expect": "compact-c007-out.jsonld",
801+
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
802+
}, {
803+
"@id": "#tc008",
804+
"@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
805+
"name": "alias of @type",
806+
"purpose": "scoped context on @type",
807+
"input": "compact-c008-in.jsonld",
808+
"context": "compact-c008-context.jsonld",
809+
"expect": "compact-c008-out.jsonld",
810+
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
811+
}, {
812+
"@id": "#tc009",
813+
"@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
814+
"name": "deep @context affects nested nodes",
815+
"purpose": "scoped context on @type",
816+
"input": "compact-c009-in.jsonld",
817+
"context": "compact-c009-context.jsonld",
818+
"expect": "compact-c009-out.jsonld",
819+
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
820+
}, {
821+
"@id": "#tc010",
822+
"@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
823+
"name": "scoped context layers on intemediate contexts",
824+
"purpose": "scoped context on @type",
825+
"input": "compact-c010-in.jsonld",
826+
"context": "compact-c010-context.jsonld",
827+
"expect": "compact-c010-out.jsonld",
828+
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
784829
}, {
785830
"@id": "#tm001",
786831
"@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
@@ -838,57 +883,12 @@
838883
}, {
839884
"@id": "#tm007",
840885
"@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
841-
"name": "adding new term",
886+
"name": "When type is in a type map",
842887
"purpose": "scoped context on @type",
843888
"input": "compact-m007-in.jsonld",
844889
"context": "compact-m007-context.jsonld",
845890
"expect": "compact-m007-out.jsonld",
846891
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
847-
}, {
848-
"@id": "#tm008",
849-
"@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
850-
"name": "overriding a term",
851-
"purpose": "scoped context on @type",
852-
"input": "compact-m008-in.jsonld",
853-
"context": "compact-m008-context.jsonld",
854-
"expect": "compact-m008-out.jsonld",
855-
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
856-
}, {
857-
"@id": "#tm009",
858-
"@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
859-
"name": "alias of @type",
860-
"purpose": "scoped context on @type",
861-
"input": "compact-m009-in.jsonld",
862-
"context": "compact-m009-context.jsonld",
863-
"expect": "compact-m009-out.jsonld",
864-
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
865-
}, {
866-
"@id": "#tm010",
867-
"@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
868-
"name": "deep @context affects nested nodes",
869-
"purpose": "scoped context on @type",
870-
"input": "compact-m010-in.jsonld",
871-
"context": "compact-m010-context.jsonld",
872-
"expect": "compact-m010-out.jsonld",
873-
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
874-
}, {
875-
"@id": "#tm011",
876-
"@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
877-
"name": "scoped context layers on intemediate contexts",
878-
"purpose": "scoped context on @type",
879-
"input": "compact-m011-in.jsonld",
880-
"context": "compact-m011-context.jsonld",
881-
"expect": "compact-m011-out.jsonld",
882-
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
883-
}, {
884-
"@id": "#tm012",
885-
"@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
886-
"name": "When type is in a type map",
887-
"purpose": "scoped context on @type",
888-
"input": "compact-m012-in.jsonld",
889-
"context": "compact-m012-context.jsonld",
890-
"expect": "compact-m012-out.jsonld",
891-
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
892892
}, {
893893
"@id": "#tn001",
894894
"@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"@context": {
3+
"@vocab": "http://example/",
4+
"Foo": {"@context": {"bar": "http://example.org/bar"}}
5+
},
6+
"a": {"@type": "Foo", "bar": "baz"}
7+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[
2+
{
3+
"http://example/a": [{
4+
"@type": ["http://example/Foo"],
5+
"http://example.org/bar": [{"@value": "baz"}]
6+
}]
7+
}
8+
]
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[
2+
{
3+
"http://example/a": [{
4+
"@type": ["http://example/Foo"],
5+
"http://example.org/bar": [{"@value": "baz"}]
6+
}]
7+
}
8+
]
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"@context": {
33
"@vocab": "http://example/",
4-
"Foo": {"@context": {"bar": "http://example.org/bar"}}
4+
"typemap": {"@container": "@type"},
5+
"Type": {"@context": {"a": "http://example.org/a"}}
56
},
6-
"a": {"@type": "Foo", "bar": "baz"}
7+
"typemap": {
8+
"Type": {"a": "Object with @type <Type>"}
9+
}
710
}
Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
[
2-
{
3-
"http://example/a": [{
4-
"@type": ["http://example/Foo"],
5-
"http://example.org/bar": [{"@value": "baz"}]
6-
}]
7-
}
8-
]
1+
[{
2+
"http://example/typemap": [
3+
{"http://example.org/a": [{"@value": "Object with @type <Type>"}], "@type": ["http://example/Type"]}
4+
]
5+
}]

test-suite/tests/expand-m013-in.jsonld

Lines changed: 0 additions & 10 deletions
This file was deleted.

test-suite/tests/expand-m013-out.jsonld

Lines changed: 0 additions & 5 deletions
This file was deleted.

test-suite/tests/expand-manifest.jsonld

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,46 @@
677677
"input": "expand-c005-in.jsonld",
678678
"expect": "expand-c005-out.jsonld",
679679
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
680+
}, {
681+
"@id": "#tc006",
682+
"@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
683+
"name": "adding new term",
684+
"purpose": "scoped context on @type",
685+
"input": "expand-c006-in.jsonld",
686+
"expect": "expand-c006-out.jsonld",
687+
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
688+
}, {
689+
"@id": "#tc007",
690+
"@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
691+
"name": "overriding a term",
692+
"purpose": "scoped context on @type",
693+
"input": "expand-c007-in.jsonld",
694+
"expect": "expand-c007-out.jsonld",
695+
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
696+
}, {
697+
"@id": "#tc008",
698+
"@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
699+
"name": "alias of @type",
700+
"purpose": "scoped context on @type",
701+
"input": "expand-c008-in.jsonld",
702+
"expect": "expand-c008-out.jsonld",
703+
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
704+
}, {
705+
"@id": "#tc009",
706+
"@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
707+
"name": "deep @context affects nested nodes",
708+
"purpose": "scoped context on @type",
709+
"input": "expand-c009-in.jsonld",
710+
"expect": "expand-c009-out.jsonld",
711+
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
712+
}, {
713+
"@id": "#tc010",
714+
"@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
715+
"name": "scoped context layers on intemediate contexts",
716+
"purpose": "scoped context on @type",
717+
"input": "expand-c010-in.jsonld",
718+
"expect": "expand-c010-out.jsonld",
719+
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
680720
}, {
681721
"@id": "#tm001",
682722
"@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
@@ -736,51 +776,11 @@
736776
}, {
737777
"@id": "#tm008",
738778
"@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
739-
"name": "adding new term",
779+
"name": "When type is in a type map",
740780
"purpose": "scoped context on @type",
741781
"input": "expand-m008-in.jsonld",
742782
"expect": "expand-m008-out.jsonld",
743783
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
744-
}, {
745-
"@id": "#tm009",
746-
"@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
747-
"name": "overriding a term",
748-
"purpose": "scoped context on @type",
749-
"input": "expand-m009-in.jsonld",
750-
"expect": "expand-m009-out.jsonld",
751-
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
752-
}, {
753-
"@id": "#tm010",
754-
"@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
755-
"name": "alias of @type",
756-
"purpose": "scoped context on @type",
757-
"input": "expand-m010-in.jsonld",
758-
"expect": "expand-m010-out.jsonld",
759-
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
760-
}, {
761-
"@id": "#tm011",
762-
"@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
763-
"name": "deep @context affects nested nodes",
764-
"purpose": "scoped context on @type",
765-
"input": "expand-m011-in.jsonld",
766-
"expect": "expand-m011-out.jsonld",
767-
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
768-
}, {
769-
"@id": "#tm012",
770-
"@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
771-
"name": "scoped context layers on intemediate contexts",
772-
"purpose": "scoped context on @type",
773-
"input": "expand-m012-in.jsonld",
774-
"expect": "expand-m012-out.jsonld",
775-
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
776-
}, {
777-
"@id": "#tm013",
778-
"@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
779-
"name": "When type is in a type map",
780-
"purpose": "scoped context on @type",
781-
"input": "expand-m013-in.jsonld",
782-
"expect": "expand-m013-out.jsonld",
783-
"option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
784784
}, {
785785
"@id": "#tn001",
786786
"@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],

0 commit comments

Comments
 (0)