|
52 | 52 | import java.lang.reflect.Field; |
53 | 53 | import java.lang.reflect.Method; |
54 | 54 | import java.lang.reflect.Proxy; |
| 55 | +import java.text.SimpleDateFormat; |
55 | 56 | import java.util.Collections; |
| 57 | +import java.util.Date; |
56 | 58 | import java.util.HashMap; |
57 | 59 | import java.util.HashSet; |
58 | 60 | import java.util.Map; |
|
85 | 87 | @CreateLdapConnectionPool(maxActive = 1, maxWait = 5000) |
86 | 88 | @ApplyLdifFiles("ADSchema.ldif") |
87 | 89 | public class TestLdapUserGroupBuilder extends AbstractLdapTestUnit { |
| 90 | + private static final String STR_EPOCH = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date(0)); |
| 91 | + |
88 | 92 | @Test |
89 | 93 | public void testA_init_and_isChanged() throws Exception { |
90 | 94 | resetConfig(); |
@@ -408,7 +412,7 @@ public void testU_user_config_fields_reflect_properties_and_timestamps_initializ |
408 | 412 |
|
409 | 413 | assertEquals("uid", uName.get(b)); |
410 | 414 | assertEquals("(uid=*)", uFil.get(b)); |
411 | | - assertTrue(((String) ts.get(b)).startsWith("1970")); |
| 415 | + assertEquals(STR_EPOCH, ts.get(b)); |
412 | 416 | } |
413 | 417 |
|
414 | 418 | @Test |
@@ -633,9 +637,9 @@ public SearchResult nextElement() { |
633 | 637 | extAllF.setAccessible(true); |
634 | 638 | String extGrp = (String) extGrpF.get(b); |
635 | 639 | String extAll = (String) extAllF.get(b); |
636 | | - assertTrue(extGrp.startsWith("(objectclass=")); |
637 | | - assertTrue(extAll.contains("modifyTimestamp>=")); |
638 | | - assertTrue(extAll.contains("1970")); |
| 640 | + assertTrue(extGrp.startsWith("(objectclass="), () -> extGrp + ": must start with '" + "(objectclass=" + "'"); |
| 641 | + assertTrue(extAll.contains("modifyTimestamp>="), () -> extAll + ": must contain '" + "modifyTimestamp>=" + "'"); |
| 642 | + assertTrue(extAll.contains(STR_EPOCH), () -> extAll + ": must contain '" + STR_EPOCH + "'"); |
639 | 643 |
|
640 | 644 | @SuppressWarnings("unchecked") |
641 | 645 | Map<String, Map<String, String>> srcGroups = (Map<String, Map<String, String>>) srcGroupsF.get(b); |
|
0 commit comments