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

[John Park West]

(1) New config "Builder" in Concordion.config to allow you to choose your own builder class instead of using ConcordionBuilder, this will allow you to specify your own derived class (if this config is not present it will default to ConcordionBuilder class.)
(2) Code for BaseInputDirectory allowing you to put html specs in different directory.

[lp:~john-park-west/concordion-net/builderconfig]

83. By John Park West on 2010-10-16

ConcordionTestExplorer to obtain full name ( otherwise unable to obtain the fullname in Gallio RunnerExtension and Teamcity build).

Unmerged revisions

83. By John Park West on 2010-10-16

ConcordionTestExplorer to obtain full name ( otherwise unable to obtain the fullname in Gallio RunnerExtension and Teamcity build).

82. By John Park West on 2010-09-29

removed use of xhtml namespace

81. By John Park West on 2010-09-26

Updates to allow user commands via new config "Builder" in Concordion.config and implemention of BaseInputDirectory

=== modified file 'Concordion.Spec/Concordion/Command/AssertEquals/ExceptionsTest.cs'
--- Concordion.Spec/Concordion/Command/AssertEquals/ExceptionsTest.cs	2009-04-18 17:22:05 +0000
+++ Concordion.Spec/Concordion/Command/AssertEquals/ExceptionsTest.cs	2010-10-16 22:42:45 +0000
@@ -9,7 +9,6 @@
     [ConcordionTest]
     public class ExceptionsTest
     {
-        string successCount;
 
         public object countsFromExecutingSnippetWithSimulatedEvaluationResult(string snippet, string simulatedResult)
         {

=== modified file 'Concordion.msbuild'
--- Concordion.msbuild	2010-09-12 13:10:47 +0000
+++ Concordion.msbuild	2010-10-16 22:42:45 +0000
@@ -70,14 +70,14 @@
   <ItemGroup>
     <ConcordionFiles Include="Concordion\bin\Release\Concordion.dll" />
     <ConcordionFiles Include="Concordion\bin\Release\Concordion.pdb" />
-    <!--<ConcordionFiles Include="Concordion\bin\Release\Concordion.xml" />-->
-    <ConcordionFiles Include="Concordion\bin\Release\Concordion.config" />
+
     <ConcordionFiles Include="Concordion\bin\Release\OGNL.dll" />
   </ItemGroup>
 
   <ItemGroup>
     <ConcordionSpecFiles Include="Concordion.Spec\bin\Release\Concordion.Spec.dll" />
     <ConcordionSpecFiles Include="Concordion.Spec\bin\Release\Concordion.Spec.pdb" />
+    <ConcordionSpecFiles Include="Concordion.Spec\bin\Release\Concordion.config" />
     <ConcordionSpecFiles Include="Concordion.Spec\bin\Release\Concordion.Spec.config" />
   </ItemGroup>
 
@@ -120,19 +120,34 @@
   </Target>
   
   <ItemGroup>
-    <TestAssemblies Include="Concordion.Spec\bin\Release\Concordion.Spec.dll" />
+    <ConcordionSpecAssemblies Include="Concordion.Spec\bin\Release\Concordion.Spec.dll" />
+    <ConcordionSpecConfigAssemblies Include="Concordion_Config.Spec\bin\Release\Concordion_Config.Spec.dll" />
     <Plugins Include="Gallio.ConcordionAdapter\bin\Release" />
   </ItemGroup>
 
+
+
   <Target Name="Test-Specs" DependsOnTargets="Staging">
-    <Gallio Files="@(TestAssemblies)"
-            PluginDirectories="@(Plugins)"
-            ReportDirectory="Reports"
-            WorkingDirectory="."
-            ReportTypes="XHtml"
-            ShowReports="false"
-            IgnoreFailures="true"
-            RunnerType="Local" />
+    <Gallio Files="@(ConcordionSpecAssemblies)"
+            PluginDirectories="@(Plugins)"
+            ReportDirectory="Reports"
+            WorkingDirectory="."
+            ReportTypes="XHtml"
+            ShowReports="false"
+            IgnoreFailures="true"
+            RunnerType="Local" />
+    <!--Tests 'Builder' config in Concordion.config and 'BaseInputDirectory' config in Concordion_Config.Spec.config-->
+    <Gallio Files="@(ConcordionSpecConfigAssemblies)"
+            PluginDirectories="@(Plugins)"
+            ReportDirectory="Reports"
+            WorkingDirectory="."
+            ReportTypes="XHtml"
+            ShowReports="false"
+            IgnoreFailures="true"
+            RunnerType="Local" />
+
+
+
   </Target>
 
   <Target Name="Package" DependsOnTargets="Test-Specs">

=== modified file 'Concordion.sln'
--- Concordion.sln	2009-05-18 19:18:24 +0000
+++ Concordion.sln	2010-10-16 22:42:45 +0000
@@ -9,6 +9,8 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gallio.ConcordionAdapter", "Gallio.ConcordionAdapter\Gallio.ConcordionAdapter.csproj", "{57D6B2E4-69A8-42A6-8220-AAE6EDFB902D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Concordion_Config.Spec", "Concordion_Config.Spec\Concordion_Config.Spec.csproj", "{A24F1363-9318-490D-9778-5E6B42EBBCFA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,6 +33,10 @@
 		{57D6B2E4-69A8-42A6-8220-AAE6EDFB902D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{57D6B2E4-69A8-42A6-8220-AAE6EDFB902D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{57D6B2E4-69A8-42A6-8220-AAE6EDFB902D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A24F1363-9318-490D-9778-5E6B42EBBCFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A24F1363-9318-490D-9778-5E6B42EBBCFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A24F1363-9318-490D-9778-5E6B42EBBCFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A24F1363-9318-490D-9778-5E6B42EBBCFA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

=== modified file 'Concordion/Internal/ClassNameBasedSpecificationLocator.cs'
--- Concordion/Internal/ClassNameBasedSpecificationLocator.cs	2010-09-23 03:04:34 +0000
+++ Concordion/Internal/ClassNameBasedSpecificationLocator.cs	2010-10-16 22:42:45 +0000
@@ -17,6 +17,7 @@
 using System.Linq;
 using System.Text;
 using Concordion.Api;
+using System.IO;
 
 namespace Concordion.Internal
 {
@@ -26,15 +27,21 @@
 
         public Resource LocateSpecification(object fixture)
         {
-            var fixtureName = fixture.GetType().ToString();
+            var fixtureType = fixture.GetType();
+            var fixtureName = fixtureType.ToString();
+            var assemblyName = fixtureType.Assembly.GetName().Name;
+            var specConfig = new SpecificationConfig().Load(fixtureType);
+            var specInputDirectory = specConfig.BaseInputDirectory;
+            if (specInputDirectory != Directory.GetCurrentDirectory())
+            {
+                fixtureName = fixtureName.Replace(assemblyName, assemblyName + "\\" + specInputDirectory);
+            }
             fixtureName = fixtureName.Replace(".", "\\");
             if (fixtureName.EndsWith("Test"))
             {
                 fixtureName = fixtureName.Remove(fixtureName.Length - 4);
             }
-
             var path = fixtureName + ".html";
-
             return new Resource(path);
         }
 

=== modified file 'Concordion/Internal/ConcordionBuilder.cs'
--- Concordion/Internal/ConcordionBuilder.cs	2009-05-08 12:54:38 +0000
+++ Concordion/Internal/ConcordionBuilder.cs	2010-10-16 22:42:45 +0000
@@ -276,7 +276,7 @@
         {
             RunCommand.Runners.Add("concordion", new DefaultConcordionRunner(Source, Target));
 
-            var config = new ConcordionConfig().Load();
+            var config = ConcordionConfig.Load();
 
             foreach (var runner in config.Runners)
             {

=== modified file 'Concordion/Internal/ConcordionConfig.cs'
--- Concordion/Internal/ConcordionConfig.cs	2009-05-08 12:54:38 +0000
+++ Concordion/Internal/ConcordionConfig.cs	2010-10-16 22:42:45 +0000
@@ -27,6 +27,8 @@
     /// </summary>
     public class ConcordionConfig
     {
+        private static Dictionary<string, ConcordionConfig> configs = new Dictionary<string, ConcordionConfig>();
+
         #region Properties
         
         /// <summary>
@@ -37,7 +39,13 @@
         {
             get;
             set;
-        } 
+        }
+
+        public Type BuilderType
+        {
+            get;
+            set;
+        }
 
         #endregion
 
@@ -46,9 +54,10 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="ConcordionConfig"/> class.
         /// </summary>
-        public ConcordionConfig()
+        private ConcordionConfig()
         {
             Runners = new Dictionary<string, IRunner>();
+            BuilderType = typeof(ConcordionBuilder);
         } 
 
         #endregion
@@ -58,12 +67,39 @@
         /// <summary>
         /// Loads this instance.
         /// </summary>
-        public ConcordionConfig Load()
+        public static ConcordionConfig Load()
         {
+            /*
             var defaultConfigFile = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + @"\Concordion.config";
-            Load(defaultConfigFile);
-
-            return this;
+           
+            ConcordionConfig config;
+            configs.TryGetValue(defaultConfigFile, out config);
+            if (config == null)
+            {
+                config = new ConcordionConfig();
+                config.Load(defaultConfigFile);
+                configs.Add(defaultConfigFile, config);
+            }
+            //Load(defaultConfigFile);
+            return config;
+             */
+            return Load(Assembly.GetExecutingAssembly());
+        }
+
+        public static ConcordionConfig Load(Assembly assembly)
+        {
+            var defaultConfigFile = Path.GetDirectoryName(assembly.Location) + @"\Concordion.config";
+
+            ConcordionConfig config;
+            configs.TryGetValue(defaultConfigFile, out config);
+            if (config == null)
+            {
+                config = new ConcordionConfig();
+                config.Load(defaultConfigFile);
+                configs.Add(defaultConfigFile, config);
+            }
+            //Load(defaultConfigFile);
+            return config;
         }
 
         /// <summary>

=== modified file 'Concordion/Internal/ConcordionConfigParser.cs'
--- Concordion/Internal/ConcordionConfigParser.cs	2009-05-08 12:54:38 +0000
+++ Concordion/Internal/ConcordionConfigParser.cs	2010-10-16 22:42:45 +0000
@@ -77,6 +77,7 @@
             if (configElement.Name == "Concordion")
             {
                 LoadRunners(configElement);
+                LoadBuilder(configElement);
             }
         }
 
@@ -110,7 +111,34 @@
                     }
                 }
             }
-        } 
+        }
+
+        private void LoadBuilder(XElement element)
+        {
+            var builder = element.Element("Builder");
+            if (builder != null)
+            {
+                var builderTypeText = builder.Attribute("type");
+                if (builderTypeText != null)
+                {
+                    Type builderType = Type.GetType(builderTypeText.Value);
+                    //var builderObject = Activator.CreateInstance(builderTypeText);
+                    if (builderType != null)
+                    {
+                        Config.BuilderType = builderType;
+                    }
+                    else
+                    {
+                        throw new ApplicationException("Invalid Builder type [" + builderTypeText.Value + "]");
+                    }
+
+                }
+                else
+                {
+                    throw new ApplicationException("No 'type' specified for the builder");
+                }
+            }
+        }
 
         #endregion
     }

=== modified file 'Concordion/Internal/Runner/DefaultConcordionRunner.cs'
--- Concordion/Internal/Runner/DefaultConcordionRunner.cs	2010-09-18 23:09:52 +0000
+++ Concordion/Internal/Runner/DefaultConcordionRunner.cs	2010-10-16 22:42:45 +0000
@@ -19,6 +19,7 @@
 using Concordion.Api;
 using System.Text.RegularExpressions;
 using System.Reflection;
+using System.IO;
 
 namespace Concordion.Internal.Runner
 {
@@ -64,9 +65,14 @@
 
         public RunnerResult Execute(object callingFixture, Resource resource, string href)
         {
-            var runnerFixture = GetFixture(resource, href, callingFixture);
-
-            var concordion = new ConcordionBuilder()
+            var callingFixtureType = callingFixture.GetType();
+            var callingFixtureAssembly = callingFixtureType.Assembly;
+            var specConfig = new SpecificationConfig().Load(callingFixtureType);
+            var runnerFixture = GetFixture(specConfig, resource, href, callingFixtureAssembly, callingFixture);
+            ConcordionConfig concordionConfig = ConcordionConfig.Load(callingFixtureAssembly);
+            var builderType = concordionConfig.BuilderType;
+            ConcordionBuilder builder = CreateConcordionBuilder(builderType);
+            var concordion = builder
                                         .WithSource(Source)
                                         .WithTarget(Target)
                                         .Build();
@@ -90,15 +96,21 @@
 		    return new RunnerResult(result);
         }
 
-        private static object GetFixture(Resource resource, string href, object callingFixture)
-        {
-            var fixtureName = GetNameOfFixtureToRun(resource, href);
-            return GetFixtureToRun(callingFixture, fixtureName);
-        }
-
-        private static object GetFixtureToRun(object fixture, string fixtureName)
-        {
-            var fixtureAssembly = fixture.GetType().Assembly;
+        private ConcordionBuilder CreateConcordionBuilder(Type builderType)
+        {
+            ConstructorInfo constructor = builderType.GetConstructor(Type.EmptyTypes);
+            var builder = constructor.Invoke(new object[] { }) as ConcordionBuilder;
+            return builder;
+        }
+
+        private static object GetFixture(SpecificationConfig specConfig, Resource resource, string href, Assembly fixtureAssembly,object callingFixture)
+        {
+            var fixtureName = GetNameOfFixtureToRun(specConfig,fixtureAssembly,resource, href);
+            return GetFixtureToRun(fixtureAssembly, fixtureName);
+        }
+
+        private static object GetFixtureToRun(Assembly fixtureAssembly, string fixtureName)
+        {
             var fixtureType = fixtureAssembly.GetType(fixtureName, false, true);
             if (fixtureType == null)
             {
@@ -112,10 +124,18 @@
             return null;
         }
 
-        private static string GetNameOfFixtureToRun(Resource resource, string href)
+        private static string GetNameOfFixtureToRun(SpecificationConfig specConfig,Assembly fixtureAssembly,Resource resource, string href)
         {
             Resource hrefResource = resource.GetRelativeResource(href);
             var fixturePath = hrefResource.Path;
+            var specInputDirectory=specConfig.BaseInputDirectory;
+            var assemblyNameWithSlashes = fixtureAssembly.GetName().Name.Replace(".", "\\");
+            
+            if (specInputDirectory != Directory.GetCurrentDirectory())
+            {
+                fixturePath = fixturePath.Replace(assemblyNameWithSlashes + "\\" + specInputDirectory, assemblyNameWithSlashes);
+            }
+
             var fixtureFullyQualifiedPath = fixturePath.Replace("\\", ".");
             var fixtureName = fixtureFullyQualifiedPath.Replace(".html", "");
 

=== modified file 'Concordion/Internal/SpecificationConfig.cs'
--- Concordion/Internal/SpecificationConfig.cs	2009-05-23 11:51:58 +0000
+++ Concordion/Internal/SpecificationConfig.cs	2010-10-16 22:42:45 +0000
@@ -49,6 +49,12 @@
             set;
         }
 
+        public bool ConfigFileFound
+        {
+            get;
+            set;
+        }
+
         #endregion
 
         #region Constructors
@@ -57,6 +63,7 @@
         {
             this.BaseInputDirectory = Directory.GetCurrentDirectory();
             this.BaseOutputDirectory = Environment.GetEnvironmentVariable("TEMP");
+            this.ConfigFileFound = false;
         }
 
         #endregion
@@ -95,6 +102,7 @@
             var configFileName = pathToAssembly.Replace(".dll", ".config");
             if (File.Exists(configFileName))
             {
+                ConfigFileFound = true;
                 var specificationConfigParser = new SpecificationConfigParser(this);
                 specificationConfigParser.Parse(new StreamReader(configFileName));
             }

=== modified file 'Concordion/Properties/AssemblyInfo.cs'
--- Concordion/Properties/AssemblyInfo.cs	2010-09-12 12:44:48 +0000
+++ Concordion/Properties/AssemblyInfo.cs	2010-10-16 22:42:45 +0000
@@ -22,7 +22,5 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(true)]
 [assembly: Guid("923eb1d8-0d6a-4a05-896c-16f127f2944f")]
-[assembly: AssemblyVersion("0.1.99.9999")]
-[assembly: AssemblyFileVersion("0.1.99.9999")]
 
 

=== added directory 'Concordion_Config.Spec'
=== added directory 'Concordion_Config.Spec/Builder'
=== added file 'Concordion_Config.Spec/Builder/ExtendedBuilder.cs'
--- Concordion_Config.Spec/Builder/ExtendedBuilder.cs	1970-01-01 00:00:00 +0000
+++ Concordion_Config.Spec/Builder/ExtendedBuilder.cs	2010-10-16 22:42:45 +0000
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Concordion.Internal;
+using Concordion_Config.Spec.Command;
+
+namespace Concordion_Config.Spec.Builder
+{
+    public class ExtendedBuilder : ConcordionBuilder
+    {
+        private string EXTENSION_COMMAND_NAMESPACE = "http://www.fictioushostname.abc/2007/extension-commands";
+
+        public ExtendedBuilder()
+        {
+            WithCommand(EXTENSION_COMMAND_NAMESPACE, "bannedword", new BannedWordCommand());
+            WithCommand(EXTENSION_COMMAND_NAMESPACE, "screenshot", new ScreenshotCommand());
+
+        }
+    }
+}

=== added directory 'Concordion_Config.Spec/Command'
=== added file 'Concordion_Config.Spec/Command/BannedWordCommand.cs'
--- Concordion_Config.Spec/Command/BannedWordCommand.cs	1970-01-01 00:00:00 +0000
+++ Concordion_Config.Spec/Command/BannedWordCommand.cs	2010-10-16 22:42:45 +0000
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Concordion.Internal.Commands;
+using Concordion.Api;
+using Concordion.Internal;
+using Concordion.Internal.Util;
+using System.Data;
+using System.Text.RegularExpressions;
+using System.Reflection;
+
+namespace Concordion_Config.Spec.Command
+{
+    public class BannedWordCommand : AbstractCommand
+    {
+        public override void Execute(CommandCall commandCall, IEvaluator evaluator, IResultRecorder resultRecorder) 
+        {
+            String commandName = GetType().Name;
+            Check.IsFalse(commandCall.HasChildCommands, "Nesting commands inside a '" + commandName + "' is not supported");
+            var evalString=commandCall.Expression;
+            Element element = commandCall.Element;
+            Check.NotNull(evalString, "The " + commandName + " attribute must be set for an element containing " + commandName);
+       
+            object fixture = evaluator.Fixture;
+            MethodInfo theMethod = fixture.GetType().GetMethod(evalString, new Type[] { typeof(string) });
+            if (theMethod == null)
+            {
+                throw new Exception("Fixture: " + fixture.GetType().FullName + " does not contain method named [" + evalString + "(string)]");
+            }
+            object result=theMethod.Invoke(fixture,new object[]{element.Text});
+            if (result == null)
+            {
+                element.AddStyleClass("success");
+                resultRecorder.Record(Result.Success);
+                return;
+            }
+            String bannedWord = result as String;
+            if (bannedWord == null)
+            {
+                throw new Exception("Method method named [" + evalString + "(string)] in " + fixture.GetType().FullName + " did not return string");
+            }
+            else
+            {
+                element.AddStyleClass("failure");
+                resultRecorder.Record(Result.Failure);
+                Element span=new Element("span");
+                span.AddStyleClass("commentary");
+                span.AppendText("Banned word ["+bannedWord+"] used");
+                element.AppendChild(span);
+            }
+       
+        }
+
+        public override void Setup(CommandCall commandCall, IEvaluator evaluator, IResultRecorder resultRecorder) { }
+        public  override void Verify(CommandCall commandCall, IEvaluator evaluator, IResultRecorder resultRecorder) { }
+    }
+}

=== added file 'Concordion_Config.Spec/Command/ScreenshotCommand.cs'
--- Concordion_Config.Spec/Command/ScreenshotCommand.cs	1970-01-01 00:00:00 +0000
+++ Concordion_Config.Spec/Command/ScreenshotCommand.cs	2010-10-16 22:42:45 +0000
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Concordion.Internal.Commands;
+using Concordion.Internal;
+using Concordion.Api;
+using Concordion.Internal.Util;
+using System.IO;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Windows.Forms;
+
+namespace Concordion_Config.Spec.Command
+{
+    public class ScreenshotCommand : AbstractCommand
+    {
+        public override void Execute(CommandCall commandCall, IEvaluator evaluator, IResultRecorder resultRecorder)
+        {
+            object fixture = evaluator.Fixture;
+            Element element = commandCall.Element;
+            String fileName = commandCall.Expression;
+            Check.NotEmpty(fileName, "fileName cannot be null");
+            Resource res = commandCall.Resource;
+            var p=new SpecificationConfig().Load(fixture.GetType().Assembly);
+            var directoryPath = Path.Combine(p.BaseOutputDirectory, StripLeadingBackslash(res.Parent.Path));
+            DirectoryInfo directoryInfo = new DirectoryInfo(directoryPath);
+            if (!directoryInfo.Exists)
+            {
+                Directory.CreateDirectory(directoryPath);
+            }
+            var imageFileName = Path.Combine(directoryPath, fileName);
+            var size=CaptureDesktop(imageFileName);
+            Element imgElement = new Element("img");
+            imgElement.AddAttribute("src", fileName);
+            imgElement.AddAttribute("width", Convert.ToString(size.Width));
+            imgElement.AddAttribute("height", Convert.ToString(size.Height));
+            element.AppendChild(imgElement);
+        }
+
+
+        private static string StripLeadingBackslash(string path)
+        {
+            var strippedPath = path;
+            if (strippedPath.StartsWith("\\"))
+            {
+                strippedPath = strippedPath.Remove(0, 1);
+            }
+            return strippedPath;
+        }
+
+        
+
+        private Size CaptureDesktop(string imageFileName)
+        {
+            Bitmap screenshot = new Bitmap(Screen.PrimaryScreen.Bounds.Width, Screen.PrimaryScreen.Bounds.Height, PixelFormat.Format32bppArgb);
+            Graphics gfxScreenshot = Graphics.FromImage(screenshot);
+            gfxScreenshot.CopyFromScreen(Screen.PrimaryScreen.Bounds.X, Screen.PrimaryScreen.Bounds.Y, 0, 0, Screen.PrimaryScreen.Bounds.Size, CopyPixelOperation.SourceCopy);
+            screenshot.Save(imageFileName, ImageFormat.Jpeg);
+            var size=screenshot.Size;
+            gfxScreenshot.Dispose();
+            screenshot.Dispose();
+            return size;
+
+        }
+
+        public override void Setup(CommandCall commandCall, IEvaluator evaluator, IResultRecorder resultRecorder) { }
+        public override void Verify(CommandCall commandCall, IEvaluator evaluator, IResultRecorder resultRecorder) { }
+    }
+}

=== added file 'Concordion_Config.Spec/Concordion.config'
--- Concordion_Config.Spec/Concordion.config	1970-01-01 00:00:00 +0000
+++ Concordion_Config.Spec/Concordion.config	2010-10-16 22:42:45 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Concordion>
+  <Builder type="Concordion_Config.Spec.Builder.ExtendedBuilder, Concordion_Config.Spec, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
+</Concordion>
\ No newline at end of file

=== added file 'Concordion_Config.Spec/Concordion_Config.Spec.config'
--- Concordion_Config.Spec/Concordion_Config.Spec.config	1970-01-01 00:00:00 +0000
+++ Concordion_Config.Spec/Concordion_Config.Spec.config	2010-10-16 22:42:45 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Specification>
+  <BaseInputDirectory path="Spec" />
+  <BaseOutputDirectory path="Spec-Output" />
+</Specification>
\ No newline at end of file

=== added file 'Concordion_Config.Spec/Concordion_Config.Spec.csproj'
--- Concordion_Config.Spec/Concordion_Config.Spec.csproj	1970-01-01 00:00:00 +0000
+++ Concordion_Config.Spec/Concordion_Config.Spec.csproj	2010-10-16 22:42:45 +0000
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A24F1363-9318-490D-9778-5E6B42EBBCFA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Concordion_Config.Spec</RootNamespace>
+    <AssemblyName>Concordion_Config.Spec</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Gallio, Version=3.2.0.0, Culture=neutral, PublicKeyToken=eb9cfa67ee6ab36e, processorArchitecture=MSIL" />
+    <Reference Include="MbUnit, Version=3.2.0.0, Culture=neutral, PublicKeyToken=eb9cfa67ee6ab36e, processorArchitecture=MSIL" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Builder\ExtendedBuilder.cs" />
+    <Compile Include="Command\ScreenshotCommand.cs" />
+    <Compile Include="CustomCommand\AbstractFixture.cs" />
+    <Compile Include="Command\BannedWordCommand.cs" />
+    <Compile Include="CustomCommand\CustomCommands.cs" />
+    <Compile Include="CustomCommand\Run.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Concordion.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Concordion_Config.Spec.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Concordion\Concordion.csproj">
+      <Project>{F401D347-5762-49DA-B7DF-4C6C9E79E08A}</Project>
+      <Name>Concordion</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Spec\CustomCommand\CustomCommands.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Spec\CustomCommand\Run.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="concordion.css">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file

=== added directory 'Concordion_Config.Spec/CustomCommand'
=== added file 'Concordion_Config.Spec/CustomCommand/AbstractFixture.cs'
--- Concordion_Config.Spec/CustomCommand/AbstractFixture.cs	1970-01-01 00:00:00 +0000
+++ Concordion_Config.Spec/CustomCommand/AbstractFixture.cs	2010-10-16 22:42:45 +0000
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Concordion_Config.Spec.CustomCommand
+{
+    public class AbstractFixture
+    {
+        public string BannedWordCheckerMethod(string text)
+        {
+            string[] bannedwords = new string[] { "click", "doubleClick" };
+            foreach (string word in bannedwords)
+            {
+                if (text.Contains(word))
+                {
+                    return word;
+                }
+            }
+            return null;
+        }
+    }
+}

=== added file 'Concordion_Config.Spec/CustomCommand/CustomCommands.cs'
--- Concordion_Config.Spec/CustomCommand/CustomCommands.cs	1970-01-01 00:00:00 +0000
+++ Concordion_Config.Spec/CustomCommand/CustomCommands.cs	2010-10-16 22:42:45 +0000
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Concordion.Integration;
+
+
+namespace Concordion_Config.Spec.CustomCommand
+{
+    [ConcordionTest]
+    public class CustomCommands : AbstractFixture
+    {
+        
+    }
+}

=== added file 'Concordion_Config.Spec/CustomCommand/Run.cs'
--- Concordion_Config.Spec/CustomCommand/Run.cs	1970-01-01 00:00:00 +0000
+++ Concordion_Config.Spec/CustomCommand/Run.cs	2010-10-16 22:42:45 +0000
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Concordion.Integration;
+
+namespace Concordion_Config.Spec.CustomCommand
+{
+    [ConcordionTest]
+    public class Run : AbstractFixture
+    {
+    }
+}

=== added directory 'Concordion_Config.Spec/Properties'
=== added file 'Concordion_Config.Spec/Properties/AssemblyInfo.cs'
--- Concordion_Config.Spec/Properties/AssemblyInfo.cs	1970-01-01 00:00:00 +0000
+++ Concordion_Config.Spec/Properties/AssemblyInfo.cs	2010-10-16 22:42:45 +0000
@@ -0,0 +1,38 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Concordion.Integration;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Concordion-Config.Spec")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Concordion-Config.Spec")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("7250c3b4-df8a-4ea8-a254-9c80edc3299b")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: ConcordionAssembly]
\ No newline at end of file

=== added directory 'Concordion_Config.Spec/Spec'
=== added directory 'Concordion_Config.Spec/Spec/CustomCommand'
=== added file 'Concordion_Config.Spec/Spec/CustomCommand/CustomCommands.html'
--- Concordion_Config.Spec/Spec/CustomCommand/CustomCommands.html	1970-01-01 00:00:00 +0000
+++ Concordion_Config.Spec/Spec/CustomCommand/CustomCommands.html	2010-10-16 22:42:45 +0000
@@ -0,0 +1,22 @@
+<html xmlns:concordion="http://www.concordion.org/2007/concordion"
+xmlns:extension-commands="http://www.fictioushostname.abc/2007/extension-commands" >
+    <head>
+        <link href="../../concordion.css" rel="stylesheet" type="text/css" />
+		<title>Custom Commands</title>
+	</head>
+	<body>
+         <h1>Custom Commands Example</h1>
+         <p />
+
+         (1) A simple command to check if the text contains any banned words.
+         <p />
+         A simple command to ensure the words nested inside the elements don't contain any agreed banned words (for the example below the banned words are "click" and "doubleClick" ).
+         <p />
+	    <span extension-commands:bannedword="BannedWordCheckerMethod" >Don't mention the cli*k word, otherwise, this will fail!</span>
+        <p />
+
+        (2) A command to take the screenshot of the desktop (this is the port of the Java Concordion screenshot command see http://github.com/talios/concordion-examples ).
+        <p />
+        <div extension-commands:screenshot="output.jpg"></div>
+	</body>
+</html>
\ No newline at end of file

=== added file 'Concordion_Config.Spec/Spec/CustomCommand/Run.html'
--- Concordion_Config.Spec/Spec/CustomCommand/Run.html	1970-01-01 00:00:00 +0000
+++ Concordion_Config.Spec/Spec/CustomCommand/Run.html	2010-10-16 22:42:45 +0000
@@ -0,0 +1,10 @@
+<html xmlns:concordion="http://www.concordion.org/2007/concordion"
+xmlns:extension-commands="http://www.fictioushostname.abc/2007/extension-commands" >
+    <head>
+        <link href="../../concordion.css" rel="stylesheet" type="text/css" />
+		<title>Custom Commands Via The Run Command</title>
+	</head>
+	<body>
+        <a concordion:run="concordion" href="CustomCommands.html">Custom Commands</a>
+	</body>
+</html>
\ No newline at end of file

=== added file 'Concordion_Config.Spec/concordion.css'
--- Concordion_Config.Spec/concordion.css	1970-01-01 00:00:00 +0000
+++ Concordion_Config.Spec/concordion.css	2010-10-16 22:42:45 +0000
@@ -0,0 +1,81 @@
+* {
+  font-family: Arial;
+}
+body {
+  padding: 32px;  
+}
+pre {
+  padding: 6px 28px 6px 28px;
+  background-color: #E8EEF7;
+}
+pre, pre *, code, kbd {
+  font-family: Courier New, Courier;
+  font-size: 10pt;
+}
+h1, h1 * {
+  font-size: 24pt;	
+}
+p, td, th, li, .breadcrumbs {
+  font-size: 10pt;
+}
+p, li {
+  line-height: 140%;
+}
+table {
+  border-collapse: collapse;
+  empty-cells: show;
+  margin: 8px 0px 8px 0px;
+}
+th, td {
+  border: 1px solid black;
+  padding: 3px;
+}
+td {
+  background-color: white;
+  vertical-align: top;
+}
+th {
+  background-color: #C3D9FF;
+}
+li {
+  margin-top: 6px;
+  margin-bottom: 6px; 
+}
+
+
+.example {
+  padding: 2px 12px 6px 12px;
+  border: 1px solid #C3D9FF;
+  margin: 6px 0px 28px 0px;
+  background-color: #F5F9FD;
+}
+.example h3 {
+  margin-top: 8px;
+  margin-bottom: 8px;
+  font-size: 12pt;
+}
+
+.special {
+  font-style: italic;
+}
+
+.idea {
+  font-size: 9pt;
+  color: #888;
+  font-style: italic;	
+}
+.tight li {
+  margin-top: 1px;
+  margin-bottom: 1px; 
+}
+.commentary {
+  float: right;
+  width: 200px;
+  background-color: #ffffd0;
+  padding:8px;
+  border: 3px solid #eeeeb0;	 
+  margin: 10px 0px 10px 10px;	 
+}
+.commentary, .commentary * {
+  font-size: 8pt;
+}
\ No newline at end of file

=== modified file 'Gallio.ConcordionAdapter/Model/ConcordionTest.cs'
--- Gallio.ConcordionAdapter/Model/ConcordionTest.cs	2010-09-16 09:10:09 +0000
+++ Gallio.ConcordionAdapter/Model/ConcordionTest.cs	2010-10-16 22:42:45 +0000
@@ -104,23 +104,5 @@
          */
 
         #endregion
-
-        //#region Override Methods
-
-        /// <summary>
-        /// Gets the test controller factory.
-        /// </summary>
-        /// <value>The test controller factory.</value>
-        /*
-        public override Gallio.Common.Func<ITestController> TestControllerFactory
-        {
-            get
-            {
-                return CreateTestController;
-            }
-        } 
-         */
-
-       // #endregion
     }
 }

=== modified file 'Gallio.ConcordionAdapter/Model/ConcordionTestController.cs'
--- Gallio.ConcordionAdapter/Model/ConcordionTestController.cs	2010-09-16 09:10:09 +0000
+++ Gallio.ConcordionAdapter/Model/ConcordionTestController.cs	2010-10-16 22:42:45 +0000
@@ -25,6 +25,7 @@
     /// </summary>
     public class ConcordionTestController : TestController
     {
+
         /// <inheritdoc />
         protected override TestResult RunImpl(ITestCommand rootTestCommand, TestStep parentTestStep, TestExecutionOptions options, IProgressMonitor progressMonitor)
         {
@@ -67,9 +68,25 @@
         private static TestResult RunTestFixture(ITestCommand testCommand, ConcordionTest concordionTest, TestStep parentTestStep)
         {
             ITestContext testContext = testCommand.StartPrimaryChildStep(parentTestStep);
-            
             // The magic happens here!
-            var concordion = new ConcordionBuilder()
+            Type builderType=null;
+            try
+            {
+                ConcordionConfig concordionConfig = ConcordionConfig.Load(concordionTest.FixtureType.Assembly);
+                builderType = concordionConfig.BuilderType;
+            }
+            catch (Exception e)
+            {
+                testContext.LogWriter.ConsoleError.WriteLine(e.Message);
+                testContext.LogWriter.ConsoleError.WriteLine(e.StackTrace);
+                return testContext.FinishStep(TestOutcome.Error, null);
+            }
+            ConcordionBuilder builder = CreateConcordionBuilder(builderType);
+            if (builder == null)
+            {
+                return testContext.FinishStep(TestOutcome.Error, null);
+            }
+            var concordion = builder
                                     .WithSource(concordionTest.Source)
                                     .WithTarget(concordionTest.Target)
                                     .WithSpecificationListener(new GallioResultRenderer())
@@ -83,6 +100,13 @@
             return testContext.FinishStep(passed ? TestOutcome.Passed : TestOutcome.Failed, null);
         }
 
+        private static ConcordionBuilder CreateConcordionBuilder(Type builderType)
+        {
+            ConstructorInfo constructor = builderType.GetConstructor(Type.EmptyTypes);
+            var builder = constructor.Invoke(new object[] { }) as ConcordionBuilder;
+            return builder;
+        }
+
         private static TestResult RunChildTests(ITestCommand testCommand, TestStep parentTestStep, IProgressMonitor progressMonitor)
         {
             ITestContext testContext = testCommand.StartPrimaryChildStep(parentTestStep);

=== modified file 'Gallio.ConcordionAdapter/Model/ConcordionTestExplorer.cs'
--- Gallio.ConcordionAdapter/Model/ConcordionTestExplorer.cs	2010-09-16 09:10:09 +0000
+++ Gallio.ConcordionAdapter/Model/ConcordionTestExplorer.cs	2010-10-16 22:42:45 +0000
@@ -39,16 +39,16 @@
         {
 
             IAssemblyInfo assembly = ReflectionUtils.GetAssembly(codeElement);
+            var specConfig = GetSpecificationConfig(assembly);
             Version frameworkVersion = GetFrameworkVersion(assembly);
             if (frameworkVersion != null)
             {
                 ITypeInfo type = ReflectionUtils.GetType(codeElement);
-                Test assemblyTest = GetAssemblyTest(assembly, TestModel.RootTest, frameworkVersion, type == null);
+                Test assemblyTest = GetAssemblyTest(assembly, TestModel.RootTest, frameworkVersion, type == null, specConfig);
                 if (type != null)
                 {
-                    TryGetTypeTest(type, assemblyTest);
+                    TryGetTypeTest(type, assemblyTest, specConfig);
                 }
-
             }
         }
 
@@ -78,7 +78,7 @@
             return false;
         }
 
-        private Test GetAssemblyTest(IAssemblyInfo assembly, Test parentTest, Version frameworkVersion, bool populateRecursively)
+        private Test GetAssemblyTest(IAssemblyInfo assembly, Test parentTest, Version frameworkVersion, bool populateRecursively, SpecificationConfig specConfig)
         {
             Test assemblyTest;
             if (!assemblyTests.TryGetValue(assembly, out assemblyTest))
@@ -94,21 +94,24 @@
                 assemblyTests.Add(assembly, assemblyTest);
             }
 
-            GetInputOutputDirectories(assembly);
-
             if (populateRecursively)
             {
                 foreach (var type in assembly.GetExportedTypes())
-                    TryGetTypeTest(type, assemblyTest);
+                    TryGetTypeTest(type, assemblyTest,specConfig);
             }
 
             return assemblyTest;
         }
 
-        private void GetInputOutputDirectories(IAssemblyInfo assembly)
+        private SpecificationConfig GetSpecificationConfig(IAssemblyInfo assembly)
         {
-            var config = new SpecificationConfig().Load(assembly.Resolve(false));
-
+            var assemblyPath=assembly.Resolve(false);
+            var config = new SpecificationConfig().Load(assemblyPath);
+            if (!config.ConfigFileFound)
+            {
+                TestModel.AddAnnotation(new Annotation(AnnotationType.Info,assembly,"No specification config file found for assembly ["+assemblyPath+"], will use default settings"));
+            }
+            /*
             var baseInputDirectoryInfo = new DirectoryInfo(config.BaseInputDirectory);
             if (baseInputDirectoryInfo.Exists)
             {
@@ -117,7 +120,7 @@
             {
                TestModel.AddAnnotation(new Annotation(AnnotationType.Error, assembly, String.Format("The Base Input Directory {0} does not exist, reverting to default", config.BaseInputDirectory)));
             }
-
+            */
             var baseOutputDirectoryInfo = new DirectoryInfo(config.BaseOutputDirectory);
             this._baseOutputDirectory = baseOutputDirectoryInfo;
 
@@ -125,6 +128,7 @@
             {
                 Directory.CreateDirectory(_baseOutputDirectory.FullName);
             }
+            return config;
         }
 
 
@@ -136,7 +140,7 @@
             return assemblyTest;
         }
 
-        private Test TryGetTypeTest(ITypeInfo type, Test assemblyTest)
+        private Test TryGetTypeTest(ITypeInfo type, Test assemblyTest, SpecificationConfig specConfig)
         {
             Test typeTest;
             if (!typeTests.TryGetValue(type, out typeTest))
@@ -147,7 +151,7 @@
                     {
                         if (attribute is ConcordionTestAttribute)
                         {
-                            typeTest = CreateTypeTest(new ConcordionTypeInfoAdapter(type));
+                            typeTest = CreateTypeTest(new ConcordionTypeInfoAdapter(type),specConfig);
                             break;
                         }
                     }
@@ -166,12 +170,12 @@
             return typeTest;
         }
 
-        private ConcordionTest CreateTypeTest(ConcordionTypeInfoAdapter typeInfo)
+        private ConcordionTest CreateTypeTest(ConcordionTypeInfoAdapter typeInfo, SpecificationConfig specConfig)
         {
             var fixtureType = CreateFixtureType(typeInfo.Target);
-            var resource = CreateResource(ExtrapolateResourcePath(fixtureType));
+            var resource = CreateResource(ExtrapolateResourcePath(specConfig.BaseInputDirectory,fixtureType,typeInfo.Target));
 
-            var typeTest = new ConcordionTest(typeInfo.Target.Name, typeInfo.Target, typeInfo, resource, fixtureType);
+            var typeTest = new ConcordionTest(typeInfo.Target.FullName, typeInfo.Target, typeInfo, resource, fixtureType);
             typeTest.Source = new EmbeddedResourceSource(fixtureType.Assembly);
             typeTest.Target = new FileTarget(_baseOutputDirectory.FullName);
             typeTest.Kind = TestKinds.Fixture;
@@ -201,9 +205,22 @@
             throw new InvalidOperationException("Cannot create the fixture");
         }
 
-        private string ExtrapolateResourcePath(Type type)
+        private string ExtrapolateResourcePath(string specInputDirectory,Type type, ITypeInfo typeInfo)
         {
             var typeNamespace = type.Namespace;
+            var assemblyName=type.Assembly.GetName().Name;
+
+            if (specInputDirectory != Directory.GetCurrentDirectory())
+            {
+                if (!typeNamespace.Contains(assemblyName))
+                {
+                    TestModel.AddAnnotation(new Annotation(AnnotationType.Warning, typeInfo, "The assembly name [" + assemblyName + "] does not appear in the namespace for type [" + type.FullName + "]"));
+                }
+                else
+                {
+                    typeNamespace = typeNamespace.Replace(assemblyName, assemblyName + "\\" + specInputDirectory);
+                }
+            }
             typeNamespace = typeNamespace.Replace(".", "\\");
             var fileName = type.Name;
             if (fileName.EndsWith("Test"))