Skip to content

ATLAS-5245: fix unittest failures in EntitySearchProcessorTest #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mneethiraj merged 2 commits into from
Mar 23, 2026
Merged

ATLAS-5245: fix unittest failures in EntitySearchProcessorTest #574

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cf5650
ATLAS-5245: fix unittest failures in EntitySearchProcessorTest
mneethiraj Mar 23, 2026
0c957ac
ATLAS-5245: address review suggestions
mneethiraj Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 31 additions & 26 deletions repository/src/test/java/org/apache/atlas/discovery/EntitySearchProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
import java.util.TimeZone;
import java.util.stream.Collectors;
Expand All @@ -67,6 +66,7 @@ public class EntitySearchProcessorTest extends BasicTestSetup {

private static final SimpleDateFormat FORMATTED_DATE = new SimpleDateFormat("dd-MMM-yyyy");
private static final String EXPECTED_ENTITY_NAME = "hive_Table_Null_tableType";
private static final TimeZone TIME_ZONE_UTC = TimeZone.getTimeZone("UTC");

@Inject
public GraphBackedSearchIndexer indexer;
Expand All @@ -90,7 +90,7 @@ public void setup() throws Exception {
setupTestData();
createJapaneseEntityWithDescription();
createChineseEntityWithDescription();
FORMATTED_DATE.setTimeZone(TimeZone.getTimeZone("UTC"));
FORMATTED_DATE.setTimeZone(TIME_ZONE_UTC);
}

@Test
Expand Down Expand Up @@ -396,10 +396,11 @@ public void teardown() throws Exception {

@Test
public void testLast7Days() throws AtlasBaseException {
SearchParameters.FilterCriteria ret = filtercriteriaDateRange("LAST_7_DAYS", typeRegistry, graph);
SearchParameters.FilterCriteria ret = filtercriteriaDateRange("LAST_7_DAYS", typeRegistry, graph);
Calendar startDate = Calendar.getInstance(TIME_ZONE_UTC);
Calendar endDate = Calendar.getInstance(TIME_ZONE_UTC);

ret.setAttributeName("createTime");
GregorianCalendar startDate = new GregorianCalendar();
GregorianCalendar endDate = new GregorianCalendar();
startDate.add(Calendar.DATE, -6);

String[] dates = ret.getAttributeValue().split(",");
Expand All @@ -413,8 +414,8 @@ public void testLast7Days() throws AtlasBaseException {
@Test
public void testLastMonth() throws AtlasBaseException {
SearchParameters.FilterCriteria ret = filtercriteriaDateRange("LAST_MONTH", typeRegistry, graph);
Calendar originalstartdate = Calendar.getInstance();
Calendar originalenddate = Calendar.getInstance();
Calendar originalstartdate = Calendar.getInstance(TIME_ZONE_UTC);
Calendar originalenddate = Calendar.getInstance(TIME_ZONE_UTC);

originalstartdate.add(Calendar.MONTH, -1);
originalstartdate.set(Calendar.DAY_OF_MONTH, originalstartdate.getActualMinimum(Calendar.DAY_OF_MONTH));
Expand All @@ -432,8 +433,9 @@ public void testLastMonth() throws AtlasBaseException {
@Test
public void testLast30Days() throws AtlasBaseException {
SearchParameters.FilterCriteria ret = filtercriteriaDateRange("LAST_30_DAYS", typeRegistry, graph);
GregorianCalendar startDate = new GregorianCalendar();
GregorianCalendar endDate = new GregorianCalendar();
Calendar startDate = Calendar.getInstance(TIME_ZONE_UTC);
Calendar endDate = Calendar.getInstance(TIME_ZONE_UTC);

startDate.add(Calendar.DATE, -29);

String[] dates = ret.getAttributeValue().split(",");
Expand All @@ -447,7 +449,8 @@ public void testLast30Days() throws AtlasBaseException {
@Test
public void testYesterday() throws AtlasBaseException {
SearchParameters.FilterCriteria ret = filtercriteriaDateRange("YESTERDAY", typeRegistry, graph);
GregorianCalendar yesterdayDate = new GregorianCalendar();
Calendar yesterdayDate = Calendar.getInstance(TIME_ZONE_UTC);

yesterdayDate.add(Calendar.DATE, -1);

String[] dates = ret.getAttributeValue().split(",");
Expand All @@ -459,8 +462,8 @@ public void testYesterday() throws AtlasBaseException {
@Test
public void testThisMonth() throws AtlasBaseException {
SearchParameters.FilterCriteria ret = filtercriteriaDateRange("THIS_MONTH", typeRegistry, graph);
Calendar originalstartdate = Calendar.getInstance();
Calendar originalenddate = Calendar.getInstance();
Calendar originalstartdate = Calendar.getInstance(TIME_ZONE_UTC);
Calendar originalenddate = Calendar.getInstance(TIME_ZONE_UTC);

originalstartdate.set(Calendar.DAY_OF_MONTH, originalstartdate.getActualMinimum(Calendar.DAY_OF_MONTH));
originalenddate.set(Calendar.DAY_OF_MONTH, originalenddate.getActualMaximum(Calendar.DAY_OF_MONTH));
Expand All @@ -476,8 +479,9 @@ public void testThisMonth() throws AtlasBaseException {
@Test
public void testThisQuarter() throws AtlasBaseException {
SearchParameters.FilterCriteria ret = filtercriteriaDateRange("THIS_QUARTER", typeRegistry, graph);
Calendar originalstartdate = Calendar.getInstance();
Calendar originalenddate = Calendar.getInstance();
Calendar originalstartdate = Calendar.getInstance(TIME_ZONE_UTC);
Calendar originalenddate = Calendar.getInstance(TIME_ZONE_UTC);

originalstartdate.add(Calendar.MONTH, -1);
originalstartdate.set(Calendar.DAY_OF_MONTH, originalstartdate.getActualMinimum(Calendar.DAY_OF_MONTH));
originalenddate.add(Calendar.MONTH, 1);
Expand All @@ -494,8 +498,9 @@ public void testThisQuarter() throws AtlasBaseException {
@Test
public void testLastQuarter() throws AtlasBaseException {
SearchParameters.FilterCriteria ret = filtercriteriaDateRange("LAST_QUARTER", typeRegistry, graph);
Calendar originalstartdate = Calendar.getInstance();
Calendar originalenddate = Calendar.getInstance();
Calendar originalstartdate = Calendar.getInstance(TIME_ZONE_UTC);
Calendar originalenddate = Calendar.getInstance(TIME_ZONE_UTC);

originalstartdate.add(Calendar.MONTH, -4);
originalstartdate.set(Calendar.DAY_OF_MONTH, originalstartdate.getActualMinimum(Calendar.DAY_OF_MONTH));
originalenddate.add(Calendar.MONTH, -2);
Expand All @@ -512,8 +517,8 @@ public void testLastQuarter() throws AtlasBaseException {
@Test
public void testLast3Months() throws AtlasBaseException {
SearchParameters.FilterCriteria ret = filtercriteriaDateRange("LAST_3_MONTHS", typeRegistry, graph);
Calendar originalstartdate = Calendar.getInstance();
Calendar originalenddate = Calendar.getInstance();
Calendar originalstartdate = Calendar.getInstance(TIME_ZONE_UTC);
Calendar originalenddate = Calendar.getInstance(TIME_ZONE_UTC);

originalstartdate.add(Calendar.MONTH, -3);
originalstartdate.set(Calendar.DAY_OF_MONTH, originalstartdate.getActualMinimum(Calendar.DAY_OF_MONTH));
Expand All @@ -531,8 +536,8 @@ public void testLast3Months() throws AtlasBaseException {
@Test
public void testThisYear() throws AtlasBaseException {
SearchParameters.FilterCriteria ret = filtercriteriaDateRange("THIS_YEAR", typeRegistry, graph);
Calendar originalstartdate = Calendar.getInstance();
Calendar originalenddate = Calendar.getInstance();
Calendar originalstartdate = Calendar.getInstance(TIME_ZONE_UTC);
Calendar originalenddate = Calendar.getInstance(TIME_ZONE_UTC);

originalstartdate.set(Calendar.MONTH, 0);
originalstartdate.set(Calendar.DAY_OF_MONTH, originalstartdate.getActualMinimum(Calendar.DAY_OF_MONTH));
Expand All @@ -551,8 +556,8 @@ public void testThisYear() throws AtlasBaseException {
@Test
public void testLastYear() throws AtlasBaseException {
SearchParameters.FilterCriteria ret = filtercriteriaDateRange("LAST_YEAR", typeRegistry, graph);
Calendar originalstartdate = Calendar.getInstance();
Calendar originalenddate = Calendar.getInstance();
Calendar originalstartdate = Calendar.getInstance(TIME_ZONE_UTC);
Calendar originalenddate = Calendar.getInstance(TIME_ZONE_UTC);

originalstartdate.add(Calendar.YEAR, -1);
originalstartdate.set(Calendar.MONTH, 0);
Expand All @@ -573,8 +578,8 @@ public void testLastYear() throws AtlasBaseException {
@Test
public void testLast12Months() throws AtlasBaseException {
SearchParameters.FilterCriteria ret = filtercriteriaDateRange("LAST_12_MONTHS", typeRegistry, graph);
Calendar originalstartdate = Calendar.getInstance();
Calendar originalenddate = Calendar.getInstance();
Calendar originalstartdate = Calendar.getInstance(TIME_ZONE_UTC);
Calendar originalenddate = Calendar.getInstance(TIME_ZONE_UTC);

originalstartdate.add(Calendar.MONTH, -12);
originalstartdate.set(Calendar.DAY_OF_MONTH, originalstartdate.getActualMinimum(Calendar.DAY_OF_MONTH));
Expand All @@ -593,8 +598,8 @@ public void testLast12Months() throws AtlasBaseException {
@Test
public void testLast6Months() throws AtlasBaseException {
SearchParameters.FilterCriteria ret = filtercriteriaDateRange("LAST_6_MONTHS", typeRegistry, graph);
Calendar originalstartdate = Calendar.getInstance();
Calendar originalenddate = Calendar.getInstance();
Calendar originalstartdate = Calendar.getInstance(TIME_ZONE_UTC);
Calendar originalenddate = Calendar.getInstance(TIME_ZONE_UTC);

originalstartdate.add(Calendar.MONTH, -6);
originalstartdate.set(Calendar.DAY_OF_MONTH, originalstartdate.getActualMinimum(Calendar.DAY_OF_MONTH));
Expand Down
Loading