10 files changed, 75 insertions, 121 deletions
diff --git a/tests/FunctionalTests/features/protected/pages/CompositeControl.page b/tests/FunctionalTests/features/protected/pages/CompositeControl.page
deleted file mode 100644
index b135445a..00000000
--- a/tests/FunctionalTests/features/protected/pages/CompositeControl.page
+++ /dev/null
@@ -1,12 +0,0 @@
-<com:TContent ID="Content">
-<h1>Composite Control Test</h1>
-	<com:LabeledTextBox id="user" Label.Text="username:" /><br />
-	<com:LabeledTextBox id="pass" Label.Text="password:" /><br />
-	<com:TButton Text="Submit" />
-
-<com:TPanel Visible=<%= $this->user->TextBox->Text != "" %> >
-<h2>Result</h2>
-	User: <%= $this->user->TextBox->Text %> Pass: <%= $this->pass->TextBox->Text %>
-</com:TPanel>
-
-</com:TContent>
-\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/DatePicker.page b/tests/FunctionalTests/features/protected/pages/DatePicker.page
deleted file mode 100644
index 261a6994..00000000
--- a/tests/FunctionalTests/features/protected/pages/DatePicker.page
+++ /dev/null
@@ -1,61 +0,0 @@
-<com:TContent ID="Content">
-
-<h1>TDatePicker Samples</h1>
-
-<table class="sampletable">
-
-<tr>
-	<td class="samplenote">Default TDatePicker</td>
-	<td class="sampleaction">
-		<com:TDatePicker />
-	</td>
-</tr>
-
-<tr>
-	<td class="samplenote">Button Mode, pre-selected date</td>
-	<td class="sampleaction">
-		<com:TDatePicker Mode="Button" Date="20-10-2005"/>
-	</td>
-</tr>
-
-<tr>
-	<td class="samplenote">InputMode="DropDownList", custom DateFormat</td>
-	<td class="sampleaction">
-		<com:TDatePicker DateFormat="yyyy/MMM" InputMode="DropDownList"/>
-	</td>
-</tr>
-
-<tr>
-	<td class="samplenote">InputMode="DropDownList", custom DateFormat, Culture</td>
-	<td class="sampleaction">
-		<com:TDatePicker DateFormat="MMM/yyyy" Culture="fr" InputMode="DropDownList"/>
-	</td>
-</tr>
-
-
-<tr>
-	<td class="samplenote">Custom DateFormat, culture, ImageButton mode, pre-selected date</td>
-	<td class="sampleaction">
-		<com:TDatePicker Mode="ImageButton" Culture="zh_CN" 
-			DateFormat="日期：yyyy年M月d日"  
-			Timestamp=<%= @strtotime("-1 year") %>/>
-	</td>
-</tr>
-
-<tr>
-	<td class="samplenote">Custom DateFormat, DropDownList, pre-selected date set in as Text</td>
-	<td class="sampleaction">
-		<com:TDatePicker DateFormat="yyyy/MMMM/dd" Date="2005/05/15" InputMode="DropDownList"/>
-	</td>
-</tr>
-
-<tr>
-	<td class="samplenote">DropDownList, pre-selected date as integer</td>
-	<td class="sampleaction">
-		<com:TDatePicker InputMode="DropDownList" Timestamp=<%= @strtotime("-1 month") %>/>
-	</td>
-</tr>
-	
-</table>
-
-</com:TContent>
-\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/HtmlArea.page b/tests/FunctionalTests/features/protected/pages/HtmlArea.page
deleted file mode 100644
index 3936e68c..00000000
--- a/tests/FunctionalTests/features/protected/pages/HtmlArea.page
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<com:TContent ID="Content">
-
-	<com:THtmlArea ID="text1" />
-
-	<com:TRequiredFieldValidator 
-		ControlToValidate="text1"
-		ErrorMessage="*" />
-
-	<com:TButton ID="button1" Text="submit 1" />
-
-	<com:TButton ID="button2" Text="submit 2" />
-
-	<com:THtmlArea ID="text2" />
-
-	<com:TRequiredFieldValidator 
-		ControlToValidate="text2"
-		ValidationGroup="group2"
-		ErrorMessage="*" />
-
-	<com:TButton ID="button3" ValidationGroup="group2" Text="submit 3" />
-
-	<com:TButton ID="button4" ValidationGroup="group2" Text="submit 4" />
-
-</com:TContent>
-\ No newline at end of file
diff --git a/tests/FunctionalTests/features/tests/CompositeControlTestCase.php b/tests/FunctionalTests/features/tests/CompositeControlTestCase.php
deleted file mode 100644
index dda3f63b..00000000
--- a/tests/FunctionalTests/features/tests/CompositeControlTestCase.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/*
- * Created on 28/04/2006
- */
-
-class CompositeControlTestCase extends SeleniumTestCase
-{
-	
-	function test()
-	{
-		$base = "ctl0_Content_";
-		$this->open("features/index.php?page=CompositeControl", "");
-		$this->verifyTextPresent("Composite Control Test", "");
-		$this->type("{$base}user_textbox", "Hello");
-		$this->type("{$base}pass_textbox", "world");
-		$this->clickAndWait("//input[@type='submit' and @value='Submit']", "");
-		$this->verifyTextPresent("Result", "");
-		$this->verifyTextPresent("User: Hello Pass: world", "");		
-	}
-	 
-}
-
-?>
diff --git a/tests/FunctionalTests/features/protected/pages/ClientScripTest.page b/tests/FunctionalTests/tickets/protected/pages/Ticket220.page
index d5b6e182..d5b6e182 100644
--- a/tests/FunctionalTests/features/protected/pages/ClientScripTest.page
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket220.page
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket225.page b/tests/FunctionalTests/tickets/protected/pages/Ticket225.page
new file mode 100644
index 00000000..362c4dce
--- /dev/null
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket225.page
@@ -0,0 +1,14 @@
+<com:TContent ID="Content">
+	<h1>RadioButton Group Tests</h1>
+	<com:TRadioButton ID="button1" Text="Button 1" GroupName="group1" />
+	<com:TRadioButton ID="button2" Text="Button 2" GroupName="group1" />
+	<com:TRadioButton ID="button3" Text="Button 3" GroupName="group1" />
+	
+	<com:TRequiredFieldValidator id="validator1"
+		ControlToValidate="button1"
+		ErrorMessage="*" />
+	
+	<com:TLabel ID="label1" Text="Label 1" />
+	
+	<com:TButton ID="button4" Text="Show Groupings" OnClick="button4_Clicked" />
+</com:TContent>
+\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket225.php b/tests/FunctionalTests/tickets/protected/pages/Ticket225.php
new file mode 100644
index 00000000..2cc3fc38
--- /dev/null
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket225.php
@@ -0,0 +1,19 @@
+<?php
+
+class Ticket225 extends TPage
+{
+	function button4_Clicked()
+	{
+		$this->label1->setText($this->getGroupIDs($this->button1));
+	}
+	
+	private function getGroupIDs($radio)
+	{
+		$ids = '';
+		foreach($radio->getRadioButtonsInGroup() as $control)
+			$ids .= " ".$control->getUniqueID();
+		return $ids;
+	}
+}
+
+?>
+\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/test.js b/tests/FunctionalTests/tickets/protected/pages/test.js
index e8e80b19..e8e80b19 100644
--- a/tests/FunctionalTests/features/protected/pages/test.js
+++ b/tests/FunctionalTests/tickets/protected/pages/test.js
diff --git a/tests/FunctionalTests/tickets/tests/Ticket220TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket220TestCase.php
new file mode 100644
index 00000000..0753f732
--- /dev/null
+++ b/tests/FunctionalTests/tickets/tests/Ticket220TestCase.php
@@ -0,0 +1,18 @@
+<?php
+
+class Ticket220TestCase extends SeleniumTestCase
+{
+	function test()
+	{
+		$base="ctl0_Content_";
+		$this->open('tickets/index.php?page=Ticket220');
+		$this->assertTextPresent('ClientScript Test');
+		$this->assertText("{$base}label1", "Label 1");
+		
+		$this->click("button1");
+		$this->assertText("{$base}label1", 'Label 1: ["ok", "ok 3?", "ok 2!"]');
+		$this->assertAlertNotPresent();
+	}
+}
+
+?>
+\ No newline at end of file
diff --git a/tests/FunctionalTests/tickets/tests/Ticket225TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket225TestCase.php
new file mode 100644
index 00000000..966e8383
--- /dev/null
+++ b/tests/FunctionalTests/tickets/tests/Ticket225TestCase.php
@@ -0,0 +1,24 @@
+<?php
+
+class Ticket225TestCase extends SeleniumTestCase
+{
+	function test()
+	{
+		$base="ctl0_Content_";
+		$this->open('tickets/index.php?page=Ticket225');
+		$this->assertTextPresent('RadioButton Group Tests');
+		$this->assertText("{$base}label1", "Label 1");
+		
+		$this->assertNotVisible("{$base}validator1");
+		$this->click("{$base}button4");
+		$this->assertVisible("{$base}validator1");
+		
+		$this->click("{$base}button2");
+		$this->clickAndWait("{$base}button4");
+		
+		$this->assertText("{$base}label1", 'ctl0$Content$button1 ctl0$Content$button2 ctl0$Content$button3');
+		$this->assertNotVisible("{$base}validator1");
+	}
+}
+
+?>
+\ No newline at end of file