|
@@ -3,8 +3,8 @@ |
3 |
3 |
|
|
4 |
4 |
|
import junit.framework.*; |
5 |
5 |
|
|
6 |
|
- |
import org.litesoft.bo.BoAttribute.*; |
7 |
6 |
|
import org.litesoft.bo.*; |
|
7 |
+ |
import org.litesoft.bo.BoAttribute.*; |
8 |
8 |
|
|
9 |
9 |
|
public class FilterUtilTest extends TestCase |
10 |
10 |
|
{ |
|
@@ -37,110 +37,110 @@ |
37 |
37 |
|
|
38 |
38 |
|
public void testNeedsRefreshUFSI() // unique field - string identity |
39 |
39 |
|
{ |
40 |
|
- |
mBase.setUniqueFilter( STRING_FIELD, "123" ); |
|
40 |
+ |
mBase.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "123" ); |
41 |
41 |
|
|
42 |
42 |
|
assertTrue(); |
43 |
|
- |
mCurrent.setUniqueFilter( STRING_FIELD, "12" ); |
|
43 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "12" ); |
44 |
44 |
|
assertTrue(); |
45 |
|
- |
mCurrent.setUniqueFilter( STRING_FIELD, "123" ); |
|
45 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "123" ); |
46 |
46 |
|
assertFalse(); |
47 |
|
- |
mCurrent.setUniqueFilter( STRING_FIELD, "1234" ); |
|
47 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "1234" ); |
48 |
48 |
|
assertFalse(); |
49 |
49 |
|
} |
50 |
50 |
|
|
51 |
51 |
|
public void testNeedsRefreshUFMF() // unique field - multiple fields |
52 |
52 |
|
{ |
53 |
|
- |
mBase.setUniqueFilter( STRING_FIELD, "123" ); |
|
53 |
+ |
mBase.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "123" ); |
54 |
54 |
|
|
55 |
|
- |
mCurrent.setUniqueFilter( STRING_FIELD, "123" ); |
|
55 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "123" ); |
56 |
56 |
|
assertFalse(); |
57 |
|
- |
mCurrent.setUniqueFilter( LONG_FIELD, "12" ); |
|
57 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Unique, LONG_FIELD, "12" ); |
58 |
58 |
|
assertFalse(); |
59 |
59 |
|
|
60 |
|
- |
mBase.setUniqueFilter( LONG_FIELD, "123" ); |
|
60 |
+ |
mBase.setFilter( BoAccessorFilterType.Unique, LONG_FIELD, "123" ); |
61 |
61 |
|
|
62 |
62 |
|
assertTrue(); |
63 |
63 |
|
|
64 |
|
- |
mCurrent.setUniqueFilter( LONG_FIELD, "1234" ); |
|
64 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Unique, LONG_FIELD, "1234" ); |
65 |
65 |
|
assertTrue(); |
66 |
|
- |
mCurrent.setUniqueFilter( LONG_FIELD, "123" ); |
|
66 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Unique, LONG_FIELD, "123" ); |
67 |
67 |
|
assertFalse(); |
68 |
68 |
|
} |
69 |
69 |
|
|
70 |
70 |
|
public void testNeedsRefreshNUFSM() // non-unique fields - string matching |
71 |
71 |
|
{ |
72 |
|
- |
mBase.setNonUniqueFilter( LAST_NAME, "Sm" ); |
|
72 |
+ |
mBase.setFilter( BoAccessorFilterType.Regular, LAST_NAME, "Sm" ); |
73 |
73 |
|
assertTrue(); |
74 |
|
- |
mCurrent.setNonUniqueFilter( LAST_NAME, "Sm" ); |
|
74 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Regular, LAST_NAME, "Sm" ); |
75 |
75 |
|
assertFalse(); |
76 |
|
- |
mCurrent.setNonUniqueFilter( LAST_NAME, "Smi" ); |
|
76 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Regular, LAST_NAME, "Smi" ); |
77 |
77 |
|
assertFalse(); |
78 |
|
- |
mCurrent.setNonUniqueFilter( FIRST_NAME, "G" ); |
|
78 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Regular, FIRST_NAME, "G" ); |
79 |
79 |
|
assertFalse(); |
80 |
|
- |
mCurrent.setNonUniqueFilter( LAST_NAME, "S" ); |
|
80 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Regular, LAST_NAME, "S" ); |
81 |
81 |
|
assertTrue(); |
82 |
82 |
|
} |
83 |
83 |
|
|
84 |
84 |
|
public void testNeedsRefreshNUFFS() // non-unique fields - field switching |
85 |
85 |
|
{ |
86 |
|
- |
mBase.setNonUniqueFilter( LAST_NAME, "Sm" ); |
87 |
|
- |
mCurrent.setNonUniqueFilter( FIRST_NAME, "G" ); |
|
86 |
+ |
mBase.setFilter( BoAccessorFilterType.Regular, LAST_NAME, "Sm" ); |
|
87 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Regular, FIRST_NAME, "G" ); |
88 |
88 |
|
assertTrue(); |
89 |
89 |
|
} |
90 |
90 |
|
|
91 |
91 |
|
public void testNeedsRefreshUONU() // unique overrides non-unique |
92 |
92 |
|
{ |
93 |
|
- |
mBase.setUniqueFilter( STRING_FIELD, "123" ); |
94 |
|
- |
mCurrent.setUniqueFilter( STRING_FIELD, "123" ); |
95 |
|
- |
mBase.setNonUniqueFilter( LAST_NAME, "Sm" ); |
|
93 |
+ |
mBase.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "123" ); |
|
94 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "123" ); |
|
95 |
+ |
mBase.setFilter( BoAccessorFilterType.Regular, LAST_NAME, "Sm" ); |
96 |
96 |
|
assertFalse(); |
97 |
97 |
|
} |
98 |
98 |
|
|
99 |
99 |
|
public void testNeedsRefreshUONU2() // unique overrides non-unique |
100 |
100 |
|
{ |
101 |
|
- |
mBase.setUniqueFilter( STRING_FIELD, "123" ); |
102 |
|
- |
mCurrent.setUniqueFilter( STRING_FIELD, "123" ); |
103 |
|
- |
mCurrent.setNonUniqueFilter( LAST_NAME, "Sm" ); |
|
101 |
+ |
mBase.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "123" ); |
|
102 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "123" ); |
|
103 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Regular, LAST_NAME, "Sm" ); |
104 |
104 |
|
assertFalse(); |
105 |
105 |
|
} |
106 |
106 |
|
|
107 |
107 |
|
public void testNeedsRefreshUONU3() // unique overrides non-unique |
108 |
108 |
|
{ |
109 |
|
- |
mBase.setNonUniqueFilter( LAST_NAME, "Smi" ); |
110 |
|
- |
mCurrent.setNonUniqueFilter( LAST_NAME, "Smi" ); |
|
109 |
+ |
mBase.setFilter( BoAccessorFilterType.Regular, LAST_NAME, "Smi" ); |
|
110 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Regular, LAST_NAME, "Smi" ); |
111 |
111 |
|
assertFalse(); |
112 |
|
- |
mCurrent.setUniqueFilter( STRING_FIELD, "123" ); |
|
112 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "123" ); |
113 |
113 |
|
assertTrue(); |
114 |
114 |
|
} |
115 |
115 |
|
|
116 |
116 |
|
public void testNeedsRefreshCI() // case-insensitivity |
117 |
117 |
|
{ |
118 |
|
- |
mBase.setUniqueFilter( STRING_FIELD, "ABC" ); |
119 |
|
- |
mCurrent.setUniqueFilter( STRING_FIELD, "abc" ); |
120 |
|
- |
mBase.setNonUniqueFilter( LAST_NAME, "SMITH" ); |
121 |
|
- |
mCurrent.setNonUniqueFilter( LAST_NAME, "smith" ); |
122 |
|
- |
assertFalse(); |
123 |
|
- |
mBase.setUniqueFilter( STRING_FIELD, "abc" ); |
124 |
|
- |
mCurrent.setUniqueFilter( STRING_FIELD, "ABC" ); |
125 |
|
- |
mBase.setNonUniqueFilter( LAST_NAME, "smith" ); |
126 |
|
- |
mCurrent.setNonUniqueFilter( LAST_NAME, "SMITH" ); |
|
118 |
+ |
mBase.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "ABC" ); |
|
119 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "abc" ); |
|
120 |
+ |
mBase.setFilter( BoAccessorFilterType.Regular, LAST_NAME, "SMITH" ); |
|
121 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Regular, LAST_NAME, "smith" ); |
|
122 |
+ |
assertFalse(); |
|
123 |
+ |
mBase.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "abc" ); |
|
124 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "ABC" ); |
|
125 |
+ |
mBase.setFilter( BoAccessorFilterType.Regular, LAST_NAME, "smith" ); |
|
126 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Regular, LAST_NAME, "SMITH" ); |
127 |
127 |
|
assertFalse(); |
128 |
128 |
|
} |
129 |
129 |
|
|
130 |
130 |
|
public void testNeedsRefreshEWCLC() // expressions: wild card last character |
131 |
131 |
|
{ |
132 |
|
- |
mBase.setUniqueFilter( STRING_FIELD, "123" ); |
133 |
|
- |
mBase.setNonUniqueFilter( LAST_NAME, "S" ); |
|
132 |
+ |
mBase.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "123" ); |
|
133 |
+ |
mBase.setFilter( BoAccessorFilterType.Regular, LAST_NAME, "S" ); |
134 |
134 |
|
|
135 |
|
- |
mCurrent.setUniqueFilter( STRING_FIELD, "123*" ); |
136 |
|
- |
mCurrent.setNonUniqueFilter( LAST_NAME, "S*" ); |
|
135 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "123*" ); |
|
136 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Regular, LAST_NAME, "S*" ); |
137 |
137 |
|
assertFalse(); |
138 |
138 |
|
|
139 |
|
- |
mBase.setUniqueFilter( STRING_FIELD, "123*" ); |
140 |
|
- |
mBase.setNonUniqueFilter( LAST_NAME, "S*" ); |
|
139 |
+ |
mBase.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "123*" ); |
|
140 |
+ |
mBase.setFilter( BoAccessorFilterType.Regular, LAST_NAME, "S*" ); |
141 |
141 |
|
|
142 |
|
- |
mCurrent.setUniqueFilter( STRING_FIELD, "123" ); |
143 |
|
- |
mCurrent.setNonUniqueFilter( LAST_NAME, "S" ); |
|
142 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Unique, STRING_FIELD, "123" ); |
|
143 |
+ |
mCurrent.setFilter( BoAccessorFilterType.Regular, LAST_NAME, "S" ); |
144 |
144 |
|
assertFalse(); |
145 |
145 |
|
} |
146 |
146 |
|
|