@@ -8,10 +8,7 @@ mod tests {
88 GenerateResult , RowIDWithConfig , RowIDWithConfigResult , VerifyResult ,
99 } ;
1010
11- use rowid:: errors:: {
12- DECODE_ECD_INVALID_ERR , DECODE_ECD_LENGTH_ERR ,
13- RWC_DONE_CHAR_LIST_LENGTH_ERR ,
14- } ;
11+ use rowid:: RowIDError ;
1512
1613 // system_time_to_timestamp
1714
@@ -92,7 +89,7 @@ mod tests {
9289 #[ test]
9390 fn test_decode ( ) {
9491 let current: SystemTime = SystemTime :: now ( ) ;
95- let decoded: SystemTime = decode ( encode ( current) . unwrap ( ) ) . unwrap ( ) ;
92+ let decoded: SystemTime = decode ( & encode ( current) . unwrap ( ) ) . unwrap ( ) ;
9693 assert ! (
9794 system_time_to_timestamp( decoded)
9895 == system_time_to_timestamp( current)
@@ -101,24 +98,24 @@ mod tests {
10198
10299 #[ test]
103100 fn test_decode_length_error ( ) {
104- let result: io:: Error = match decode ( "ABC123" . to_string ( ) ) {
101+ let result: io:: Error = match decode ( "ABC123" ) {
105102 | Ok ( _) => return assert ! ( false ) ,
106103 | Err ( e) => e,
107104 } ;
108105
109106 assert ! ( result. kind( ) == io:: ErrorKind :: InvalidInput ) ;
110- assert ! ( result. to_string( ) == DECODE_ECD_LENGTH_ERR ) ;
107+ assert ! ( result. to_string( ) == RowIDError :: EncodedLength . as_str ( ) ) ;
111108 }
112109
113110 #[ test]
114111 fn test_decode_invalid_input_error ( ) {
115- let result: io:: Error = match decode ( "ab^!@#$agastgyaSER" . to_string ( ) ) {
112+ let result: io:: Error = match decode ( "ab^!@#$agastgyaSER" ) {
116113 | Ok ( _) => return assert ! ( false ) ,
117114 | Err ( e) => e,
118115 } ;
119116
120117 assert ! ( result. kind( ) == io:: ErrorKind :: InvalidInput ) ;
121- assert ! ( result. to_string( ) == DECODE_ECD_INVALID_ERR ) ;
118+ assert ! ( result. to_string( ) == RowIDError :: InvalidEncoded . as_str ( ) ) ;
122119 }
123120
124121 // generate
@@ -130,7 +127,7 @@ mod tests {
130127 let id: String = generated. result . unwrap ( ) ;
131128 assert ! ( generated. success == true ) ;
132129 assert ! (
133- system_time_to_timestamp( decode( id . clone ( ) ) . unwrap( ) )
130+ system_time_to_timestamp( decode( & id ) . unwrap( ) )
134131 == system_time_to_timestamp( current)
135132 ) ;
136133 assert ! ( id. len( ) == 16 ) ;
@@ -142,7 +139,7 @@ mod tests {
142139 fn test_verify ( ) {
143140 let current: SystemTime = SystemTime :: now ( ) ;
144141 let id: String = generate ( current, Some ( 6 ) ) . result . unwrap ( ) ;
145- let verified: VerifyResult = verify ( id) ;
142+ let verified: VerifyResult = verify ( & id) ;
146143 assert ! ( verified. success == true ) ;
147144 assert ! ( match verified. result {
148145 | Some ( r) =>
@@ -154,7 +151,7 @@ mod tests {
154151
155152 #[ test]
156153 fn test_verify_length_error ( ) {
157- let verified: VerifyResult = verify ( "ABC123" . to_string ( ) ) ;
154+ let verified: VerifyResult = verify ( "ABC123" ) ;
158155
159156 assert ! ( verified. success == false ) ;
160157
@@ -164,12 +161,12 @@ mod tests {
164161 } ;
165162
166163 assert ! ( error. kind( ) == io:: ErrorKind :: InvalidInput ) ;
167- assert ! ( error. to_string( ) == DECODE_ECD_LENGTH_ERR ) ;
164+ assert ! ( error. to_string( ) == RowIDError :: EncodedLength . as_str ( ) ) ;
168165 }
169166
170167 #[ test]
171168 fn test_verify_invalid_input_error ( ) {
172- let verified: VerifyResult = verify ( "ab^!@#$agastgyaSER" . to_string ( ) ) ;
169+ let verified: VerifyResult = verify ( "ab^!@#$agastgyaSER" ) ;
173170
174171 assert ! ( verified. success == false ) ;
175172
@@ -179,21 +176,21 @@ mod tests {
179176 } ;
180177
181178 assert ! ( error. kind( ) == io:: ErrorKind :: InvalidInput ) ;
182- assert ! ( error. to_string( ) == DECODE_ECD_INVALID_ERR ) ;
179+ assert ! ( error. to_string( ) == RowIDError :: InvalidEncoded . as_str ( ) ) ;
183180 }
184181
185182 // rowid_with_config
186183
187184 #[ test]
188185 fn test_rowid_with_config_char_list_length_error ( ) {
189186 let err: io:: Error =
190- match RowIDWithConfig :: new ( ) . char_list ( "ABC" . to_string ( ) ) . done ( ) {
187+ match RowIDWithConfig :: new ( ) . char_list ( "ABC" ) . done ( ) {
191188 | Ok ( _) => return assert ! ( false ) ,
192189 | Err ( e) => e,
193190 } ;
194191
195192 assert ! ( err. kind( ) == io:: ErrorKind :: InvalidInput ) ;
196- assert ! ( err. to_string( ) == RWC_DONE_CHAR_LIST_LENGTH_ERR ) ;
193+ assert ! ( err. to_string( ) == RowIDError :: CharListLength . as_str ( ) ) ;
197194 }
198195
199196 #[ test]
@@ -223,7 +220,7 @@ mod tests {
223220
224221 let current: SystemTime = SystemTime :: now ( ) ;
225222 let decoded: SystemTime =
226- rwc. decode ( rwc. encode ( current) . unwrap ( ) ) . unwrap ( ) ;
223+ rwc. decode ( & rwc. encode ( current) . unwrap ( ) ) . unwrap ( ) ;
227224
228225 assert ! (
229226 system_time_to_timestamp( decoded)
@@ -241,9 +238,9 @@ mod tests {
241238 let id: String = generated. result . unwrap ( ) ;
242239
243240 assert ! ( generated. success == true ) ;
244- assert ! ( id. clone ( ) . len( ) == 16 ) ;
241+ assert ! ( id. len( ) == 16 ) ;
245242 assert ! (
246- system_time_to_timestamp( rwc. decode( id . clone ( ) ) . unwrap( ) )
243+ system_time_to_timestamp( rwc. decode( & id ) . unwrap( ) )
247244 == system_time_to_timestamp( current)
248245 ) ;
249246 }
@@ -255,7 +252,7 @@ mod tests {
255252
256253 let current: SystemTime = SystemTime :: now ( ) ;
257254 let generated: GenerateResult = rwc. generate ( current, None ) ;
258- let verified: VerifyResult = rwc. verify ( generated. result . unwrap ( ) ) ;
255+ let verified: VerifyResult = rwc. verify ( & generated. result . unwrap ( ) ) ;
259256
260257 assert ! ( verified. success == true ) ;
261258 assert ! ( match verified. result {
0 commit comments