summaryrefslogtreecommitdiff
path: root/test/fixtures
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2023-03-05 01:59:16 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2023-03-05 01:59:16 +0000
commitd4c073a18adaed73973f34c6c39fc15664d9211d (patch)
tree44536af3af0284ab75eae79ef81a5e4452019269 /test/fixtures
parentAdd helper operator to perform vec3*mat4 and perspective divide (diff)
parentRemove old hard coded asset factory test, run entirely from XML load and rend... (diff)
downloadilt-d4c073a18adaed73973f34c6c39fc15664d9211d.tar.bz2
ilt-d4c073a18adaed73973f34c6c39fc15664d9211d.tar.xz
ilt-d4c073a18adaed73973f34c6c39fc15664d9211d.zip
Merge branch 'model-factory'
Diffstat (limited to 'test/fixtures')
-rw-r--r--test/fixtures/json/abs.json2
-rw-r--r--test/fixtures/json/bad/empty_abs.json2
-rw-r--r--test/fixtures/json/bad/implicit_abs.json2
-rw-r--r--test/fixtures/json/bad/late_type.json2
-rw-r--r--test/fixtures/json/bad/wrong_type.json2
-rw-r--r--test/fixtures/json/bad_type.json2
-rw-r--r--test/fixtures/json/conv.json4
-rw-r--r--test/fixtures/json/empty.json2
-rw-r--r--test/fixtures/json/implicit.json2
-rw-r--r--test/fixtures/json/load_object.json4
-rw-r--r--test/fixtures/json/nested.json8
-rw-r--r--test/fixtures/json/shared_ptr_diff.json10
-rw-r--r--test/fixtures/json/shared_ptr_diff_default.json6
-rw-r--r--test/fixtures/json/shared_ptr_null.json6
-rw-r--r--test/fixtures/json/shared_ptr_same.json6
-rw-r--r--test/fixtures/json/shared_ptr_wrong_type.json6
-rw-r--r--test/fixtures/json/vector_ptr.json2
-rw-r--r--test/fixtures/rgb.txt20
18 files changed, 56 insertions, 32 deletions
diff --git a/test/fixtures/json/abs.json b/test/fixtures/json/abs.json
index 8492df3..1b489ef 100644
--- a/test/fixtures/json/abs.json
+++ b/test/fixtures/json/abs.json
@@ -1,6 +1,6 @@
{
"aptr": {
- "@typeid": "SubObject",
+ "p.typeid": "SubObject",
"base": "set base",
"sub": "set sub"
}
diff --git a/test/fixtures/json/bad/empty_abs.json b/test/fixtures/json/bad/empty_abs.json
index 7d22001..5cc3598 100644
--- a/test/fixtures/json/bad/empty_abs.json
+++ b/test/fixtures/json/bad/empty_abs.json
@@ -1,5 +1,5 @@
{
- "@typeid": "TestObject",
+ "p.typeid": "TestObject",
"flt": 1,
"aptr": {},
"str": "after"
diff --git a/test/fixtures/json/bad/implicit_abs.json b/test/fixtures/json/bad/implicit_abs.json
index 573b323..bf81ee4 100644
--- a/test/fixtures/json/bad/implicit_abs.json
+++ b/test/fixtures/json/bad/implicit_abs.json
@@ -1,5 +1,5 @@
{
- "@typeid": "TestObject",
+ "p.typeid": "TestObject",
"flt": 1,
"aptr": {
"str": "trigger"
diff --git a/test/fixtures/json/bad/late_type.json b/test/fixtures/json/bad/late_type.json
index 171575a..d1d6f6c 100644
--- a/test/fixtures/json/bad/late_type.json
+++ b/test/fixtures/json/bad/late_type.json
@@ -1,4 +1,4 @@
{
"str": "trigger",
- "@typeid": "doesn't matter"
+ "p.typeid": "doesn't matter"
}
diff --git a/test/fixtures/json/bad/wrong_type.json b/test/fixtures/json/bad/wrong_type.json
index 777d791..4f19033 100644
--- a/test/fixtures/json/bad/wrong_type.json
+++ b/test/fixtures/json/bad/wrong_type.json
@@ -1,5 +1,5 @@
{
"ptr": {
- "@typeid": "SubObject"
+ "p.typeid": "SubObject"
}
}
diff --git a/test/fixtures/json/bad_type.json b/test/fixtures/json/bad_type.json
index f316bd1..70b9d1a 100644
--- a/test/fixtures/json/bad_type.json
+++ b/test/fixtures/json/bad_type.json
@@ -1,3 +1,3 @@
{
- "@typeid": "no such type"
+ "p.typeid": "no such type"
}
diff --git a/test/fixtures/json/conv.json b/test/fixtures/json/conv.json
new file mode 100644
index 0000000..1b690d5
--- /dev/null
+++ b/test/fixtures/json/conv.json
@@ -0,0 +1,4 @@
+{
+ "bl": "true",
+ "flt": "3.14"
+}
diff --git a/test/fixtures/json/empty.json b/test/fixtures/json/empty.json
index a9193a3..9575565 100644
--- a/test/fixtures/json/empty.json
+++ b/test/fixtures/json/empty.json
@@ -1,5 +1,5 @@
{
- "@typeid": "TestObject",
+ "p.typeid": "TestObject",
"flt": 1,
"ptr": {},
"str": "after"
diff --git a/test/fixtures/json/implicit.json b/test/fixtures/json/implicit.json
index 478cec6..6efc2ba 100644
--- a/test/fixtures/json/implicit.json
+++ b/test/fixtures/json/implicit.json
@@ -1,5 +1,5 @@
{
- "@typeid": "TestObject",
+ "p.typeid": "TestObject",
"flt": 1,
"ptr": {
"str": "trigger",
diff --git a/test/fixtures/json/load_object.json b/test/fixtures/json/load_object.json
index bb32298..c622885 100644
--- a/test/fixtures/json/load_object.json
+++ b/test/fixtures/json/load_object.json
@@ -1,5 +1,5 @@
{
- "@typeid": "TestObject",
+ "p.typeid": "TestObject",
"flt": 3.14,
"str": "Lovely string",
"bl": true,
@@ -48,7 +48,7 @@
[]
],
"ptr": {
- "@typeid": "TestObject",
+ "p.typeid": "TestObject",
"flt": 3.14,
"str": "Lovely string"
}
diff --git a/test/fixtures/json/nested.json b/test/fixtures/json/nested.json
index 98951fc..1e271e3 100644
--- a/test/fixtures/json/nested.json
+++ b/test/fixtures/json/nested.json
@@ -1,14 +1,14 @@
{
- "@typeid": "TestObject",
+ "p.typeid": "TestObject",
"flt": 1,
"ptr": {
- "@typeid": "TestObject",
+ "p.typeid": "TestObject",
"flt": 2,
"ptr": {
- "@typeid": "TestObject",
+ "p.typeid": "TestObject",
"flt": 3,
"ptr": {
- "@typeid": "TestObject",
+ "p.typeid": "TestObject",
"flt": 4,
"ptr": null,
"str": "four"
diff --git a/test/fixtures/json/shared_ptr_diff.json b/test/fixtures/json/shared_ptr_diff.json
index bb18e33..043be4a 100644
--- a/test/fixtures/json/shared_ptr_diff.json
+++ b/test/fixtures/json/shared_ptr_diff.json
@@ -1,11 +1,11 @@
{
- "@typeid": "SharedTestObject",
+ "p.typeid": "SharedTestObject",
"sptr": {
- "@typeid": "SubObject",
- "@id": "someid"
+ "p.typeid": "SubObject",
+ "p.id": "someid"
},
"ssptr": {
- "@typeid": "SubObject",
- "@id": "some other id"
+ "p.typeid": "SubObject",
+ "p.id": "some other id"
}
}
diff --git a/test/fixtures/json/shared_ptr_diff_default.json b/test/fixtures/json/shared_ptr_diff_default.json
index 69f5e85..c78bc12 100644
--- a/test/fixtures/json/shared_ptr_diff_default.json
+++ b/test/fixtures/json/shared_ptr_diff_default.json
@@ -1,8 +1,8 @@
{
- "@typeid": "SharedTestObject",
+ "p.typeid": "SharedTestObject",
"sptr": {
- "@typeid": "SubObject",
- "@id": "someid"
+ "p.typeid": "SubObject",
+ "p.id": "someid"
},
"ssptr": {}
}
diff --git a/test/fixtures/json/shared_ptr_null.json b/test/fixtures/json/shared_ptr_null.json
index c2461e8..8669bf2 100644
--- a/test/fixtures/json/shared_ptr_null.json
+++ b/test/fixtures/json/shared_ptr_null.json
@@ -1,8 +1,8 @@
{
- "@typeid": "SharedTestObject",
+ "p.typeid": "SharedTestObject",
"sptr": {
- "@typeid": "SubObject",
- "@id": "someid"
+ "p.typeid": "SubObject",
+ "p.id": "someid"
},
"ssptr": null
}
diff --git a/test/fixtures/json/shared_ptr_same.json b/test/fixtures/json/shared_ptr_same.json
index 4115493..2838e82 100644
--- a/test/fixtures/json/shared_ptr_same.json
+++ b/test/fixtures/json/shared_ptr_same.json
@@ -1,8 +1,8 @@
{
- "@typeid": "SharedTestObject",
+ "p.typeid": "SharedTestObject",
"sptr": {
- "@typeid": "SubObject",
- "@id": "someid"
+ "p.typeid": "SubObject",
+ "p.id": "someid"
},
"ssptr": "someid"
}
diff --git a/test/fixtures/json/shared_ptr_wrong_type.json b/test/fixtures/json/shared_ptr_wrong_type.json
index 68f7533..5d4e655 100644
--- a/test/fixtures/json/shared_ptr_wrong_type.json
+++ b/test/fixtures/json/shared_ptr_wrong_type.json
@@ -1,8 +1,8 @@
{
- "@typeid": "SharedTestObject",
+ "p.typeid": "SharedTestObject",
"sptr": {
- "@typeid": "SubObject2",
- "@id": "someid"
+ "p.typeid": "SubObject2",
+ "p.id": "someid"
},
"ssptr": "someid"
}
diff --git a/test/fixtures/json/vector_ptr.json b/test/fixtures/json/vector_ptr.json
index 8a07a2e..654bd6c 100644
--- a/test/fixtures/json/vector_ptr.json
+++ b/test/fixtures/json/vector_ptr.json
@@ -1,7 +1,7 @@
{
"vptr": [
{
- "@typeid": "TestObject",
+ "p.typeid": "TestObject",
"str": "type"
},
{
diff --git a/test/fixtures/rgb.txt b/test/fixtures/rgb.txt
new file mode 100644
index 0000000..2fab7af
--- /dev/null
+++ b/test/fixtures/rgb.txt
@@ -0,0 +1,20 @@
+127 255 0 chartreuse1
+190 190 190 x11 gray
+169 169 169 DarkGrey
+ 0 255 255 cyan
+173 173 173 gray68
+202 225 255 LightSteelBlue1
+ 72 209 204 medium turquoise
+224 238 224 honeydew2
+238 197 145 burlywood2
+205 133 63 peru
+ 28 28 28 gray11
+ 83 134 139 CadetBlue4
+139 76 57 salmon4
+238 232 170 pale goldenrod
+112 128 144 slate grey
+255 255 0 yellow1
+159 121 238 MediumPurple2
+190 190 190 gray
+ 66 66 66 grey26
+0 0 139 DarkBlue
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 16:55:01 +0000