Cleanup of test functions.

analysis/constructors.d

@@ -90,7 +90,7 @@ private:
 
 unittest
 {
-	shouldWarn(q{
+	assertAnalyzerWarnings(q{
 		class Cat // [warn]: This class has a zero-argument constructor as well as a constructor with one default argument. This can be confusing
 		{
 			this() {}

analysis/del.d

@@ -32,7 +32,7 @@ class DeleteCheck : BaseAnalyzer
 
 unittest
 {
-	shouldWarn(q{
+	assertAnalyzerWarnings(q{
 		void testDelete()
 		{
 			int[int] data = [1 : 2];

analysis/fish.d

@@ -42,7 +42,7 @@ class FloatOperatorCheck : BaseAnalyzer
 
 unittest
 {
-	shouldWarn(q{
+	assertAnalyzerWarnings(q{
 		void testFish()
 		{
 			float z = 1.5f;

analysis/helpers.d

@@ -7,17 +7,18 @@ module analysis.helpers;
 
 import std.string;
 import std.traits;
-
 import std.d.ast;
 
 
 S between(S)(S value, S before, S after) 
-if (isSomeString!S) {
+	if (isSomeString!S)
+{
 	return value.after(before).before(after);
 }
 
 S before(S)(S value, S separator)
-if (isSomeString!S) {
+	if (isSomeString!S)
+{
 	auto i = indexOf(value, separator);
 
 	if (i == -1)
@@ -27,10 +28,11 @@ if (isSomeString!S) {
 }
 
 S after(S)(S value, S separator)
-if(isSomeString!S) {
+	if (isSomeString!S)
+{
 	auto i = indexOf(value, separator);
 
-	if( i == -1)
+	if (i == -1)
 		return "";
 
 	size_t start = i + separator.length;
@@ -38,19 +40,12 @@ if(isSomeString!S) {
 	return value[start .. $];
 }
 
-S afterLast(S)(S value, S separator) 
+/**
-if (isSomeString!S) {
+ * This assert function will analyze the passed in code, get the warnings, 
-	size_t i = rindex(value, separator);
+ * and make sure they match the warnings in the comments. Warnings are
-
+ * marked like so: // [warn]: Failed to do somethings.
-	if (i == value.length)
+ */
-		return "";
+void assertAnalyzerWarnings(string code, analysis.run.AnalyzerCheck analyzers, string file=__FILE__, size_t line=__LINE__)
-
-	size_t start = i + separator.length;
-
-	return value[start .. $];
-}
-
-void shouldWarn(string code, analysis.run.AnalyzerCheck analyzers, string file=__FILE__, size_t line=__LINE__)
 {
 	import analysis.run;
 
@@ -64,7 +59,6 @@ void shouldWarn(string code, analysis.run.AnalyzerCheck analyzers, string file=_
 	{
 		size_t warnLine = line - 1 + std.conv.to!size_t(rawWarnings[i].between("test(", ":"));
 		warnings[warnLine] = rawWarnings[i].after(")");
-//		stderr.writefln("!!! warnings[%d] = \"%s\"", warnLine, warnings[warnLine]);
 	}
 
 	// Get all the messages from the comments in the code
@@ -85,14 +79,12 @@ void shouldWarn(string code, analysis.run.AnalyzerCheck analyzers, string file=_
 		size_t lineNo = i + line;
 
 		// Get the message
-//		stderr.writefln("!!! message[%d] = \"%s\"", lineNo, commentPart);
 		messages[lineNo] = commentPart;
 	}
 
 	// Throw an assert error if any messages are not listed in the warnings
 	foreach (lineNo, message; messages)
 	{
-//		stderr.writefln("!!!!!! messages[%d] : %s", lineNo, messages[lineNo]);
 		// No warning
 		if (lineNo !in warnings)
 		{
@@ -102,8 +94,8 @@ void shouldWarn(string code, analysis.run.AnalyzerCheck analyzers, string file=_
 				codeLines[lineNo - line]
 			);
 			throw new core.exception.AssertError(errors, file, lineNo);
-		// Different warning
 		}
+		// Different warning
 		else if (warnings[lineNo] != messages[lineNo])
 		{
 			string errors = "Expected warning:\n%s\nBut was:\n%s\nFrom source code at (%s:?):\n%s".format(
@@ -120,7 +112,6 @@ void shouldWarn(string code, analysis.run.AnalyzerCheck analyzers, string file=_
 	string[] unexpectedWarnings;
 	foreach (lineNo, warning; warnings)
 	{
-//		stderr.writefln("!!!!!! warnings[%d] : %s", lineNo, warning);
 		// Unexpected warning
 		if (lineNo !in messages)
 		{

analysis/ifelsesame.d

@@ -48,7 +48,7 @@ class IfElseSameCheck : BaseAnalyzer
 
 unittest
 {
-	shouldWarn(q{
+	assertAnalyzerWarnings(q{
 		void testSizeT()
 		{
 			string person = "unknown";

analysis/numbers.d

@@ -42,7 +42,7 @@ class NumberStyleCheck : BaseAnalyzer
 
 unittest
 {
-	shouldWarn(q{
+	assertAnalyzerWarnings(q{
 		void testNumbers()
 		{
 			int a;

analysis/objectconst.d

@@ -71,7 +71,7 @@ class ObjectConstCheck : BaseAnalyzer
 
 unittest
 {
-	shouldWarn(q{
+	assertAnalyzerWarnings(q{
 		void testConsts()
 		{
 			// Will be ok because all are declared const/immutable

analysis/pokemon.d

@@ -58,7 +58,7 @@ class PokemonExceptionCheck : BaseAnalyzer
 
 unittest
 {
-	shouldWarn(q{
+	assertAnalyzerWarnings(q{
 		void testCatch()
 		{
 			try

analysis/range.d

@@ -123,7 +123,7 @@ class BackwardsRangeCheck : BaseAnalyzer
 
 unittest
 {
-	shouldWarn(q{
+	assertAnalyzerWarnings(q{
 		void testRange()
 		{
 			int[] data = [1, 2, 3, 4, 5];

analysis/style.d

@@ -93,7 +93,7 @@ class StyleChecker : BaseAnalyzer
 
 unittest
 {
-	shouldWarn(q{
+	assertAnalyzerWarnings(q{
 		module AMODULE; // [warn]: Module/package name 'AMODULE' does not match style guidelines
 
 		bool A_VARIABLE; // FIXME:

std/allocator.d

@@ -3056,8 +3056,7 @@ unittest
 }
 
 // FIXME: Disabling this test because it is machine dependent
-/*
+version (none) unittest
-unittest
 {
     InSituRegion!(4096) r1;
     auto a = r1.allocate(2001);
@@ -3069,7 +3068,7 @@ unittest
     a = r2.allocate(2001);
     assert(a.length == 2001);
 }
-*/
+
 /**
 _Options for $(D AllocatorWithStats) defined below. Each enables during
 compilation one specific counter, statistic, or other piece of information.