From 0ec5946758f0dab9e03970e4516319d3b3b19f2b Mon Sep 17 00:00:00 2001 From: PedroGGBM Date: Mon, 19 Feb 2024 19:17:15 +0000 Subject: [PATCH] changed main.rs cfg tests to xyz instead of bool (no current support) --- conjure_oxide/src/generate_custom.rs | 6 ++-- conjure_oxide/src/main.rs | 11 ++++-- .../01/bool-01.expected-parse.serialised.json | 13 ------- .../bool-01.expected-rewrite.serialised.json | 13 ------- .../basic/bool/01/bool-01.solution | 3 -- .../01/conjure-output/model000001.eprime-info | 6 ++-- .../conjure-output/model000001.eprime-infor | 2 +- .../02/bool-02.expected-parse.serialised.json | 21 ------------ .../bool-02.expected-rewrite.serialised.json | 21 ------------ .../03/bool-03.expected-parse.serialised.json | 34 ------------------- .../bool-03.expected-rewrite.serialised.json | 34 ------------------- 11 files changed, 15 insertions(+), 149 deletions(-) delete mode 100644 conjure_oxide/tests/integration/basic/bool/01/bool-01.expected-parse.serialised.json delete mode 100644 conjure_oxide/tests/integration/basic/bool/01/bool-01.expected-rewrite.serialised.json delete mode 100644 conjure_oxide/tests/integration/basic/bool/01/bool-01.solution delete mode 100644 conjure_oxide/tests/integration/basic/bool/02/bool-02.expected-parse.serialised.json delete mode 100644 conjure_oxide/tests/integration/basic/bool/02/bool-02.expected-rewrite.serialised.json delete mode 100644 conjure_oxide/tests/integration/basic/bool/03/bool-03.expected-parse.serialised.json delete mode 100644 conjure_oxide/tests/integration/basic/bool/03/bool-03.expected-rewrite.serialised.json diff --git a/conjure_oxide/src/generate_custom.rs b/conjure_oxide/src/generate_custom.rs index d110453557..a3670319e1 100644 --- a/conjure_oxide/src/generate_custom.rs +++ b/conjure_oxide/src/generate_custom.rs @@ -81,11 +81,11 @@ pub fn get_example_model(filename: &str) -> Result> { pub fn get_example_model_by_path(filepath: &str) -> Result> { let essence_path = PathBuf::from(filepath); - // Check if file exists and has the correct '.essence' extension - if !essence_path.is_file() || essence_path.extension().map_or(true, |e| e != "essence") { + // return error if file not found + if essence_path.as_os_str().is_empty() { return Err(Box::new(std::io::Error::new( std::io::ErrorKind::NotFound, - "ERROR: File not found or incorrect file type", + "ERROR: File not found in any subdirectory", ))); } diff --git a/conjure_oxide/src/main.rs b/conjure_oxide/src/main.rs index 7775260df0..3505cb856f 100644 --- a/conjure_oxide/src/main.rs +++ b/conjure_oxide/src/main.rs @@ -108,15 +108,14 @@ mod tests { #[test] fn test_get_example_model_success() { - let filename = "bool-01"; + let filename = "input"; get_example_model(filename).unwrap(); } #[test] fn test_get_example_model_by_filepath() { - let filepath = "tests/integration/basic/bool/01/bool-01.essence"; + let filepath = "tests/integration/xyz/input.essence"; get_example_model_by_path(filepath).unwrap(); - } #[test] @@ -124,4 +123,10 @@ mod tests { let filename = ""; get_example_model(filename).unwrap_err(); } + + #[test] + fn test_get_example_model_fail_empty_filepath() { + let filepath = ""; + get_example_model_by_path(filepath).unwrap_err(); + } } diff --git a/conjure_oxide/tests/integration/basic/bool/01/bool-01.expected-parse.serialised.json b/conjure_oxide/tests/integration/basic/bool/01/bool-01.expected-parse.serialised.json deleted file mode 100644 index 17ea903159..0000000000 --- a/conjure_oxide/tests/integration/basic/bool/01/bool-01.expected-parse.serialised.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "constraints": "Nothing", - "variables": [ - [ - { - "UserName": "x" - }, - { - "domain": "BoolDomain" - } - ] - ] -} \ No newline at end of file diff --git a/conjure_oxide/tests/integration/basic/bool/01/bool-01.expected-rewrite.serialised.json b/conjure_oxide/tests/integration/basic/bool/01/bool-01.expected-rewrite.serialised.json deleted file mode 100644 index 17ea903159..0000000000 --- a/conjure_oxide/tests/integration/basic/bool/01/bool-01.expected-rewrite.serialised.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "constraints": "Nothing", - "variables": [ - [ - { - "UserName": "x" - }, - { - "domain": "BoolDomain" - } - ] - ] -} \ No newline at end of file diff --git a/conjure_oxide/tests/integration/basic/bool/01/bool-01.solution b/conjure_oxide/tests/integration/basic/bool/01/bool-01.solution deleted file mode 100644 index 4b01b95e80..0000000000 --- a/conjure_oxide/tests/integration/basic/bool/01/bool-01.solution +++ /dev/null @@ -1,3 +0,0 @@ -language Essence 1.3 - -letting x be false diff --git a/conjure_oxide/tests/integration/basic/bool/01/conjure-output/model000001.eprime-info b/conjure_oxide/tests/integration/basic/bool/01/conjure-output/model000001.eprime-info index cd58ab9312..00341e7cd3 100644 --- a/conjure_oxide/tests/integration/basic/bool/01/conjure-output/model000001.eprime-info +++ b/conjure_oxide/tests/integration/basic/bool/01/conjure-output/model000001.eprime-info @@ -1,7 +1,7 @@ -SolverTotalTime:0.046887 +SolverTotalTime:0.021903 SavileRowClauseOut:0 -SolverSolveTime:0.04689 -SavileRowTotalTime:0.132 +SolverSolveTime:0.021904 +SavileRowTotalTime:0.067 SolverSatisfiable:1 SavileRowTimeOut:0 SolverNodes:2 diff --git a/conjure_oxide/tests/integration/basic/bool/01/conjure-output/model000001.eprime-infor b/conjure_oxide/tests/integration/basic/bool/01/conjure-output/model000001.eprime-infor index 96cb36e8a6..b981efbb20 100644 --- a/conjure_oxide/tests/integration/basic/bool/01/conjure-output/model000001.eprime-infor +++ b/conjure_oxide/tests/integration/basic/bool/01/conjure-output/model000001.eprime-infor @@ -1 +1 @@ -"conjure-output/model000001.eprime" "null" 1 0 1 0.04689 0.046887 0 2 0 1 0.132 NA 0 0 NA NA +"conjure-output/model000001.eprime" "null" 1 0 1 0.021904 0.021903 0 2 0 1 0.067 NA 0 0 NA NA diff --git a/conjure_oxide/tests/integration/basic/bool/02/bool-02.expected-parse.serialised.json b/conjure_oxide/tests/integration/basic/bool/02/bool-02.expected-parse.serialised.json deleted file mode 100644 index d5751f6143..0000000000 --- a/conjure_oxide/tests/integration/basic/bool/02/bool-02.expected-parse.serialised.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "constraints": "Nothing", - "variables": [ - [ - { - "UserName": "x" - }, - { - "domain": "BoolDomain" - } - ], - [ - { - "UserName": "y" - }, - { - "domain": "BoolDomain" - } - ] - ] -} \ No newline at end of file diff --git a/conjure_oxide/tests/integration/basic/bool/02/bool-02.expected-rewrite.serialised.json b/conjure_oxide/tests/integration/basic/bool/02/bool-02.expected-rewrite.serialised.json deleted file mode 100644 index d5751f6143..0000000000 --- a/conjure_oxide/tests/integration/basic/bool/02/bool-02.expected-rewrite.serialised.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "constraints": "Nothing", - "variables": [ - [ - { - "UserName": "x" - }, - { - "domain": "BoolDomain" - } - ], - [ - { - "UserName": "y" - }, - { - "domain": "BoolDomain" - } - ] - ] -} \ No newline at end of file diff --git a/conjure_oxide/tests/integration/basic/bool/03/bool-03.expected-parse.serialised.json b/conjure_oxide/tests/integration/basic/bool/03/bool-03.expected-parse.serialised.json deleted file mode 100644 index 911fd9477d..0000000000 --- a/conjure_oxide/tests/integration/basic/bool/03/bool-03.expected-parse.serialised.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "constraints": { - "Neq": [ - { - "Reference": { - "UserName": "x" - } - }, - { - "Reference": { - "UserName": "y" - } - } - ] - }, - "variables": [ - [ - { - "UserName": "x" - }, - { - "domain": "BoolDomain" - } - ], - [ - { - "UserName": "y" - }, - { - "domain": "BoolDomain" - } - ] - ] -} \ No newline at end of file diff --git a/conjure_oxide/tests/integration/basic/bool/03/bool-03.expected-rewrite.serialised.json b/conjure_oxide/tests/integration/basic/bool/03/bool-03.expected-rewrite.serialised.json deleted file mode 100644 index 911fd9477d..0000000000 --- a/conjure_oxide/tests/integration/basic/bool/03/bool-03.expected-rewrite.serialised.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "constraints": { - "Neq": [ - { - "Reference": { - "UserName": "x" - } - }, - { - "Reference": { - "UserName": "y" - } - } - ] - }, - "variables": [ - [ - { - "UserName": "x" - }, - { - "domain": "BoolDomain" - } - ], - [ - { - "UserName": "y" - }, - { - "domain": "BoolDomain" - } - ] - ] -} \ No newline at end of file