tests ~ fix tests for "diffstyle_git"

rust-pretty-assertions · Feb 24, 2020 · 2f39b86 · 2f39b86
1 parent 5af20db
commit 2f39b86
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 9 deletions.
diff --git a/tests/assert_eq.rs b/tests/assert_eq.rs
@@ -52,7 +52,14 @@ fn assert_eq() {
 
     let mut expect = expect_template.to_string();
 
-    expect = expect.replace("{{<}}", "<").replace("{{>}}", ">");
+    #[cfg(not(any(feature = "diffstyle_git")))]
+    {
+        expect = expect.replace("{{<}}", "<").replace("{{>}}", ">");
+    }
+    #[cfg(feature = "diffstyle_git")]
+    {
+        expect = expect.replace("{{<}}", "-").replace("{{>}}", "+");
+    }
 
     #[cfg(not(any(feature = "labels")))]
     {
@@ -123,7 +130,14 @@ fn with_labels_assert_eq() {
 
     let mut expect = expect_template.to_string();
 
-    expect = expect.replace("{{<}}", "<").replace("{{>}}", ">");
+    #[cfg(not(any(feature = "diffstyle_git")))]
+    {
+        expect = expect.replace("{{<}}", "<").replace("{{>}}", ">");
+    }
+    #[cfg(feature = "diffstyle_git")]
+    {
+        expect = expect.replace("{{<}}", "-").replace("{{>}}", "+");
+    }
 
     let result = maybe_unwind(|| {
         with_config_assert_eq!(
@@ -192,7 +206,16 @@ fn with_labels_assert_eq_simple() {
 
     let mut expect = expect_template.to_string();
 
-    expect = expect.replace("{{<}}", "<").replace("{{>}}", ">");
+    #[cfg(not(any(feature = "diffstyle_git")))]
+    {
+        expect = expect.replace("{{<}}", "<").replace("{{>}}", ">");
+    }
+    #[cfg(feature = "diffstyle_git")]
+    {
+        expect = expect.replace("{{<}}", "-").replace("{{>}}", "+");
+    }
+
+    expect = expect.replace("{{left}}", "x").replace("{{right}}", "y");
 
     let result = maybe_unwind(|| {
         with_config_assert_eq!(
@@ -261,7 +284,14 @@ fn assert_eq_custom() {
 
     let mut expect = expect_template.to_string();
 
-    expect = expect.replace("{{<}}", "<").replace("{{>}}", ">");
+    #[cfg(not(any(feature = "diffstyle_git")))]
+    {
+        expect = expect.replace("{{<}}", "<").replace("{{>}}", ">");
+    }
+    #[cfg(feature = "diffstyle_git")]
+    {
+        expect = expect.replace("{{<}}", "-").replace("{{>}}", "+");
+    }
 
     #[cfg(not(any(feature = "labels")))]
     {
@@ -328,7 +358,14 @@ fn issue12() {
 
     let mut expect = expect_template.to_string();
 
-    expect = expect.replace("{{<}}", "<").replace("{{>}}", ">");
+    #[cfg(not(any(feature = "diffstyle_git")))]
+    {
+        expect = expect.replace("{{<}}", "<").replace("{{>}}", ">");
+    }
+    #[cfg(feature = "diffstyle_git")]
+    {
+        expect = expect.replace("{{<}}", "-").replace("{{>}}", "+");
+    }
 
     #[cfg(not(any(feature = "labels")))]
     {
@@ -405,7 +442,14 @@ fn assert_eq_trailing_comma() {
 
     let mut expect = expect_template.to_string();
 
-    expect = expect.replace("{{<}}", "<").replace("{{>}}", ">");
+    #[cfg(not(any(feature = "diffstyle_git")))]
+    {
+        expect = expect.replace("{{<}}", "<").replace("{{>}}", ">");
+    }
+    #[cfg(feature = "diffstyle_git")]
+    {
+        expect = expect.replace("{{<}}", "-").replace("{{>}}", "+");
+    }
 
     #[cfg(not(any(feature = "labels")))]
     {
@@ -478,7 +522,14 @@ fn assert_eq_custom_trailing_comma() {
 
     let mut expect = expect_template.to_string();
 
-    expect = expect.replace("{{<}}", "<").replace("{{>}}", ">");
+    #[cfg(not(any(feature = "diffstyle_git")))]
+    {
+        expect = expect.replace("{{<}}", "<").replace("{{>}}", ">");
+    }
+    #[cfg(feature = "diffstyle_git")]
+    {
+        expect = expect.replace("{{<}}", "-").replace("{{>}}", "+");
+    }
 
     #[cfg(not(any(feature = "labels")))]
     {

diff --git a/tests/assert_ne.rs b/tests/assert_ne.rs
@@ -247,7 +247,14 @@ fn assert_ne_partial() {
 
     let mut expect = expect_template.to_string();
 
-    expect = expect.replace("{{<}}", "<").replace("{{>}}", ">");
+    #[cfg(not(any(feature = "diffstyle_git")))]
+    {
+        expect = expect.replace("{{<}}", "<").replace("{{>}}", ">");
+    }
+    #[cfg(feature = "diffstyle_git")]
+    {
+        expect = expect.replace("{{<}}", "-").replace("{{>}}", "+");
+    }
 
     expect = expect
         .replace("{{left}}", "left")

diff --git a/tests/pretty_string.rs b/tests/pretty_string.rs
@@ -39,7 +39,14 @@ fn assert_eq_empty_first() {
 
     let mut expect = expect_template.to_string();
 
-    expect = expect.replace("{{<}}", "<").replace("{{>}}", ">");
+    #[cfg(not(any(feature = "diffstyle_git")))]
+    {
+        expect = expect.replace("{{<}}", "<").replace("{{>}}", ">");
+    }
+    #[cfg(feature = "diffstyle_git")]
+    {
+        expect = expect.replace("{{<}}", "-").replace("{{>}}", "+");
+    }
 
     #[cfg(not(any(feature = "labels")))]
     {