You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/06/20 11:01:24 UTC
svn commit: r956333 -
/directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/MatchingRuleTest.java
Author: elecharny
Date: Sun Jun 20 09:01:24 2010
New Revision: 956333
URL: http://svn.apache.org/viewvc?rev=956333&view=rev
Log:
Fixed the test to make it work on all the TZ (including IST which is +5:30 and NPE which is +5:45)
Modified:
directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/MatchingRuleTest.java
Modified: directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/MatchingRuleTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/MatchingRuleTest.java?rev=956333&r1=956332&r2=956333&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/MatchingRuleTest.java (original)
+++ directory/shared/trunk/ldap-schema-manager/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/MatchingRuleTest.java Sun Jun 20 09:01:24 2010
@@ -198,17 +198,30 @@ public class MatchingRuleTest
{
MatchingRule mr1 = schemaManager.lookupMatchingRuleRegistry( "generalizedTimeMatch" );
assertEquals( GeneralizedTimeNormalizer.class.getName(), mr1.getNormalizer().getClass().getName() );
- assertEquals( "20100314150000.000Z", mr1.getNormalizer().normalize( "2010031415Z" ) );
+
+ String normalized = mr1.getNormalizer().normalize( "2010031415Z" );
+ assertTrue( "20100314150000.000Z".equals( normalized ) || "20100314153000.000Z".equals( normalized ) || "20100314154500.000Z".equals( normalized ) );
assertEquals( "20100314133102.003Z", mr1.getNormalizer().normalize( "20100314150102.003+0130" ) );
assertEquals( GeneralizedTimeComparator.class.getName(), mr1.getLdapComparator().getClass().getName() );
- assertEquals( 0, mr1.getLdapComparator().compare( "2010031415Z", "20100314150000.000+0000" ) );
+
+ // Deal with +HH:30 and +HH:45 TZ
+ int compare1 = mr1.getLdapComparator().compare( "2010031415Z", "20100314150000.000+0000" );
+ int compare2 = mr1.getLdapComparator().compare( "2010031415Z", "20100314153000.000+0000" );
+ int compare3 = mr1.getLdapComparator().compare( "2010031415Z", "20100314154500.000+0000" );
+ assertTrue( ( compare1 == 0 ) || ( compare2 == 0 ) || ( compare3 == 0 ) );
MatchingRule mr2 = schemaManager.lookupMatchingRuleRegistry( "generalizedTimeOrderingMatch" );
assertEquals( GeneralizedTimeNormalizer.class.getName(), mr2.getNormalizer().getClass().getName() );
- assertEquals( "20100314150000.000Z", mr2.getNormalizer().normalize( "2010031415Z" ) );
+ normalized = mr2.getNormalizer().normalize( "2010031415Z" );
+ assertTrue( "20100314150000.000Z".equals( normalized ) || "20100314153000.000Z".equals( normalized ) || "20100314154500.000Z".equals( normalized ) );
assertEquals( "20100314133102.003Z", mr2.getNormalizer().normalize( "20100314150102.003+0130" ) );
assertEquals( GeneralizedTimeComparator.class.getName(), mr2.getLdapComparator().getClass().getName() );
- assertEquals( 0, mr2.getLdapComparator().compare( "2010031415Z", "20100314150000.000+0000" ) );
+
+ // Deal with +HH:30 and +HH:45 TZ
+ compare1 = mr2.getLdapComparator().compare( "2010031415Z", "20100314150000.000+0000" );
+ compare2 = mr2.getLdapComparator().compare( "2010031415Z", "20100314153000.000+0000" );
+ compare3 = mr2.getLdapComparator().compare( "2010031415Z", "20100314154500.000+0000" );
+ assertTrue( ( compare1 == 0 ) || ( compare2 == 0 ) || ( compare3 == 0 ) );
assertTrue( mr2.getLdapComparator().compare( "2010031415Z", "2010031414Z" ) > 0 );
assertTrue( mr2.getLdapComparator().compare( "2010031415Z", "2010031416Z" ) < 0 );
}