From cc40e684cf533812cad56cee23ea8be9389510a6 Mon Sep 17 00:00:00 2001
From: Razvan Nitu <razvan.nitu1305@gmail.com>
Date: Tue, 8 Oct 2024 12:01:42 +0300
Subject: [PATCH] Fix unittests (#153)

* Fix broken unittests in vcall_in_ctor.d

* Fix broken unittest in line_length.d

* Fix broken unittest in redundant_attributes.d

* Fix broken unittest in if_constraints_indent.d

* Fix broken unittests in auto_function.d

* Fix broken unittest in always_curly.d
---
 src/dscanner/analysis/always_curly.d          |  4 ++--
 src/dscanner/analysis/auto_function.d         |  3 ---
 src/dscanner/analysis/if_constraints_indent.d |  4 ++--
 src/dscanner/analysis/line_length.d           |  4 ++--
 src/dscanner/analysis/redundant_attributes.d  |  2 +-
 src/dscanner/analysis/vcall_in_ctor.d         | 18 +-----------------
 6 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/src/dscanner/analysis/always_curly.d b/src/dscanner/analysis/always_curly.d
index 66adb9f..2783c89 100644
--- a/src/dscanner/analysis/always_curly.d
+++ b/src/dscanner/analysis/always_curly.d
@@ -264,11 +264,11 @@ unittest
 
 	assertAutoFix(q{
 		void test() {
-			do return; while(true) // fix:0
+			do return; while(true); // fix:0
 		}
 	}c, q{
 		void test() {
-			do { return; } while(true) // fix:0
+			do { return; } while(true); // fix:0
 		}
 	}c, sac, true);
 
diff --git a/src/dscanner/analysis/auto_function.d b/src/dscanner/analysis/auto_function.d
index 0542a3e..f2dbe6e 100644
--- a/src/dscanner/analysis/auto_function.d
+++ b/src/dscanner/analysis/auto_function.d
@@ -195,18 +195,15 @@ unittest
 
 	assertAnalyzerWarningsDMD(q{
 		auto doStuff(){} // [warn]: %s
-		extern(C) auto doStuff();
 	}c.format(MESSAGE), sac);
 
 	assertAnalyzerWarningsDMD(q{
 		auto doStuff(){} // [warn]: %s
-		@disable auto doStuff();
 	}c.format(MESSAGE), sac);
 
 	assertAnalyzerWarningsDMD(q{
 		@property doStuff(){} // [warn]: %s
 		@safe doStuff(){} // [warn]: %s
-		@disable doStuff();
 		@safe void doStuff();
 	}c.format(MESSAGE_INSERT, MESSAGE_INSERT), sac);
 
diff --git a/src/dscanner/analysis/if_constraints_indent.d b/src/dscanner/analysis/if_constraints_indent.d
index 219cd71..d1b3144 100644
--- a/src/dscanner/analysis/if_constraints_indent.d
+++ b/src/dscanner/analysis/if_constraints_indent.d
@@ -266,7 +266,7 @@ unittest
 	StaticAnalysisConfig sac = disabledConfig();
 	sac.if_constraints_indent = Check.enabled;
 
-	assertAnalyzerWarnings(`void foo() {
-	''
+    assertAnalyzerWarnings(`void foo() {
+    f;
 }`, sac);
 }
diff --git a/src/dscanner/analysis/line_length.d b/src/dscanner/analysis/line_length.d
index 79b4159..5693a4e 100644
--- a/src/dscanner/analysis/line_length.d
+++ b/src/dscanner/analysis/line_length.d
@@ -156,8 +156,8 @@ assert("foo" == "foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
 	}c, sac);
 
 	assertAnalyzerWarningsDMD(q{
-	assert("foo" == "boooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo5");
-	assert("foo" == "booooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo6"); // [warn]: Line is longer than 120 characters
+	static assert("foo" == "booooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo5");
+    static assert("foo" == "boooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo6"); // [warn]: Line is longer than 120 characters
 	}c, sac);
 
 	// reduced from std/regex/internal/thompson.d
diff --git a/src/dscanner/analysis/redundant_attributes.d b/src/dscanner/analysis/redundant_attributes.d
index 6c17aa5..0dce40a 100644
--- a/src/dscanner/analysis/redundant_attributes.d
+++ b/src/dscanner/analysis/redundant_attributes.d
@@ -111,7 +111,7 @@ private:
 	private int foo2; // [warn]: Same visibility attribute used as defined on line 4.
 	private void foo() // [warn]: Same visibility attribute used as defined on line 4.
 	{
-		private int blah;
+		int blah;
 	}
 }}c, sac);
 
diff --git a/src/dscanner/analysis/vcall_in_ctor.d b/src/dscanner/analysis/vcall_in_ctor.d
index 445bfdd..5f536d3 100644
--- a/src/dscanner/analysis/vcall_in_ctor.d
+++ b/src/dscanner/analysis/vcall_in_ctor.d
@@ -226,7 +226,7 @@ unittest
                 bar(); // [warn]: %s
             }
             private: public void bar();
-            public private {void foo(){}}
+            private {void foo(){}}
         }
     }c.format(MSG), sac);
 
@@ -247,22 +247,6 @@ unittest
         }
     }, sac);
 
-    assertAnalyzerWarningsDMD(q{
-        class Bar
-        {
-            this(){foo();}
-            private public protected private void foo(){}
-        }
-    }, sac);
-
-    assertAnalyzerWarningsDMD(q{
-        class Bar
-        {
-            this(){foo();}
-            final private public protected void foo(){}
-        }
-    }, sac);
-
     assertAnalyzerWarningsDMD(q{
         class Bar
         {