@@ -185,113 +185,18 @@ impl fmt::Display for PackageVersion {
185185
186186#[ cfg( test) ]
187187mod tests {
188- use std:: fmt:: Debug ;
189-
190188 use crate :: PackageVersion ;
191- use anyhow:: bail;
192189 use anyhow:: Result ;
193190
194- use crate :: DevHead ;
195- use crate :: PostHead ;
196- use crate :: PostHeader ;
197- use crate :: PreHeader ;
198- use crate :: ReleaseHeader ;
199-
200- fn test_a_greater < T > ( a : T , b : T ) -> Result < ( ) >
201- where
202- T : PartialEq + PartialOrd + Debug ,
203- {
204- if a <= b {
205- bail ! (
206- "Failed Less Than or Equal Check for A: {:?} \n <=\n B: {:?}" ,
207- a,
208- b
209- )
210- }
211- Ok ( ( ) )
212- }
213-
214191 #[ test]
215192 fn test_pep440_ordering ( ) -> Result < ( ) > {
216- test_a_greater (
193+ assert ! (
217194 PackageVersion :: new(
218195 "v1!1.0-preview-921.post-516.dev-241+yeah.this.is.the.problem.with.local.versions" ,
219- ) ?,
220- PackageVersion :: new ( "1.0" ) ?,
221- ) ?;
222- Ok ( ( ) )
223- }
224-
225- #[ test]
226- fn test_release_ordering ( ) -> Result < ( ) > {
227- test_a_greater (
228- ReleaseHeader { major : 1 , minor : 0 } ,
229- ReleaseHeader { major : 0 , minor : 0 } ,
230- ) ?;
231- test_a_greater (
232- ReleaseHeader { major : 1 , minor : 1 } ,
233- ReleaseHeader { major : 1 , minor : 0 } ,
234- ) ?;
235- test_a_greater (
236- ReleaseHeader { major : 2 , minor : 1 } ,
237- ReleaseHeader {
238- major : 1 ,
239- minor : 52 ,
240- } ,
241- ) ?;
242- Ok ( ( ) )
243- }
244-
245- #[ test]
246- fn test_pre_ordering ( ) -> Result < ( ) > {
247- test_a_greater ( PreHeader :: ReleaseCandidate ( None ) , PreHeader :: Preview ( None ) ) ?;
248- test_a_greater ( PreHeader :: Preview ( None ) , PreHeader :: Alpha ( None ) ) ?;
249- test_a_greater ( PreHeader :: Alpha ( None ) , PreHeader :: Beta ( None ) ) ?;
250-
251- test_a_greater (
252- PreHeader :: ReleaseCandidate ( Some ( 2 ) ) ,
253- PreHeader :: ReleaseCandidate ( Some ( 1 ) ) ,
254- ) ?;
255- test_a_greater ( PreHeader :: Preview ( Some ( 50 ) ) , PreHeader :: Preview ( Some ( 3 ) ) ) ?;
256- test_a_greater ( PreHeader :: Alpha ( Some ( 504 ) ) , PreHeader :: Alpha ( Some ( 0 ) ) ) ?;
257- test_a_greater ( PreHeader :: Beta ( Some ( 1234 ) ) , PreHeader :: Beta ( Some ( 1 ) ) ) ?;
258-
259- test_a_greater (
260- PreHeader :: ReleaseCandidate ( Some ( 1 ) ) ,
261- PreHeader :: Beta ( Some ( 45067885 ) ) ,
262- ) ?;
263- Ok ( ( ) )
264- }
265-
266- #[ test]
267- fn test_post_ordering ( ) -> Result < ( ) > {
268- test_a_greater (
269- PostHeader {
270- post_head : Some ( PostHead :: Post ) ,
271- post_num : Some ( 0 ) ,
272- } ,
273- PostHeader {
274- post_head : Some ( PostHead :: Post ) ,
275- post_num : None ,
276- } ,
277- ) ?;
278- test_a_greater (
279- PostHeader {
280- post_head : Some ( PostHead :: Post ) ,
281- post_num : Some ( 1 ) ,
282- } ,
283- PostHeader {
284- post_head : Some ( PostHead :: Post ) ,
285- post_num : Some ( 0 ) ,
286- } ,
287- ) ?;
288- Ok ( ( ) )
289- }
290-
291- #[ test]
292- fn test_dev_ordering ( ) -> Result < ( ) > {
293- test_a_greater ( DevHead { dev_num : Some ( 0 ) } , DevHead { dev_num : None } ) ?;
294- test_a_greater ( DevHead { dev_num : Some ( 1 ) } , DevHead { dev_num : Some ( 0 ) } ) ?;
196+ ) ?
197+ >
198+ PackageVersion :: new( "1.0" ) ?
199+ ) ;
295200 Ok ( ( ) )
296201 }
297202
0 commit comments