Merge from 3.0 branch till 967.

1 files changed, 7 insertions, 6 deletions

diff --git a/tests/FunctionalTests/validators/protected/pages/RequiredListValidator.page b/tests/FunctionalTests/validators/protected/pages/RequiredListValidator.page
index 9bbd9d5a..665d71b7 100644
--- a/tests/FunctionalTests/validators/protected/pages/RequiredListValidator.page
+++ b/tests/FunctionalTests/validators/protected/pages/RequiredListValidator.page
@@ -8,7 +8,7 @@
 			<com:TListItem Value="3" Text="Three" />

 			<com:TListItem Value="4" Text="Four" />

 		</com:TCheckBoxList>

-		<com:TRequiredListValidator

+		<com:TListControlValidator

 			ID="validator1"

 			ControlToValidate="list1"

 			ErrorMessage="Must select at least 1 and no more than 3"

@@ -18,30 +18,31 @@
 

 	</div>

 	<div>

-		<com:TListBox ID="list2" SelectionMode="Multiple" Rows="5" Style="width:10em">

+		<com:TListBox ID="list2" SelectionMode="Multiple" Rows="5" Style="width:10em;">

 			<com:TListItem Value="1" Text="One" />

 			<com:TListItem Value="2" Text="Two" />

 			<com:TListItem Value="3" Text="Three" />

 			<com:TListItem Value="4" Text="Four" />

 			<com:TListItem Value="5" Text="Five" />

 		</com:TListBox>

-		<com:TRequiredListValidator

+		<com:TListControlValidator

 			ID="validator2"

 			ControlToValidate="list2"

 			ErrorMessage='Must select at least 2 and no more than 3 and value "two"'

 			MinSelection="2"

 			MaxSelection="3"

+			ControlCssClass="required"

 			RequiredSelections="2" />

 	</div>

 

 	<div class="lista">

-		<com:TCheckBoxList ID="list3">

+		<com:TRadioButtonList ID="list3">

 			<com:TListItem Value="1" Text="One" />

 			<com:TListItem Value="2" Text="Two" />

 			<com:TListItem Value="3" Text="Three" />

 			<com:TListItem Value="4" Text="Four" />

-		</com:TCheckBoxList>

-		<com:TRequiredListValidator

+		</com:TRadioButtonList>

+		<com:TListControlValidator

 			ID="validator3"

 			ControlToValidate="list3"

 			ErrorMessage="Must select at least 1"