From 4e81733eed6aaeafd9f34d25d15d15bfe5f61973 Mon Sep 17 00:00:00 2001 From: Jordan Santell Date: Sat, 11 Feb 2017 12:06:09 -0800 Subject: [PATCH] Change expecteddatoms and expectedtransaction to their kebab-case counterparts, for valid EDN style. Fixes #270. r=nalexander (#287) --- db/src/db.rs | 8 +++----- tx/fixtures/test_add.edn | 20 ++++++++++---------- tx/fixtures/test_retract.edn | 20 ++++++++++---------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/db/src/db.rs b/db/src/db.rs index 740b129d..11afd6a3 100644 --- a/db/src/db.rs +++ b/db/src/db.rs @@ -865,10 +865,8 @@ mod tests { let transaction = transaction.as_map().unwrap(); let label: edn::Value = transaction.get(&edn::Value::NamespacedKeyword(symbols::NamespacedKeyword::new("test", "label"))).unwrap().clone(); let assertions: edn::Value = transaction.get(&edn::Value::NamespacedKeyword(symbols::NamespacedKeyword::new("test", "assertions"))).unwrap().clone(); - // TODO: use hyphenated keywords, like :test/expected-transaction -- when the EDN parser - // supports them! - let expected_transaction: Option<&edn::Value> = transaction.get(&edn::Value::NamespacedKeyword(symbols::NamespacedKeyword::new("test", "expectedtransaction"))); - let expected_datoms: Option<&edn::Value> = transaction.get(&edn::Value::NamespacedKeyword(symbols::NamespacedKeyword::new("test", "expecteddatoms"))); + let expected_transaction: Option<&edn::Value> = transaction.get(&edn::Value::NamespacedKeyword(symbols::NamespacedKeyword::new("test", "expected-transaction"))); + let expected_datoms: Option<&edn::Value> = transaction.get(&edn::Value::NamespacedKeyword(symbols::NamespacedKeyword::new("test", "expected-datoms"))); let entities: Vec<_> = mentat_tx_parser::Tx::parse(&[assertions][..]).unwrap(); db.transact_internal(&conn, &entities[..], bootstrap::TX0 + index + 1).unwrap(); @@ -890,7 +888,7 @@ mod tests { // Don't allow empty tests. This will need to change if we allow transacting schema // fragments in a preamble, but for now it might catch malformed tests. assert_ne!((expected_transaction, expected_datoms), (None, None), - "Transaction test must include at least one of :test/expectedtransaction or :test/expecteddatoms"); + "Transaction test must include at least one of :test/expected-transaction or :test/expected-datoms"); } } diff --git a/tx/fixtures/test_add.edn b/tx/fixtures/test_add.edn index 0265aa11..6c89c09d 100644 --- a/tx/fixtures/test_add.edn +++ b/tx/fixtures/test_add.edn @@ -2,11 +2,11 @@ :test/assertions [[:db/add 100 :db/ident :keyword/value1] [:db/add 101 :db/ident :keyword/value2]] - :test/expectedtransaction + :test/expected-transaction #{[100 :db/ident :keyword/value1 ?tx1 true] [101 :db/ident :keyword/value2 ?tx1 true] [?tx1 :db/txInstant ?ms1 ?tx1 true]} - :test/expecteddatoms + :test/expected-datoms #{[100 :db/ident :keyword/value1] [101 :db/ident :keyword/value2]}} @@ -14,11 +14,11 @@ :test/assertions [[:db/add 200 :db.schema/attribute 100] [:db/add 200 :db.schema/attribute 101]] - :test/expectedtransaction + :test/expected-transaction #{[200 :db.schema/attribute 100 ?tx2 true] [200 :db.schema/attribute 101 ?tx2 true] [?tx2 :db/txInstant ?ms2 ?tx2 true]} - :test/expecteddatoms + :test/expected-datoms #{[100 :db/ident :keyword/value1] [101 :db/ident :keyword/value2] [200 :db.schema/attribute 100] @@ -28,13 +28,13 @@ :test/assertions [[:db/add 100 :db/ident :keyword/value11] [:db/add 101 :db/ident :keyword/value22]] - :test/expectedtransaction + :test/expected-transaction #{[100 :db/ident :keyword/value1 ?tx3 false] [100 :db/ident :keyword/value11 ?tx3 true] [101 :db/ident :keyword/value2 ?tx3 false] [101 :db/ident :keyword/value22 ?tx3 true] [?tx3 :db/txInstant ?ms3 ?tx3 true]} - :test/expecteddatoms + :test/expected-datoms #{[100 :db/ident :keyword/value11] [101 :db/ident :keyword/value22] [200 :db.schema/attribute 100] @@ -44,9 +44,9 @@ :test/assertions [[:db/add 100 :db/ident :keyword/value11] [:db/add 101 :db/ident :keyword/value22]] - :test/expectedtransaction + :test/expected-transaction #{[?tx4 :db/txInstant ?ms4 ?tx4 true]} - :test/expecteddatoms + :test/expected-datoms #{[100 :db/ident :keyword/value11] [101 :db/ident :keyword/value22] [200 :db.schema/attribute 100] @@ -56,9 +56,9 @@ :test/assertions [[:db/add 200 :db.schema/attribute 100] [:db/add 200 :db.schema/attribute 101]] - :test/expectedtransaction + :test/expected-transaction #{[?tx5 :db/txInstant ?ms5 ?tx5 true]} - :test/expecteddatoms + :test/expected-datoms #{[100 :db/ident :keyword/value11] [101 :db/ident :keyword/value22] [200 :db.schema/attribute 100] diff --git a/tx/fixtures/test_retract.edn b/tx/fixtures/test_retract.edn index 22a54f69..aef97032 100644 --- a/tx/fixtures/test_retract.edn +++ b/tx/fixtures/test_retract.edn @@ -2,11 +2,11 @@ :test/assertions [[:db/add 100 :db/ident :keyword/value1] [:db/add 101 :db/ident :keyword/value2]] - :test/expectedtransaction + :test/expected-transaction #{[100 :db/ident :keyword/value1 ?tx1 true] [101 :db/ident :keyword/value2 ?tx1 true] [?tx1 :db/txInstant ?ms1 ?tx1 true]} - :test/expecteddatoms + :test/expected-datoms #{[100 :db/ident :keyword/value1] [101 :db/ident :keyword/value2]}} @@ -14,11 +14,11 @@ :test/assertions [[:db/add 200 :db.schema/attribute 100] [:db/add 200 :db.schema/attribute 101]] - :test/expectedtransaction + :test/expected-transaction #{[200 :db.schema/attribute 100 ?tx2 true] [200 :db.schema/attribute 101 ?tx2 true] [?tx2 :db/txInstant ?ms2 ?tx2 true]} - :test/expecteddatoms + :test/expected-datoms #{[100 :db/ident :keyword/value1] [101 :db/ident :keyword/value2] [200 :db.schema/attribute 100] @@ -27,10 +27,10 @@ {:test/label ":db.cardinality/one, retract" :test/assertions [[:db/retract 100 :db/ident :keyword/value1]] - :test/expectedtransaction + :test/expected-transaction #{[100 :db/ident :keyword/value1 ?tx3 false] [?tx3 :db/txInstant ?ms3 ?tx3 true]} - :test/expecteddatoms + :test/expected-datoms #{[101 :db/ident :keyword/value2] [200 :db.schema/attribute 100] [200 :db.schema/attribute 101]}} @@ -38,10 +38,10 @@ {:test/label ":db.cardinality/many, retract" :test/assertions [[:db/retract 200 :db.schema/attribute 100]] - :test/expectedtransaction + :test/expected-transaction #{[200 :db.schema/attribute 100 ?tx4 false] [?tx4 :db/txInstant ?ms4 ?tx4 true]} - :test/expecteddatoms + :test/expected-datoms #{[101 :db/ident :keyword/value2] [200 :db.schema/attribute 101]} } @@ -50,9 +50,9 @@ :test/assertions [[:db/retract 100 :db/ident :keyword/value1] [:db/retract 200 :db.schema/attribute 100]] - :test/expectedtransaction + :test/expected-transaction #{[?tx5 :db/txInstant ?ms5 ?tx5 true]} - :test/expecteddatoms + :test/expected-datoms #{[101 :db/ident :keyword/value2] [200 :db.schema/attribute 101]} }