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

[John Park West]

(1) Constructor call for the fixtures moved to ConcordionTestController (from ConcordionTestExplorer). Will avoid unwanted constructor calls when browsing the list of tests in tools like Icarus.
(2) ConcordionTestController to accept fixtures without "Test" at the end of the name.

[John Park West (john-park-west)]

correction for my description..
(2) ConcordionTestExplorer to accept fixtures without "Test" at the end of the name.

[[e-mail] (jeffreycameron)]

> correction for my description..
> (2) ConcordionTestExplorer to accept fixtures without "Test" at the end of the
> name.

Thanks muchly, incorporated the changes and pushed them up into the main branch. I'm a little sleepy tonight so I'll build and push these out tomorrow

=== modified file 'Gallio.ConcordionAdapter/Model/ConcordionTest.cs'
--- Gallio.ConcordionAdapter/Model/ConcordionTest.cs	2010-09-12 12:44:48 +0000
+++ Gallio.ConcordionAdapter/Model/ConcordionTest.cs	2010-09-16 09:38:07 +0000
@@ -42,7 +42,7 @@
         /// Gets or sets the fixture.
         /// </summary>
         /// <value>The fixture.</value>
-        public object Fixture
+        public Type FixtureType
         {
             get;
             private set;
@@ -79,9 +79,9 @@
         /// <param name="codeElement">The code element.</param>
         /// <param name="typeInfo">The type info.</param>
         /// <param name="resource">The resource.</param>
-        /// <param name="fixture">The fixture.</param>
+        /// <param name="fixtureType">The fixture type.</param>
      
-        public ConcordionTest(string name, ICodeElementInfo codeElement, ConcordionTypeInfoAdapter typeInfo, Resource resource, object fixture)
+        public ConcordionTest(string name, ICodeElementInfo codeElement, ConcordionTypeInfoAdapter typeInfo, Resource resource, Type fixtureType)
             : base(name, codeElement)
         {
             if (typeInfo == null)
@@ -89,7 +89,7 @@
 
             this.TypeInfo = typeInfo;
             this.Resource = resource;
-            this.Fixture = fixture;
+            this.FixtureType = fixtureType;
         } 
 
         #endregion

=== modified file 'Gallio.ConcordionAdapter/Model/ConcordionTestController.cs'
--- Gallio.ConcordionAdapter/Model/ConcordionTestController.cs	2010-09-12 12:44:48 +0000
+++ Gallio.ConcordionAdapter/Model/ConcordionTestController.cs	2010-09-16 09:38:07 +0000
@@ -75,7 +75,9 @@
                                     .WithSpecificationListener(new GallioResultRenderer())
                                     .Build();
 
-            var summary = concordion.Process(concordionTest.Resource, concordionTest.Fixture);
+            ConstructorInfo constructor = concordionTest.FixtureType.GetConstructor(Type.EmptyTypes);
+            var fixture=constructor.Invoke(new object[]{});
+            var summary = concordion.Process(concordionTest.Resource, fixture);
             bool passed = !(summary.HasFailures || summary.HasExceptions);
             testContext.AddAssertCount((int)summary.SuccessCount + (int)summary.FailureCount);
             return testContext.FinishStep(passed ? TestOutcome.Passed : TestOutcome.Failed, null);

=== modified file 'Gallio.ConcordionAdapter/Model/ConcordionTestExplorer.cs'
--- Gallio.ConcordionAdapter/Model/ConcordionTestExplorer.cs	2010-09-12 12:44:48 +0000
+++ Gallio.ConcordionAdapter/Model/ConcordionTestExplorer.cs	2010-09-16 09:38:07 +0000
@@ -168,11 +168,11 @@
 
         private ConcordionTest CreateTypeTest(ConcordionTypeInfoAdapter typeInfo)
         {
-            var fixture = CreateFixture(typeInfo.Target);
-            var resource = CreateResource(ExtrapolateResourcePath(fixture.GetType()));
+            var fixtureType = CreateFixtureType(typeInfo.Target);
+            var resource = CreateResource(ExtrapolateResourcePath(fixtureType));
 
-            var typeTest = new ConcordionTest(typeInfo.Target.Name, typeInfo.Target, typeInfo, resource, fixture);
-            typeTest.Source = new EmbeddedResourceSource(fixture.GetType().Assembly);
+            var typeTest = new ConcordionTest(typeInfo.Target.Name, typeInfo.Target, typeInfo, resource, fixtureType);
+            typeTest.Source = new EmbeddedResourceSource(fixtureType.Assembly);
             typeTest.Target = new FileTarget(_baseOutputDirectory.FullName);
             typeTest.Kind = TestKinds.Fixture;
             typeTest.IsTestCase = true;
@@ -185,7 +185,7 @@
             return typeTest;
         }
 
-        private object CreateFixture(ITypeInfo type)
+        private Type CreateFixtureType(ITypeInfo type)
         {
             var resolvedType = type.Resolve(false);
             if (resolvedType.IsClass)
@@ -194,7 +194,7 @@
 
                 if (constructor != null)
                 {
-                    return constructor.Invoke(new Object[] { });
+                    return resolvedType;
                 }
             }
 
@@ -205,8 +205,11 @@
         {
             var typeNamespace = type.Namespace;
             typeNamespace = typeNamespace.Replace(".", "\\");
-            var fileName = type.Name.Remove(type.Name.Length - 4);
-
+            var fileName = type.Name;
+            if (fileName.EndsWith("Test"))
+            {
+                fileName = fileName.Remove(fileName.Length - 4);
+            }
             return typeNamespace + "\\" + fileName + ".html";
         }