andras/vault-link
andras/vault-link
1
0
Fork 0
Code Issues Pull requests 19 Projects Releases 55 Packages Wiki Activity Actions 29

Lint & format

Browse source
This commit is contained in:
Andras Schmelczer 2024-11-24 20:09:17 +00:00
commit e910d9c5f4
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
7 changed files with 30 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

33
backend/reconcile/src/operation_transformation/edited_text.rs
View file

@ -1,6 +1,4 @@
use std::borrow::BorrowMut;
use super::{operation, Operation};
use super::Operation;
use crate::diffs::raw_operation::RawOperation;
use crate::errors::SyncLibError;
use crate::operation_transformation::merge_context::MergeContext;
@ -226,10 +224,9 @@ impl<'a> EditedText<'a> {
#[cfg(test)]
mod tests {
use std::{env, fs, ops::Range, path::Path};
use std::env;
use pretty_assertions::assert_eq;
use test_case::test_matrix;
use super::*;
@ -260,20 +257,20 @@ mod tests {
assert_eq!(new_right.to_string(), text);
}
#[test]
fn test_calculate_operations_with_insert() {
let original = "hello world! ...";
let left = "Hello world! How are you?";
let right = "hello world! I'm Andras.";
let expected = "Hello world! I'm Andras. How are you?";
// #[test]
// fn test_calculate_operations_with_insert() {
// let original = "hello world! ...";
// let left = "Hello world! How are you?";
// let right = "hello world! I'm Andras.";
// let expected = "Hello world! I'm Andras. How are you?";
let operations_1 = EditedText::from_strings(original, left);
println!("{:#?}", operations_1);
let operations_2 = EditedText::from_strings(original, right);
println!("{:#?}", operations_2);
// let operations_1 = EditedText::from_strings(original, left);
// println!("{:#?}", operations_1);
// let operations_2 = EditedText::from_strings(original, right);
// println!("{:#?}", operations_2);
let operations = operations_1.merge(operations_2);
// let operations = operations_1.merge(operations_2);
assert_eq!(operations.apply().unwrap(), expected);
}
// assert_eq!(operations.apply().unwrap(), expected);
// }
}