Concordion.NET

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

  1. update1
  2. Merge into 1.0
Proposed by John Park West
Status: Merged
Merged at revision: 78
Proposed branch: lp:~john-park-west/concordion-net/update1
Merge into: lp:concordion-net
Diff against target: 24 lines (+5/-2)
1 file modified
Concordion/Internal/Runner/DefaultConcordionRunner.cs (+5/-2)
To merge this branch: bzr merge lp:~john-park-west/concordion-net/update1
Reviewer Review Type Date Requested Status
jeffreycameron@gmail.com Pending
Review via email: mp+35938@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Concordion/Internal/Runner/DefaultConcordionRunner.cs'
2--- Concordion/Internal/Runner/DefaultConcordionRunner.cs 2009-05-23 11:51:58 +0000
3+++ Concordion/Internal/Runner/DefaultConcordionRunner.cs 2010-09-18 23:19:40 +0000
4@@ -100,7 +100,10 @@
5 {
6 var fixtureAssembly = fixture.GetType().Assembly;
7 var fixtureType = fixtureAssembly.GetType(fixtureName, false, true);
8-
9+ if (fixtureType == null)
10+ {
11+ fixtureType = fixtureAssembly.GetType(fixtureName+"Test", false, true);
12+ }
13 if (fixtureType != null)
14 {
15 return Activator.CreateInstance(fixtureType);
16@@ -114,7 +117,7 @@
17 Resource hrefResource = resource.GetRelativeResource(href);
18 var fixturePath = hrefResource.Path;
19 var fixtureFullyQualifiedPath = fixturePath.Replace("\\", ".");
20- var fixtureName = fixtureFullyQualifiedPath.Replace(".html", "Test");
21+ var fixtureName = fixtureFullyQualifiedPath.Replace(".html", "");
22
23 if (fixtureName.StartsWith("."))
24 {

Subscribers

People subscribed via source and target branches