summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--helix-term/tests/integration.rs2
-rw-r--r--helix-term/tests/integration/auto_indent.rs1
-rw-r--r--helix-term/tests/integration/auto_pairs.rs2
-rw-r--r--helix-term/tests/integration/commands.rs25
-rw-r--r--helix-term/tests/integration/helpers.rs69
-rw-r--r--helix-term/tests/integration/movement.rs8
-rw-r--r--helix-term/tests/integration/write.rs79
-rw-r--r--helix-view/src/editor.rs5
8 files changed, 147 insertions, 44 deletions
diff --git a/helix-term/tests/integration.rs b/helix-term/tests/integration.rs
index b2b78e63..54364e12 100644
--- a/helix-term/tests/integration.rs
+++ b/helix-term/tests/integration.rs
@@ -17,6 +17,7 @@ mod integration {
Args::default(),
Config::default(),
("#[\n|]#", "ihello world<esc>", "hello world#[|\n]#"),
+ None,
)
.await?;
@@ -25,6 +26,7 @@ mod integration {
mod auto_indent;
mod auto_pairs;
+ mod commands;
mod movement;
mod write;
}
diff --git a/helix-term/tests/integration/auto_indent.rs b/helix-term/tests/integration/auto_indent.rs
index 74d1ac58..fdfc7dfb 100644
--- a/helix-term/tests/integration/auto_indent.rs
+++ b/helix-term/tests/integration/auto_indent.rs
@@ -18,6 +18,7 @@ async fn auto_indent_c() -> anyhow::Result<()> {
}
"},
),
+ None,
)
.await?;
diff --git a/helix-term/tests/integration/auto_pairs.rs b/helix-term/tests/integration/auto_pairs.rs
index 52fee55e..d34cd0fd 100644
--- a/helix-term/tests/integration/auto_pairs.rs
+++ b/helix-term/tests/integration/auto_pairs.rs
@@ -6,6 +6,7 @@ async fn auto_pairs_basic() -> anyhow::Result<()> {
Args::default(),
Config::default(),
("#[\n|]#", "i(<esc>", "(#[|)]#\n"),
+ None,
)
.await?;
@@ -19,6 +20,7 @@ async fn auto_pairs_basic() -> anyhow::Result<()> {
..Default::default()
},
("#[\n|]#", "i(<esc>", "(#[|\n]#"),
+ None,
)
.await?;
diff --git a/helix-term/tests/integration/commands.rs b/helix-term/tests/integration/commands.rs
new file mode 100644
index 00000000..ec60ac96
--- /dev/null
+++ b/helix-term/tests/integration/commands.rs
@@ -0,0 +1,25 @@
+use helix_core::diagnostic::Severity;
+use helix_term::application::Application;
+
+use super::*;
+
+#[tokio::test]
+async fn test_write_quit_fail() -> anyhow::Result<()> {
+ test_key_sequence(
+ &mut Application::new(
+ Args {
+ files: vec![(PathBuf::from("/foo"), Position::default())],
+ ..Default::default()
+ },
+ Config::default(),
+ )?,
+ "ihello<esc>:wq<ret>",
+ Some(&|app| {
+ assert_eq!(&Severity::Error, app.editor.get_status().unwrap().1);
+ }),
+ None,
+ )
+ .await?;
+
+ Ok(())
+}
diff --git a/helix-term/tests/integration/helpers.rs b/helix-term/tests/integration/helpers.rs
index df662f07..60bfa331 100644
--- a/helix-term/tests/integration/helpers.rs
+++ b/helix-term/tests/integration/helpers.rs
@@ -5,7 +5,6 @@ use crossterm::event::{Event, KeyEvent};
use helix_core::{test, Selection, Transaction};
use helix_term::{application::Application, args::Args, config::Config};
use helix_view::{doc, input::parse_macro};
-use tokio::time::timeout;
use tokio_stream::wrappers::UnboundedReceiverStream;
#[derive(Clone, Debug)]
@@ -32,35 +31,48 @@ impl<S: Into<String>> From<(S, S, S)> for TestCase {
}
}
+#[inline]
pub async fn test_key_sequence(
app: &mut Application,
in_keys: &str,
test_fn: Option<&dyn Fn(&Application)>,
+ timeout: Option<Duration>,
) -> anyhow::Result<()> {
+ test_key_sequences(app, vec![(in_keys, test_fn)], timeout).await
+}
+
+pub async fn test_key_sequences(
+ app: &mut Application,
+ inputs: Vec<(&str, Option<&dyn Fn(&Application)>)>,
+ timeout: Option<Duration>,
+) -> anyhow::Result<()> {
+ let timeout = timeout.unwrap_or(Duration::from_millis(500));
let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
+ let mut rx_stream = UnboundedReceiverStream::new(rx);
- for key_event in parse_macro(&in_keys)?.into_iter() {
- tx.send(Ok(Event::Key(KeyEvent::from(key_event))))?;
- }
+ for (in_keys, test_fn) in inputs {
+ for key_event in parse_macro(&in_keys)?.into_iter() {
+ tx.send(Ok(Event::Key(KeyEvent::from(key_event))))?;
+ }
- let mut rx_stream = UnboundedReceiverStream::new(rx);
- let event_loop = app.event_loop(&mut rx_stream);
- let result = timeout(Duration::from_millis(500), event_loop).await;
+ let event_loop = app.event_loop(&mut rx_stream);
+ let result = tokio::time::timeout(timeout, event_loop).await;
- if result.is_ok() {
- bail!("application exited before test function could run");
- }
+ if result.is_ok() {
+ bail!("application exited before test function could run");
+ }
- if let Some(test) = test_fn {
- test(app);
- };
+ if let Some(test) = test_fn {
+ test(app);
+ };
+ }
for key_event in parse_macro("<esc>:q!<ret>")?.into_iter() {
tx.send(Ok(Event::Key(KeyEvent::from(key_event))))?;
}
let event_loop = app.event_loop(&mut rx_stream);
- timeout(Duration::from_millis(5000), event_loop).await?;
+ tokio::time::timeout(timeout, event_loop).await?;
app.close().await?;
Ok(())
@@ -70,6 +82,7 @@ pub async fn test_key_sequence_with_input_text<T: Into<TestCase>>(
app: Option<Application>,
test_case: T,
test_fn: &dyn Fn(&Application),
+ timeout: Option<Duration>,
) -> anyhow::Result<()> {
let test_case = test_case.into();
let mut app =
@@ -87,7 +100,7 @@ pub async fn test_key_sequence_with_input_text<T: Into<TestCase>>(
view.id,
);
- test_key_sequence(&mut app, &test_case.in_keys, Some(test_fn)).await
+ test_key_sequence(&mut app, &test_case.in_keys, Some(test_fn), timeout).await
}
/// Use this for very simple test cases where there is one input
@@ -97,20 +110,26 @@ pub async fn test_key_sequence_text_result<T: Into<TestCase>>(
args: Args,
config: Config,
test_case: T,
+ timeout: Option<Duration>,
) -> anyhow::Result<()> {
let test_case = test_case.into();
let app = Application::new(args, config).unwrap();
- test_key_sequence_with_input_text(Some(app), test_case.clone(), &|app| {
- let doc = doc!(app.editor);
- assert_eq!(&test_case.out_text, doc.text());
-
- let mut selections: Vec<_> = doc.selections().values().cloned().collect();
- assert_eq!(1, selections.len());
-
- let sel = selections.pop().unwrap();
- assert_eq!(test_case.out_selection, sel);
- })
+ test_key_sequence_with_input_text(
+ Some(app),
+ test_case.clone(),
+ &|app| {
+ let doc = doc!(app.editor);
+ assert_eq!(&test_case.out_text, doc.text());
+
+ let mut selections: Vec<_> = doc.selections().values().cloned().collect();
+ assert_eq!(1, selections.len());
+
+ let sel = selections.pop().unwrap();
+ assert_eq!(test_case.out_selection, sel);
+ },
+ timeout,
+ )
.await
}
diff --git a/helix-term/tests/integration/movement.rs b/helix-term/tests/integration/movement.rs
index cac10852..a1d294c6 100644
--- a/helix-term/tests/integration/movement.rs
+++ b/helix-term/tests/integration/movement.rs
@@ -14,6 +14,7 @@ async fn insert_mode_cursor_position() -> anyhow::Result<()> {
out_text: String::new(),
out_selection: Selection::single(0, 0),
},
+ None,
)
.await?;
@@ -21,6 +22,7 @@ async fn insert_mode_cursor_position() -> anyhow::Result<()> {
Args::default(),
Config::default(),
("#[\n|]#", "i", "#[|\n]#"),
+ None,
)
.await?;
@@ -28,6 +30,7 @@ async fn insert_mode_cursor_position() -> anyhow::Result<()> {
Args::default(),
Config::default(),
("#[\n|]#", "i<esc>", "#[|\n]#"),
+ None,
)
.await?;
@@ -35,6 +38,7 @@ async fn insert_mode_cursor_position() -> anyhow::Result<()> {
Args::default(),
Config::default(),
("#[\n|]#", "i<esc>i", "#[|\n]#"),
+ None,
)
.await?;
@@ -48,6 +52,7 @@ async fn insert_to_normal_mode_cursor_position() -> anyhow::Result<()> {
Args::default(),
Config::default(),
("#[f|]#oo\n", "vll<A-;><esc>", "#[|foo]#\n"),
+ None,
)
.await?;
@@ -65,6 +70,7 @@ async fn insert_to_normal_mode_cursor_position() -> anyhow::Result<()> {
#(|bar)#"
},
),
+ None,
)
.await?;
@@ -82,6 +88,7 @@ async fn insert_to_normal_mode_cursor_position() -> anyhow::Result<()> {
#(ba|)#r"
},
),
+ None,
)
.await?;
@@ -99,6 +106,7 @@ async fn insert_to_normal_mode_cursor_position() -> anyhow::Result<()> {
#(b|)#ar"
},
),
+ None,
)
.await?;
diff --git a/helix-term/tests/integration/write.rs b/helix-term/tests/integration/write.rs
index 47e56288..27f97a45 100644
--- a/helix-term/tests/integration/write.rs
+++ b/helix-term/tests/integration/write.rs
@@ -1,9 +1,11 @@
use std::{
io::{Read, Write},
- ops::RangeInclusive,
+ time::Duration,
};
+use helix_core::diagnostic::Severity;
use helix_term::application::Application;
+use helix_view::doc;
use super::*;
@@ -21,6 +23,7 @@ async fn test_write() -> anyhow::Result<()> {
)?,
"ii can eat glass, it will not hurt me<ret><esc>:w<ret>",
None,
+ Some(Duration::from_millis(1000)),
)
.await?;
@@ -35,35 +38,73 @@ async fn test_write() -> anyhow::Result<()> {
}
#[tokio::test]
-async fn test_write_concurrent() -> anyhow::Result<()> {
- let mut file = tempfile::NamedTempFile::new().unwrap();
- let mut command = String::new();
- const RANGE: RangeInclusive<i32> = 1..=1000;
-
- for i in RANGE {
- let cmd = format!("%c{}<esc>:w<ret>", i);
- command.push_str(&cmd);
- }
-
- test_key_sequence(
+async fn test_write_fail_mod_flag() -> anyhow::Result<()> {
+ test_key_sequences(
&mut Application::new(
Args {
- files: vec![(file.path().to_path_buf(), Position::default())],
+ files: vec![(PathBuf::from("/foo"), Position::default())],
..Default::default()
},
Config::default(),
)?,
- &command,
+ vec![
+ (
+ "",
+ Some(&|app| {
+ let doc = doc!(app.editor);
+ assert!(!doc.is_modified());
+ }),
+ ),
+ (
+ "ihello<esc>",
+ Some(&|app| {
+ let doc = doc!(app.editor);
+ assert!(doc.is_modified());
+ }),
+ ),
+ (
+ ":w<ret>",
+ Some(&|app| {
+ assert_eq!(&Severity::Error, app.editor.get_status().unwrap().1);
+
+ let doc = doc!(app.editor);
+ assert!(doc.is_modified());
+ }),
+ ),
+ ],
None,
)
.await?;
- file.as_file_mut().flush()?;
- file.as_file_mut().sync_all()?;
+ Ok(())
+}
- let mut file_content = String::new();
- file.as_file_mut().read_to_string(&mut file_content)?;
- assert_eq!(RANGE.end().to_string(), file_content);
+#[tokio::test]
+#[ignore]
+async fn test_write_fail_new_path() -> anyhow::Result<()> {
+ test_key_sequences(
+ &mut Application::new(Args::default(), Config::default())?,
+ vec![
+ (
+ "",
+ Some(&|app| {
+ let doc = doc!(app.editor);
+ assert_eq!(None, app.editor.get_status());
+ assert_eq!(None, doc.path());
+ }),
+ ),
+ (
+ ":w /foo<ret>",
+ Some(&|app| {
+ let doc = doc!(app.editor);
+ assert_eq!(&Severity::Error, app.editor.get_status().unwrap().1);
+ assert_eq!(None, doc.path());
+ }),
+ ),
+ ],
+ Some(Duration::from_millis(1000)),
+ )
+ .await?;
Ok(())
}
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 8607c65a..d828f9ec 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -571,6 +571,11 @@ impl Editor {
self.status_msg = Some((error.into(), Severity::Error));
}
+ #[inline]
+ pub fn get_status(&self) -> Option<(&Cow<'static, str>, &Severity)> {
+ self.status_msg.as_ref().map(|(status, sev)| (status, sev))
+ }
+
pub fn set_theme(&mut self, theme: Theme) {
// `ui.selection` is the only scope required to be able to render a theme.
if theme.find_scope_index("ui.selection").is_none() {
generated by cgit v1.2.3-70-g09d2 (git 2.47.1) at 2024-12-27 10:29:08 +0000