[Fat-develop] FAT/src/FAT.Web Default.aspx,1.3,1.4 Default.aspx.cs,1.3,1.4 DefaultPageModel.cs,1.6,1.7

[<dmc...@us...>]

Update of /cvsroot/fat/FAT/src/FAT.Web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6233/src/FAT.Web

Modified Files:
	Default.aspx Default.aspx.cs DefaultPageModel.cs 
Log Message:
Fixtures TextBox has been changed to a DropDownList containing the names of all FATFixtures in the configured assemblies

Index: Default.aspx
===================================================================
RCS file: /cvsroot/fat/FAT/src/FAT.Web/Default.aspx,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Default.aspx	28 Jan 2004 22:14:48 -0000	1.3
--- Default.aspx	7 Feb 2004 18:11:32 -0000	1.4
***************
*** 23,27 ****
  				<tr>
  					<td><asp:Label id="fixtureLabel" Runat="server">Fixture: </asp:Label></td>
! 					<td><asp:TextBox id="fixture" runat="server" Width="500" /></td>
  					<td><asp:Label ID="fixtureWarning" Runat="server">*</asp:Label></td>
  				</tr>
--- 23,27 ----
  				<tr>
  					<td><asp:Label id="fixtureLabel" Runat="server">Fixture: </asp:Label></td>
! 					<td><asp:DropDownList ID="fixture" Runat="server" Width="500" /></td>
  					<td><asp:Label ID="fixtureWarning" Runat="server">*</asp:Label></td>
  				</tr>

Index: Default.aspx.cs
===================================================================
RCS file: /cvsroot/fat/FAT/src/FAT.Web/Default.aspx.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Default.aspx.cs	28 Jan 2004 22:14:48 -0000	1.3
--- Default.aspx.cs	7 Feb 2004 18:11:32 -0000	1.4
***************
*** 9,13 ****
  	{
  		protected TextBox testName;
- 		protected TextBox fixture;
  		protected TextBox test;
  		protected TextBox setup;
--- 9,12 ----
***************
*** 15,33 ****
  		protected Label fixtureWarning;
  		protected Button run;
  		protected PlaceHolder results;
! 		private DefaultPageModel model;
! 	
  		private void Page_Load(object sender, System.EventArgs e)
  		{
  		}
  
  		private void Run_Click(object source, EventArgs args)
  		{
- 			model = new DefaultPageModel();
  			fixtureWarning.Text = null;
  
  			try
  			{
! 				ITestResult testResult = model.Run(testName.Text, fixture.Text, test.Text, setup.Text, teardown.Text);
  
  				results.Controls.Add(model.CreateResultsTable(testResult, HtmlDetailsStore.Instance(new Session(Session))));
--- 14,43 ----
  		protected Label fixtureWarning;
  		protected Button run;
+ 		protected Label testLabel;
+ 		protected Label setUpLabel;
+ 		protected Label tearDownLabel;
+ 		protected Label instructions;
+ 		protected Label testNameLabel;
+ 		protected Label testNameWarning;
+ 		protected Label fixtureLabel;
+ 		protected DropDownList fixture;
  		protected PlaceHolder results;
! 		private DefaultPageModel model = new DefaultPageModel();
! 
  		private void Page_Load(object sender, System.EventArgs e)
  		{
+ 			if (!IsPostBack) 
+ 			{
+ 				model.AddFixtureNamesToDropDownList(fixture);
+ 			}
  		}
  
  		private void Run_Click(object source, EventArgs args)
  		{
  			fixtureWarning.Text = null;
  
  			try
  			{
! 				ITestResult testResult = model.Run(testName.Text, fixture.SelectedItem.Text, test.Text, setup.Text, teardown.Text);
  
  				results.Controls.Add(model.CreateResultsTable(testResult, HtmlDetailsStore.Instance(new Session(Session))));

Index: DefaultPageModel.cs
===================================================================
RCS file: /cvsroot/fat/FAT/src/FAT.Web/DefaultPageModel.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DefaultPageModel.cs	3 Feb 2004 22:08:07 -0000	1.6
--- DefaultPageModel.cs	7 Feb 2004 18:11:32 -0000	1.7
***************
*** 13,25 ****
  		private ITestParser parser;
  		private ITestRunner runner;
  
  		public DefaultPageModel() : this(ConfigurationFactory.Create()) { }
  		
! 		public DefaultPageModel(IConfiguration configuration) : this(configuration.TestParser, IsolatedTestRunnerFactory.Create()) { }
  
! 		public DefaultPageModel(ITestParser parser, ITestRunner runner)
  		{
  			this.parser = parser;
  			this.runner = runner;
  		}
  
--- 13,35 ----
  		private ITestParser parser;
  		private ITestRunner runner;
+ 		private ITestFixtureLoader loader;
  
  		public DefaultPageModel() : this(ConfigurationFactory.Create()) { }
  		
! 		public DefaultPageModel(IConfiguration configuration) : this(configuration.TestParser, IsolatedTestRunnerFactory.Create(), new TestFixtureLoader(configuration)) { }
  
! 		public DefaultPageModel(ITestParser parser, ITestRunner runner, ITestFixtureLoader loader)
  		{
  			this.parser = parser;
  			this.runner = runner;
+ 			this.loader = loader;
+ 		}
+ 
+ 		public void AddFixtureNamesToDropDownList(DropDownList fixturesList)
+ 		{
+ 			foreach (string fixture in loader.GetFixtureNames())
+ 			{
+ 				fixturesList.Items.Add(new ListItem(fixture, fixture));
+ 			}
  		}