TEZ-3384. Fix TestATSV15HistoryLoggingService::testDAGGroupingGroupingEnabled unit test. (Sushmitha Sreenivasan via hitesh)
diff --git a/CHANGES.txt b/CHANGES.txt
index cdbd4c2..1df4d09 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@
 
 ALL CHANGES:
 
+  TEZ-3384. Fix TestATSV15HistoryLoggingService::testDAGGroupingGroupingEnabled unit test.
   TEZ-3382. Tez analyzer: Should be resilient to new counters.
   TEZ-3379. Tez analyzer: Move sysout to log4j.
   TEZ-3376. Fix groupId generation to account for dagId starting with 1.
@@ -93,6 +94,7 @@
 
 ALL CHANGES:
 
+  TEZ-3384. Fix TestATSV15HistoryLoggingService::testDAGGroupingGroupingEnabled unit test.
   TEZ-3376. Fix groupId generation to account for dagId starting with 1.
   TEZ-3359. Add granular log levels for HistoryLoggingService.
   TEZ-3374. Change TEZ_HISTORY_LOGGING_TIMELINE_NUM_DAGS_PER_GROUP conf key name.
diff --git a/tez-plugins/tez-yarn-timeline-history-with-fs/src/test/java/org/apache/tez/dag/history/logging/ats/TestATSV15HistoryLoggingService.java b/tez-plugins/tez-yarn-timeline-history-with-fs/src/test/java/org/apache/tez/dag/history/logging/ats/TestATSV15HistoryLoggingService.java
index 87a48f6..1869b56 100644
--- a/tez-plugins/tez-yarn-timeline-history-with-fs/src/test/java/org/apache/tez/dag/history/logging/ats/TestATSV15HistoryLoggingService.java
+++ b/tez-plugins/tez-yarn-timeline-history-with-fs/src/test/java/org/apache/tez/dag/history/logging/ats/TestATSV15HistoryLoggingService.java
@@ -123,16 +123,16 @@
   public void testDAGGroupingGroupingEnabled() throws Exception {
     int numDagsPerGroup = 100;
     ATSV15HistoryLoggingService service = createService(numDagsPerGroup);
-    TezDAGID dagId1 = TezDAGID.getInstance(appId, 0);
+    TezDAGID dagId1 = TezDAGID.getInstance(appId, 1);
     for (DAGHistoryEvent event : makeHistoryEvents(dagId1, service)) {
       service.handle(event);
     }
-    TezDAGID dagId2 = TezDAGID.getInstance(appId, numDagsPerGroup - 1);
+    TezDAGID dagId2 = TezDAGID.getInstance(appId, numDagsPerGroup );
     for (DAGHistoryEvent event : makeHistoryEvents(dagId2, service)) {
       service.handle(event);
     }
 
-    TezDAGID dagId3 = TezDAGID.getInstance(appId, numDagsPerGroup);
+    TezDAGID dagId3 = TezDAGID.getInstance(appId, numDagsPerGroup + 1);
     for (DAGHistoryEvent event : makeHistoryEvents(dagId3, service)) {
       service.handle(event);
     }