fix benches

Fogapod · Feb 10, 2024 · 570f056 · 570f056
1 parent 70f5f37
commit 570f056
Show file tree

Hide file tree

Showing 9 changed files with 121 additions and 119 deletions.
diff --git a/benches/any.ron b/benches/any.ron
@@ -1,7 +1,7 @@
 (
- patterns: [
+ patterns: {
  // highly nested
- ("a", {"Any": [
+ "a": {"Any": [
  {"Any": [
  {"Any": [
  {"Any": [
@@ -19,59 +19,59 @@
  ]},
  ]},
  ]},
- ]}),
+ ]},
  // many items
- ("o", {"Any": [
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- {"Any": [{"Original": ()}]},
- ]}),
- ],
+ "o": {"Any": [
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ {"Original": ()},
+ ]},
+ },
 )
diff --git a/benches/concat.ron b/benches/concat.ron
@@ -1,13 +1,13 @@
 (
- patterns: [
+ patterns: {
  // use \w+ and \W+ to vary string lengths
- (r"\w+", {"Concat": (
+ r"\w+": {"Concat": (
  {"Original": ()},
  {"Original": ()},
- )}),
- (r"\W+", {"Concat": (
+ )},
+ r"\W+": {"Concat": (
  {"Original": ()},
  {"Original": ()},
- )}),
- ],
+ )},
+ },
 )
diff --git a/benches/literal.ron b/benches/literal.ron
@@ -1,7 +1,7 @@
 (
- patterns: [
- ("a", {"Literal": "A"}),
- ("o", {"Literal": "short"}),
- (r"\d+", {"Literal": "veryLongStringaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1234123412344rhrkghsghkgshal;ghaslfnkhsgkshgshgsjdgjkdngkjgh"}),
- ],
+ patterns: {
+ "a": {"Literal": "A"},
+ "o": {"Literal": "short"},
+ r"\d+": {"Literal": "veryLongStringaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1234123412344rhrkghsghkgshal;ghaslfnkhsgkshgshgsjdgjkdngkjgh"},
+ },
 )
diff --git a/benches/lower.ron b/benches/lower.ron
@@ -1,5 +1,5 @@
 (
- patterns: [
- (r"\w+", {"Lower": {"Lower": {"Lower": {"Lower": {"Lower": {"Original": ()}}}}}}),
- ],
+ patterns: {
+ r"\w+": {"Lower": {"Lower": {"Lower": {"Lower": {"Lower": {"Original": ()}}}}}},
+ },
 )
diff --git a/benches/original.ron b/benches/original.ron
@@ -1,7 +1,7 @@
 (
- patterns: [
+ patterns: {
  // varying string lenghts
- (r"\w+", {"Original": ()}),
- (r"\W+", {"Original": ()}),
- ],
+ r"\w+": {"Original": ()},
+ r"\W+": {"Original": ()},
+ },
 )
diff --git a/benches/upper.ron b/benches/upper.ron
@@ -1,5 +1,5 @@
 (
- patterns: [
- (r"\w+", {"Upper": {"Upper": {"Upper": {"Upper": {"Upper": {"Original": ()}}}}}}),
- ],
+ patterns: {
+ r"\w+": {"Upper": {"Upper": {"Upper": {"Upper": {"Upper": {"Original": ()}}}}}},
+ },
 )
