@@ -14,16 +14,14 @@ public static void IntBinarySearchTest()
14
14
IList < int > sortedList = new List < int > { 1 , 3 , 6 , 7 , 9 , 10 } ;
15
15
int numToSearch = 6 ;
16
16
BinarySearcher < int > intSearcher = new BinarySearcher < int > ( list , Comparer < int > . Default ) ;
17
- intSearcher . SearchFor ( numToSearch ) ;
18
- int itemIndex = intSearcher . BinarySearch ( ) ;
17
+ int actualIndex = intSearcher . BinarySearch ( numToSearch ) ;
19
18
int expectedIndex = sortedList . IndexOf ( numToSearch ) ;
20
19
21
- Assert . Equal ( expectedIndex , itemIndex ) ;
20
+ Assert . Equal ( expectedIndex , actualIndex ) ;
22
21
Assert . Equal ( numToSearch , intSearcher . Current ) ;
23
22
24
23
numToSearch = 20 ;
25
- intSearcher . SearchFor ( numToSearch ) ;
26
- int itemNotExists = intSearcher . BinarySearch ( ) ;
24
+ int itemNotExists = intSearcher . BinarySearch ( numToSearch ) ;
27
25
Assert . Equal ( - 1 , itemNotExists ) ;
28
26
}
29
27
@@ -35,33 +33,35 @@ public static void StringBinarySearchTest()
35
33
IList < string > sortedAnimals = new List < string > { "bee" , "cat" , "lion" , "sparrow" , "tiger" } ;
36
34
string itemToSearch = "bee" ;
37
35
BinarySearcher < string > strSearcher = new BinarySearcher < string > ( animals , Comparer < string > . Default ) ;
38
- strSearcher . SearchFor ( itemToSearch ) ;
39
- int actualIndex = strSearcher . BinarySearch ( ) ;
36
+ int actualIndex = strSearcher . BinarySearch ( itemToSearch ) ;
40
37
int expectedAnimalIndex = sortedAnimals . IndexOf ( itemToSearch ) ;
41
38
42
39
Assert . Equal ( expectedAnimalIndex , actualIndex ) ;
43
40
Assert . Equal ( itemToSearch , strSearcher . Current ) ;
44
41
45
42
itemToSearch = "shark" ;
46
- strSearcher . SearchFor ( itemToSearch ) ;
47
- int itemNotExists = strSearcher . BinarySearch ( ) ;
48
- Assert . Equal ( - 1 , itemNotExists ) ;
43
+ int itemNotExist = strSearcher . BinarySearch ( itemToSearch ) ;
44
+ Assert . Equal ( - 1 , itemNotExist ) ;
49
45
}
50
46
51
47
[ Fact ]
52
48
public static void MoveNextTest ( )
53
49
{
54
50
IList < int > items = new List < int > { 3 , 5 , 2 , 6 , 1 , 4 } ;
55
51
BinarySearcher < int > searcher = new BinarySearcher < int > ( items , Comparer < int > . Default ) ;
56
- searcher . SearchFor ( 1 ) ;
52
+ searcher . BinarySearch ( 1 ) ;
53
+ //reset indices to test MoveNext()
54
+ searcher . Reset ( ) ;
57
55
IList < int > leftEnumeratedValues = new List < int > { 3 , 2 , 1 } ;
58
56
int i = 0 ;
59
57
while ( searcher . MoveNext ( ) )
60
58
{
61
59
Assert . Equal ( leftEnumeratedValues [ i ++ ] , searcher . Current ) ;
62
60
}
63
61
64
- searcher . SearchFor ( 6 ) ;
62
+ searcher . BinarySearch ( 6 ) ;
63
+ //reset indices to test MoveNext()
64
+ searcher . Reset ( ) ;
65
65
IList < int > rightEnumeratedValues = new List < int > { 3 , 5 , 6 } ;
66
66
i = 0 ;
67
67
while ( searcher . MoveNext ( ) )
0 commit comments