rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust some first result orderings in integration assertions

Browse Source
This commit is contained in:
Nicolas Luck
2024-01-30 12:54:12 +01:00
parent 7de693eb23
commit 48b2379fe5
2 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/machine/lib_integration_test_commands.txt
View File

@@ -257,19 +257,19 @@ subject_class("Todo", C), property_resolve_language(C, "title", Language).
=====query =====query
subject_class("Todo", C), collection(C, Collection). subject_class("Todo", C), collection(C, Collection).
=====result =====result
[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"likedMessages"},{"C":"c","Collection":"messages"}] [{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
=====query =====query
subject_class("Todo", C), collection_adder(C, Collection, Adder). subject_class("Todo", C), collection_adder(C, Collection, Adder).
=====result =====result
[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"}] [{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
=====query =====query
subject_class("Todo", C), collection_remover(C, Collection, Remover). subject_class("Todo", C), collection_remover(C, Collection, Remover).
=====result =====result
[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}] [{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
=====query =====query
subject_class("Todo", C), collection_setter(C, Collection, Setter). subject_class("Todo", C), collection_setter(C, Collection, Setter).
=====result =====result
[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}] [{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
=====query =====query
subject_class("Todo", C), instance(C, "literal://string:construct%20test"). subject_class("Todo", C), instance(C, "literal://string:construct%20test").
=====result =====result
@@ -384,7 +384,7 @@ subject_class("Todo", C), instance(C, "literal://string:get%20proxy%20test").
=====query =====query
subject_class("Todo", C), property(C, Property). subject_class("Todo", C), property(C, Property).
=====result =====result
[{"C":"c","Property":"isLiked"},{"C":"c","Property":"state"},{"C":"c","Property":"title"}] [{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
=====query =====query
subject_class("Todo", C), property_resolve(C, "isLiked"). subject_class("Todo", C), property_resolve(C, "isLiked").
=====result =====result
@@ -412,19 +412,19 @@ subject_class("Todo", C), property_resolve_language(C, "title", Language).
=====query =====query
subject_class("Todo", C), collection(C, Collection). subject_class("Todo", C), collection(C, Collection).
=====result =====result
[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"likedMessages"},{"C":"c","Collection":"messages"}] [{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
=====query =====query
subject_class("Todo", C), collection_adder(C, Collection, Adder). subject_class("Todo", C), collection_adder(C, Collection, Adder).
=====result =====result
[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"}] [{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
=====query =====query
subject_class("Todo", C), collection_remover(C, Collection, Remover). subject_class("Todo", C), collection_remover(C, Collection, Remover).
=====result =====result
[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}] [{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
=====query =====query
subject_class("Todo", C), collection_setter(C, Collection, Setter). subject_class("Todo", C), collection_setter(C, Collection, Setter).
=====result =====result
[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}] [{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
=====query =====query
subject_class("Todo", C), instance(C, "literal://string:get%20proxy%20test"). subject_class("Todo", C), instance(C, "literal://string:get%20proxy%20test").
=====result =====result
@@ -436,7 +436,7 @@ subject_class("Todo", C), instance(C, "literal://string:get%20proxy%20test").
=====query =====query
subject_class("Todo", C), property(C, Property). subject_class("Todo", C), property(C, Property).
=====result =====result
[{"C":"c","Property":"isLiked"},{"C":"c","Property":"state"},{"C":"c","Property":"title"}] [{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
=====query =====query
subject_class("Todo", C), property_resolve(C, "isLiked"). subject_class("Todo", C), property_resolve(C, "isLiked").
=====result =====result
@@ -464,29 +464,29 @@ subject_class("Todo", C), property_resolve_language(C, "title", Language).
=====query =====query
subject_class("Todo", C), collection(C, Collection). subject_class("Todo", C), collection(C, Collection).
=====result =====result
[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"likedMessages"},{"C":"c","Collection":"messages"}] [{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
=====query =====query
subject_class("Todo", C), collection_adder(C, Collection, Adder). subject_class("Todo", C), collection_adder(C, Collection, Adder).
=====result =====result
[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"}] [{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
=====query =====query
subject_class("Todo", C), collection_remover(C, Collection, Remover). subject_class("Todo", C), collection_remover(C, Collection, Remover).
=====result =====result
[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}] [{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
=====query =====query
subject_class("Todo", C), collection_setter(C, Collection, Setter). subject_class("Todo", C), collection_setter(C, Collection, Setter).
=====result =====result
[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}] [{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
=====query =====query
subject_class("Todo", C), property_getter(C, "literal://string:get%20proxy%20test", "state", Value). subject_class("Todo", C), property_getter(C, "literal://string:get%20proxy%20test", "state", Value).
=====query
subject_class("Todo", C), property_getter(C, "literal://string:get%20proxy%20test", "title", Value).
=====result =====result
[{"C":"c","Value":"todo://ready"}] [{"C":"c","Value":"todo://ready"}]
=====query =====query
subject_class("Todo", C), constructor(C, Actions). subject_class("Todo", C), property_getter(C, "literal://string:get%20proxy%20test", "title", Value).
=====result =====result
false false
=====query
subject_class("Todo", C), constructor(C, Actions).
=====result =====result
[{"Actions":"[{action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]","C":"c"}] [{"Actions":"[{action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]","C":"c"}]
=====consult =====consult
@@ -589,15 +589,15 @@ collection_setter(c, "likedMessagess", '[{action: "collectionSetter", source: "t
=====query =====query
subject_class("Todo", C), instance(C, "literal://string:construct%20test"). subject_class("Todo", C), instance(C, "literal://string:construct%20test").
=====result =====result
[{"C":"c"},{"C":"c"}] [{"C":"c"}]
=====query =====query
subject_class("Todo", C), instance(C, "literal://string:construct%20test"). subject_class("Todo", C), instance(C, "literal://string:construct%20test").
=====result =====result
[{"C":"c"},{"C":"c"}] [{"C":"c"}]
=====query =====query
subject_class("Todo", C), property(C, Property). subject_class("Todo", C), property(C, Property).
=====result =====result
[{"C":"c","Property":"isLiked"},{"C":"c","Property":"state"},{"C":"c","Property":"title"}] [{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
=====query =====query
subject_class("Todo", C), property_resolve(C, "isLiked"). subject_class("Todo", C), property_resolve(C, "isLiked").
=====result =====result

8
src/machine/lib_machine.rs
View File

@@ -475,22 +475,18 @@ mod tests {
// Check if the block is a query // Check if the block is a query
if let Some(query) = block.strip_prefix("query") { if let Some(query) = block.strip_prefix("query") {
i += 1;
println!("query #{}: {}", i, query);
// Parse and execute the query // Parse and execute the query
let result = machine.run_query(query.to_string()); let result = machine.run_query(query.to_string());
// Print the result
println!("{:?}", result);
assert!(result.is_ok()); assert!(result.is_ok());
last_result = Some(result); last_result = Some(result);
} else if let Some(code) = block.strip_prefix("consult") { } else if let Some(code) = block.strip_prefix("consult") {
println!("load code: {}", code);
// Load the code into the machine // Load the code into the machine
machine.consult_module_string("facts", code.to_string()); machine.consult_module_string("facts", code.to_string());
} else if let Some(result) = block.strip_prefix("result") { } else if let Some(result) = block.strip_prefix("result") {
i += 1;
if let Some(Ok(ref last_result)) = last_result { if let Some(Ok(ref last_result)) = last_result {
println!("\n\n=====Result No. {}=======\n{}\n===============", i, last_result.to_string().trim());
assert_eq!(last_result.to_string().trim(), result.to_string().trim(),) assert_eq!(last_result.to_string().trim(), result.to_string().trim(),)
} }
} }