diff --git a/benches/weights.ron b/benches/weights.ron
@@ -1,28 +1,28 @@
 (
- patterns: [
- ("a", {"Weights": [(1, {"Literal": "single"})]}),
- ("o", {"Weights": [
- (0, {"Weights": [(1, {"Literal": "many variants"})]}),
- (1, {"Weights": [(1, {"Literal": "1"})]}),
- (2, {"Weights": [(1, {"Literal": "2"})]}),
- (3, {"Weights": [(1, {"Literal": "3"})]}),
- (4, {"Weights": [(1, {"Literal": "4"})]}),
- (5, {"Weights": [(1, {"Literal": "5"})]}),
- (6, {"Weights": [(1, {"Literal": "6"})]}),
- (7, {"Weights": [(1, {"Literal": "7"})]}),
- (8, {"Weights": [(1, {"Literal": "8"})]}),
- (9, {"Weights": [(1, {"Literal": "9"})]}),
- (10, {"Weights": [(1, {"Literal": "10"})]}),
- (11, {"Weights": [(1, {"Literal": "11"})]}),
- (12, {"Weights": [(1, {"Literal": "12"})]}),
- (13, {"Weights": [(1, {"Literal": "13"})]}),
- (14, {"Weights": [(1, {"Literal": "14"})]}),
- (15, {"Weights": [(1, {"Literal": "15"})]}),
- (16, {"Weights": [(1, {"Literal": "16"})]}),
- (17, {"Weights": [(1, {"Literal": "17"})]}),
- (18, {"Weights": [(1, {"Literal": "18"})]}),
- (19, {"Weights": [(1, {"Literal": "19"})]}),
- (20, {"Weights": [(1, {"Literal": "20"})]}),
- ]}),
- ],
+ patterns: {
+ "a": {"Weights": {1: {"Literal": "single"}}},
+ "o": {"Weights": {
+ 0: {"Weights": {1: {"Literal": "many variants"}}},
+ 1: {"Weights": {1: {"Literal": "1"}}},
+ 2: {"Weights": {1: {"Literal": "2"}}},
+ 3: {"Weights": {1: {"Literal": "3"}}},
+ 4: {"Weights": {1: {"Literal": "4"}}},
+ 5: {"Weights": {1: {"Literal": "5"}}},
+ 6: {"Weights": {1: {"Literal": "6"}}},
+ 7: {"Weights": {1: {"Literal": "7"}}},
+ 8: {"Weights": {1: {"Literal": "8"}}},
+ 9: {"Weights": {1: {"Literal": "9"}}},
+ 10: {"Weights": {1: {"Literal": "10"}}},
+ 11: {"Weights": {1: {"Literal": "11"}}},
+ 12: {"Weights": {1: {"Literal": "12"}}},
+ 13: {"Weights": {1: {"Literal": "13"}}},
+ 14: {"Weights": {1: {"Literal": "14"}}},
+ 15: {"Weights": {1: {"Literal": "15"}}},
+ 16: {"Weights": {1: {"Literal": "16"}}},
+ 17: {"Weights": {1: {"Literal": "17"}}},
+ 18: {"Weights": {1: {"Literal": "18"}}},
+ 19: {"Weights": {1: {"Literal": "19"}}},
+ 20: {"Weights": {1: {"Literal": "20"}}},
+ }},
+ },
 )
diff --git a/tests/json.rs b/tests/json.rs
@@ -11,7 +11,7 @@ pub fn read_accent(filename: PathBuf) -> Accent {
 }
 
 #[test]
-fn json_examples_work() {
+fn json_accents_work() {
  let lines = read_sample_file_lines();
 
  let mut tested_at_least_one = false;

diff --git a/tests/ron.rs b/tests/ron.rs
@@ -10,30 +10,32 @@ pub fn read_accent(filename: PathBuf) -> Accent {
 }
 
 #[test]
-fn ron_examples_work() {
+fn ron_accents_work() {
  let lines = read_sample_file_lines();
 
  let mut tested_at_least_one = false;
 
- for entry in fs::read_dir("examples").unwrap() {
- let path = entry.unwrap().path();
+ for directory in ["examples", "benches"] {
+ for entry in fs::read_dir(directory).unwrap() {
+ let path = entry.unwrap().path();
 
- if !path.is_file() {
- continue;
- }
+  if !path.is_file() {
+  continue;
+  }
 
- if !path.extension().is_some_and(|ext| ext == "ron") {
- continue;
- }
+  if !path.extension().is_some_and(|ext| ext == "ron") {
+  continue;
+  }
 
- println!("running {}", path.display());
- let accent = read_accent(path);
- for line in &lines {
- for intensity in accent.intensities() {
- accent.say_it(&line, intensity);
+ println!("running {}", path.display());
+ let accent = read_accent(path);
+ for line in &lines {
+ for intensity in accent.intensities() {
+ accent.say_it(&line, intensity);
+ }
  }
+ tested_at_least_one = true;
  }
- tested_at_least_one = true;
  }
 
  assert!(tested_at_least_one);