From adb71ee040752f9348b0c9a511b2ab7e3710cb80 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Wed, 21 Jul 2021 20:35:02 +0200
Subject: Move and refactor

---
 tests/typeset.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'tests')

diff --git a/tests/typeset.rs b/tests/typeset.rs
index 5a071c75..08d812fb 100644
--- a/tests/typeset.rs
+++ b/tests/typeset.rs
@@ -246,6 +246,9 @@ fn test_part(
     let (local_compare_ref, ref_diags) = parse_metadata(src, &map);
     let compare_ref = local_compare_ref.unwrap_or(compare_ref);
 
+    // Clear the module cache between tests.
+    ctx.modules.clear();
+
     let ast = parse(src);
     let module = eval(ctx, src_id, Rc::new(ast.output));
     let tree = exec(ctx, &module.output.template);
@@ -295,7 +298,7 @@ fn test_part(
         for level in 0 .. reference.levels() {
             ctx.layouts = reference.clone();
             ctx.layouts.retain(|x| x == level);
-            if ctx.layouts.frames.is_empty() {
+            if ctx.layouts.is_empty() {
                 continue;
             }
 
@@ -304,10 +307,8 @@ fn test_part(
             let cached = layout(ctx, &tree.output);
             let misses = ctx
                 .layouts
-                .frames
-                .iter()
-                .flat_map(|(_, e)| e)
-                .filter(|e| e.level == level && !e.hit() && e.age() == 2)
+                .entries()
+                .filter(|e| e.level() == level && !e.hit() && e.age() == 2)
                 .count();
 
             if misses > 0 {
-- 
cgit v1.2.3