From 6efa6c7891e15953aabc444cabcd4dc722f076bb Mon Sep 17 00:00:00 2001 From: Laurenz Date: Wed, 13 Jan 2021 16:50:43 +0100 Subject: [PATCH] =?UTF-8?q?Move=20basic=20markup=20tests=20to=20integratio?= =?UTF-8?q?n=20=F0=9F=9A=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/parse/tests.rs | 31 +------------------------------ tests/ref/basic-markup.png | Bin 0 -> 5623 bytes tests/typ/basic-markup.typ | 22 ++++++++++++++++++++++ tests/typ/func-page.typ | 1 - 4 files changed, 23 insertions(+), 31 deletions(-) create mode 100644 tests/ref/basic-markup.png create mode 100644 tests/typ/basic-markup.typ diff --git a/src/parse/tests.rs b/src/parse/tests.rs index 9a0a4ce6d..a8e9dc256 100644 --- a/src/parse/tests.rs +++ b/src/parse/tests.rs @@ -10,7 +10,7 @@ use crate::syntax::*; use BinOp::*; use Expr::{Angle, Bool, Color, Float, Int, Length, Percent}; -use Node::{Emph, Linebreak, Parbreak, Space, Strong}; +use Node::{Space, Strong}; use UnOp::{Neg, Pos}; macro_rules! t { @@ -213,35 +213,6 @@ macro_rules! Let { }; } -#[test] -fn test_parse_simple_nodes() { - // Basics. - t!(""); - t!(" " Space); - t!("hi" Text("hi")); - t!("🧽" Text("🧽")); - t!("_" Emph); - t!("*" Strong); - t!("~" Text("\u{00A0}")); - t!(r"\" Linebreak); - t!("\n\n" Parbreak); - - // Multiple nodes. - t!("ab c" Text("ab"), Space, Text("c")); - t!("a`hi`\r\n\r*" Text("a"), Raw(None, &["hi"], true), Parbreak, Strong); - - // Spans. - t!("*🌍*" - nodes: [S(0..1, Strong), S(1..5, Text("🌍")), S(5..6, Strong)], - spans: true); - - // Errors. - t!("]}" - nodes: [], - errors: [S(0..1, "unexpected closing bracket"), - S(1..2, "unexpected closing brace")]); -} - #[test] fn test_parse_raw() { // Basic, mostly tested in tokenizer and resolver. diff --git a/tests/ref/basic-markup.png b/tests/ref/basic-markup.png new file mode 100644 index 0000000000000000000000000000000000000000..d65b7fe54e6f28b60ba937684047490803aa457d GIT binary patch literal 5623 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 J1