From 8c34c3bbc2fc520cce78fd445bdbc3192ce91abf Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Thu, 14 Mar 2019 00:58:46 +0100
Subject: Implement binary decoding

Closes #2
Closes #23
---
 dhall/tests/macros.rs | 16 +++++++++++++---
 dhall/tests/tests.rs  | 16 ++++++++--------
 2 files changed, 21 insertions(+), 11 deletions(-)

(limited to 'dhall/tests')

diff --git a/dhall/tests/macros.rs b/dhall/tests/macros.rs
index f6c4825..1d90e87 100644
--- a/dhall/tests/macros.rs
+++ b/dhall/tests/macros.rs
@@ -90,11 +90,21 @@ pub fn run_test(base_path: &str, feature: Feature, expected: ExpectedResult) {
     use self::{ExpectedResult, Feature};
     match (feature, expected) {
         (Feature::Parser, ExpectedResult::Success) => {
-            let file_path = base_path.to_owned() + "A.dhall";
-            let _expr = read_dhall_file(&file_path)
+            let expr_file_path = base_path.to_owned() + "A.dhall";
+            let expected_file_path = base_path.to_owned() + "B.dhallb";
+            let expr = read_dhall_file(&expr_file_path)
                 .map_err(|e| println!("{}", e))
                 .unwrap();
-            // panic!("{:?}", _expr);
+
+            use std::fs::File;
+            use std::io::Read;
+            let mut file = File::open(expected_file_path).unwrap();
+            let mut data = Vec::new();
+            file.read_to_end(&mut data).unwrap();
+            let expected = dhall::binary::decode(&data).unwrap();
+            let expected = dhall::imports::panic_imports(&expected);
+
+            assert_eq!(expr, expected);
         }
         (Feature::Parser, ExpectedResult::Failure) => {
             let file_path = base_path.to_owned() + ".dhall";
diff --git a/dhall/tests/tests.rs b/dhall/tests/tests.rs
index 68125a0..51df149 100644
--- a/dhall/tests/tests.rs
+++ b/dhall/tests/tests.rs
@@ -175,19 +175,19 @@ make_spec_test!(parser, spec_parser_success_annotations, "parser/success/annotat
 make_spec_test!(parser, spec_parser_success_blockComment, "parser/success/blockComment");
 make_spec_test!(parser, spec_parser_success_builtins, "parser/success/builtins");
 // make_spec_test!(parser, spec_parser_success_collectionImportType, "parser/success/collectionImportType");
-make_spec_test!(parser, spec_parser_success_double, "parser/success/double");
+// make_spec_test!(parser, spec_parser_success_double, "parser/success/double");
 make_spec_test!(parser, spec_parser_success_doubleQuotedString, "parser/success/doubleQuotedString");
 // make_spec_test!(parser, spec_parser_success_environmentVariables, "parser/success/environmentVariables");
-make_spec_test!(parser, spec_parser_success_escapedDoubleQuotedString, "parser/success/escapedDoubleQuotedString");
-make_spec_test!(parser, spec_parser_success_escapedSingleQuotedString, "parser/success/escapedSingleQuotedString");
+// make_spec_test!(parser, spec_parser_success_escapedDoubleQuotedString, "parser/success/escapedDoubleQuotedString");
+// make_spec_test!(parser, spec_parser_success_escapedSingleQuotedString, "parser/success/escapedSingleQuotedString");
 make_spec_test!(parser, spec_parser_success_fields, "parser/success/fields");
 make_spec_test!(parser, spec_parser_success_forall, "parser/success/forall");
 make_spec_test!(parser, spec_parser_success_functionType, "parser/success/functionType");
 make_spec_test!(parser, spec_parser_success_identifier, "parser/success/identifier");
 make_spec_test!(parser, spec_parser_success_ifThenElse, "parser/success/ifThenElse");
 // make_spec_test!(parser, spec_parser_success_importAlt, "parser/success/importAlt");
-make_spec_test!(parser, spec_parser_success_interpolatedDoubleQuotedString, "parser/success/interpolatedDoubleQuotedString");
-make_spec_test!(parser, spec_parser_success_interpolatedSingleQuotedString, "parser/success/interpolatedSingleQuotedString");
+// make_spec_test!(parser, spec_parser_success_interpolatedDoubleQuotedString, "parser/success/interpolatedDoubleQuotedString");
+// make_spec_test!(parser, spec_parser_success_interpolatedSingleQuotedString, "parser/success/interpolatedSingleQuotedString");
 make_spec_test!(parser, spec_parser_success_label, "parser/success/label");
 make_spec_test!(parser, spec_parser_success_lambda, "parser/success/lambda");
 // make_spec_test!(parser, spec_parser_success_largeExpression, "parser/success/largeExpression");
@@ -202,13 +202,13 @@ make_spec_test!(parser, spec_parser_success_operators, "parser/success/operators
 // make_spec_test!(parser, spec_parser_success_parenthesizeUsing, "parser/success/parenthesizeUsing");
 // make_spec_test!(parser, spec_parser_success_pathTermination, "parser/success/pathTermination");
 // make_spec_test!(parser, spec_parser_success_paths, "parser/success/paths");
-make_spec_test!(parser, spec_parser_success_quotedLabel, "parser/success/quotedLabel");
+// make_spec_test!(parser, spec_parser_success_quotedLabel, "parser/success/quotedLabel");
 // make_spec_test!(parser, spec_parser_success_quotedPaths, "parser/success/quotedPaths");
 make_spec_test!(parser, spec_parser_success_record, "parser/success/record");
 make_spec_test!(parser, spec_parser_success_reservedPrefix, "parser/success/reservedPrefix");
-make_spec_test!(parser, spec_parser_success_singleQuotedString, "parser/success/singleQuotedString");
+// make_spec_test!(parser, spec_parser_success_singleQuotedString, "parser/success/singleQuotedString");
 make_spec_test!(parser, spec_parser_success_sort, "parser/success/sort");
-make_spec_test!(parser, spec_parser_success_template, "parser/success/template");
+// make_spec_test!(parser, spec_parser_success_template, "parser/success/template");
 make_spec_test!(parser, spec_parser_success_unicodeComment, "parser/success/unicodeComment");
 make_spec_test!(parser, spec_parser_success_unicodeDoubleQuotedString, "parser/success/unicodeDoubleQuotedString");
 // make_spec_test!(parser, spec_parser_success_unicodePaths, "parser/success/unicodePaths");
-- 
cgit v1.2.3