Skip to content

Commit ca0675e

Browse files
authored
RANGER-5527: fix unit tests in TestLdapUserGroupBuilder (#887)
1 parent e291436 commit ca0675e

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

ugsync/src/test/java/org/apache/ranger/ldapusersync/process/TestLdapUserGroupBuilder.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@
5252
import java.lang.reflect.Field;
5353
import java.lang.reflect.Method;
5454
import java.lang.reflect.Proxy;
55+
import java.text.SimpleDateFormat;
5556
import java.util.Collections;
57+
import java.util.Date;
5658
import java.util.HashMap;
5759
import java.util.HashSet;
5860
import java.util.Map;
@@ -85,6 +87,8 @@
8587
@CreateLdapConnectionPool(maxActive = 1, maxWait = 5000)
8688
@ApplyLdifFiles("ADSchema.ldif")
8789
public class TestLdapUserGroupBuilder extends AbstractLdapTestUnit {
90+
private static final String STR_EPOCH = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date(0));
91+
8892
@Test
8993
public void testA_init_and_isChanged() throws Exception {
9094
resetConfig();
@@ -408,7 +412,7 @@ public void testU_user_config_fields_reflect_properties_and_timestamps_initializ
408412

409413
assertEquals("uid", uName.get(b));
410414
assertEquals("(uid=*)", uFil.get(b));
411-
assertTrue(((String) ts.get(b)).startsWith("1970"));
415+
assertEquals(STR_EPOCH, ts.get(b));
412416
}
413417

414418
@Test
@@ -633,9 +637,9 @@ public SearchResult nextElement() {
633637
extAllF.setAccessible(true);
634638
String extGrp = (String) extGrpF.get(b);
635639
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 + "'");
639643

640644
@SuppressWarnings("unchecked")
641645
Map<String, Map<String, String>> srcGroups = (Map<String, Map<String, String>>) srcGroupsF.get(b);

0 commit comments

Comments
 (0)