fixed RowFixture bug which caused dups to show up as missing and surplus

awulder · Mar 30, 2005 · 55fc810 · 55fc810
1 parent 857b10b
commit 55fc810
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 1 deletion.
diff --git a/dotnet/FitServer.exe b/dotnet/FitServer.exe
diff --git a/dotnet/TestRunner.exe b/dotnet/TestRunner.exe
diff --git a/dotnet/acceptanceTests.dll b/dotnet/acceptanceTests.dll
diff --git a/dotnet/eg.dll b/dotnet/eg.dll
diff --git a/dotnet/fit.dll b/dotnet/fit.dll
diff --git a/dotnet/src/TestRunner/.cvsignore b/dotnet/src/TestRunner/.cvsignore
@@ -0,0 +1 @@
+TestRunner.csproj.user
diff --git a/dotnet/src/fit/RowFixture.cs b/dotnet/src/fit/RowFixture.cs
@@ -99,7 +99,10 @@ private object FindMatchingObject(ArrayList queryItems, Parse row, int col)
 			}
 			if (UniqueMatchFound(matches))
 				return UniqueMatch(matches);
-			return FindMatchingObject(queryItems, row, col + 1);
+			else if (matches.Count > 0 && !ColumnHasBinding(col + 1))
+				return matches[0];
+			else 
+				return FindMatchingObject(queryItems, row, col + 1);
 		}
 
 		private bool IsMatch(Parse row, int col)

diff --git a/dotnet/src/fit/RowFixtureTest.cs b/dotnet/src/fit/RowFixtureTest.cs
@@ -261,6 +261,17 @@ public void TestOneExpectedOneActualIncorrect()
 			AssertTextInBody(table.At(0,3,0), "surplus");
 		}
 
+		[Test]
+		public void TestDupsAllowed()
+		{
+			AddQueryValue(new RowFixturePerson("Joe"));
+			AddQueryValue(new RowFixturePerson("Joe"));
+			AddRow(new string[] {"Joe"});
+			AddRow(new string[] {"Joe"});
+			fixture.DoTables(table);
+			VerifyCounts(2, 0, 0, 0);
+		}
+
 		[Test]
 		public void TestTwoExpectedTwoActualAllCorrectOrderCorrect()
 		{