Merge lp:~john-park-west/concordion-net/update1 into lp:concordion-net

[John Park West]

DefaultConcordionRunner updated to also use Fixtures not ending with "Test"

=== modified file 'Concordion/Internal/Runner/DefaultConcordionRunner.cs'
--- Concordion/Internal/Runner/DefaultConcordionRunner.cs	2009-05-23 11:51:58 +0000
+++ Concordion/Internal/Runner/DefaultConcordionRunner.cs	2010-09-18 23:19:40 +0000
@@ -100,7 +100,10 @@
         {
             var fixtureAssembly = fixture.GetType().Assembly;
             var fixtureType = fixtureAssembly.GetType(fixtureName, false, true);
-
+            if (fixtureType == null)
+            {
+                fixtureType = fixtureAssembly.GetType(fixtureName+"Test", false, true);
+            }
             if (fixtureType != null)
             {
                 return Activator.CreateInstance(fixtureType);
@@ -114,7 +117,7 @@
             Resource hrefResource = resource.GetRelativeResource(href);
             var fixturePath = hrefResource.Path;
             var fixtureFullyQualifiedPath = fixturePath.Replace("\\", ".");
-            var fixtureName = fixtureFullyQualifiedPath.Replace(".html", "Test");
+            var fixtureName = fixtureFullyQualifiedPath.Replace(".html", "");
 
             if (fixtureName.StartsWith("."))
             {