1818
1919package org .apache .hadoop .yarn .server .resourcemanager .scheduler ;
2020
21+ import static org .junit .jupiter .api .Assertions .assertEquals ;
22+ import static org .junit .jupiter .api .Assertions .assertFalse ;
23+ import static org .junit .jupiter .api .Assertions .assertNull ;
24+ import static org .junit .jupiter .api .Assertions .assertTrue ;
2125import static org .mockito .Mockito .doReturn ;
2226import static org .mockito .Mockito .mock ;
2327import static org .mockito .Mockito .when ;
3640import org .apache .hadoop .yarn .server .resourcemanager .scheduler .fair .FSLeafQueue ;
3741import org .apache .hadoop .yarn .server .resourcemanager .scheduler .placement .LocalityAppPlacementAllocator ;
3842import org .apache .hadoop .yarn .server .scheduler .SchedulerRequestKey ;
39- import org .junit .Assert ;
40- import org .junit .Test ;
43+ import org .junit .jupiter .api .Test ;
4144
4245public class TestAppSchedulingInfo {
4346
@@ -57,32 +60,32 @@ public void testBacklistChanged() {
5760
5861 appSchedulingInfo .updatePlacesBlacklistedByApp (new ArrayList <String >(),
5962 new ArrayList <String >());
60- Assert . assertFalse (appSchedulingInfo .getAndResetBlacklistChanged ());
63+ assertFalse (appSchedulingInfo .getAndResetBlacklistChanged ());
6164
6265 ArrayList <String > blacklistAdditions = new ArrayList <String >();
6366 blacklistAdditions .add ("node1" );
6467 blacklistAdditions .add ("node2" );
6568 appSchedulingInfo .updatePlacesBlacklistedByApp (blacklistAdditions ,
6669 new ArrayList <String >());
67- Assert . assertTrue (appSchedulingInfo .getAndResetBlacklistChanged ());
70+ assertTrue (appSchedulingInfo .getAndResetBlacklistChanged ());
6871
6972 blacklistAdditions .clear ();
7073 blacklistAdditions .add ("node1" );
7174 appSchedulingInfo .updatePlacesBlacklistedByApp (blacklistAdditions ,
7275 new ArrayList <String >());
73- Assert . assertFalse (appSchedulingInfo .getAndResetBlacklistChanged ());
76+ assertFalse (appSchedulingInfo .getAndResetBlacklistChanged ());
7477
7578 ArrayList <String > blacklistRemovals = new ArrayList <String >();
7679 blacklistRemovals .add ("node1" );
7780 appSchedulingInfo .updatePlacesBlacklistedByApp (new ArrayList <String >(),
7881 blacklistRemovals );
7982 appSchedulingInfo .updatePlacesBlacklistedByApp (new ArrayList <String >(),
8083 blacklistRemovals );
81- Assert . assertTrue (appSchedulingInfo .getAndResetBlacklistChanged ());
84+ assertTrue (appSchedulingInfo .getAndResetBlacklistChanged ());
8285
8386 appSchedulingInfo .updatePlacesBlacklistedByApp (new ArrayList <String >(),
8487 blacklistRemovals );
85- Assert . assertFalse (appSchedulingInfo .getAndResetBlacklistChanged ());
88+ assertFalse (appSchedulingInfo .getAndResetBlacklistChanged ());
8689 }
8790
8891 @ Test
@@ -96,23 +99,23 @@ public void testSchedulerRequestKeyOrdering() {
9699 ts .add (TestUtils .toSchedulerKey (Priority .newInstance (2 ), 6 ));
97100 Iterator <SchedulerRequestKey > iter = ts .iterator ();
98101 SchedulerRequestKey sk = iter .next ();
99- Assert . assertEquals (0 , sk .getPriority ().getPriority ());
100- Assert . assertEquals (3 , sk .getAllocationRequestId ());
102+ assertEquals (0 , sk .getPriority ().getPriority ());
103+ assertEquals (3 , sk .getAllocationRequestId ());
101104 sk = iter .next ();
102- Assert . assertEquals (0 , sk .getPriority ().getPriority ());
103- Assert . assertEquals (4 , sk .getAllocationRequestId ());
105+ assertEquals (0 , sk .getPriority ().getPriority ());
106+ assertEquals (4 , sk .getAllocationRequestId ());
104107 sk = iter .next ();
105- Assert . assertEquals (1 , sk .getPriority ().getPriority ());
106- Assert . assertEquals (1 , sk .getAllocationRequestId ());
108+ assertEquals (1 , sk .getPriority ().getPriority ());
109+ assertEquals (1 , sk .getAllocationRequestId ());
107110 sk = iter .next ();
108- Assert . assertEquals (1 , sk .getPriority ().getPriority ());
109- Assert . assertEquals (2 , sk .getAllocationRequestId ());
111+ assertEquals (1 , sk .getPriority ().getPriority ());
112+ assertEquals (2 , sk .getAllocationRequestId ());
110113 sk = iter .next ();
111- Assert . assertEquals (2 , sk .getPriority ().getPriority ());
112- Assert . assertEquals (5 , sk .getAllocationRequestId ());
114+ assertEquals (2 , sk .getPriority ().getPriority ());
115+ assertEquals (5 , sk .getAllocationRequestId ());
113116 sk = iter .next ();
114- Assert . assertEquals (2 , sk .getPriority ().getPriority ());
115- Assert . assertEquals (6 , sk .getAllocationRequestId ());
117+ assertEquals (2 , sk .getPriority ().getPriority ());
118+ assertEquals (6 , sk .getAllocationRequestId ());
116119 }
117120
118121 @ Test
@@ -128,7 +131,7 @@ public void testSchedulerKeyAccounting() {
128131 AppSchedulingInfo info = new AppSchedulingInfo (
129132 appAttemptId , "test" , queue , mock (ActiveUsersManager .class ), 0 ,
130133 new ResourceUsage (), new HashMap <>(), rmContext , false );
131- Assert . assertEquals (0 , info .getSchedulerKeys ().size ());
134+ assertEquals (0 , info .getSchedulerKeys ().size ());
132135
133136 Priority pri1 = Priority .newInstance (1 );
134137 ResourceRequest req1 = ResourceRequest .newInstance (pri1 ,
@@ -142,16 +145,16 @@ public void testSchedulerKeyAccounting() {
142145 info .updateResourceRequests (reqs , false );
143146 ArrayList <SchedulerRequestKey > keys =
144147 new ArrayList <>(info .getSchedulerKeys ());
145- Assert . assertEquals (2 , keys .size ());
146- Assert . assertEquals (SchedulerRequestKey .create (req1 ), keys .get (0 ));
147- Assert . assertEquals (SchedulerRequestKey .create (req2 ), keys .get (1 ));
148+ assertEquals (2 , keys .size ());
149+ assertEquals (SchedulerRequestKey .create (req1 ), keys .get (0 ));
150+ assertEquals (SchedulerRequestKey .create (req2 ), keys .get (1 ));
148151
149152 // iterate to verify no ConcurrentModificationException
150153 for (SchedulerRequestKey schedulerKey : info .getSchedulerKeys ()) {
151154 info .allocate (NodeType .OFF_SWITCH , null , schedulerKey , null );
152155 }
153- Assert . assertEquals (1 , info .getSchedulerKeys ().size ());
154- Assert . assertEquals (SchedulerRequestKey .create (req2 ),
156+ assertEquals (1 , info .getSchedulerKeys ().size ());
157+ assertEquals (SchedulerRequestKey .create (req2 ),
155158 info .getSchedulerKeys ().iterator ().next ());
156159
157160 req2 = ResourceRequest .newInstance (pri2 ,
@@ -161,22 +164,22 @@ public void testSchedulerKeyAccounting() {
161164 info .updateResourceRequests (reqs , false );
162165 info .allocate (NodeType .OFF_SWITCH , null , SchedulerRequestKey .create (req2 ),
163166 null );
164- Assert . assertEquals (0 , info .getSchedulerKeys ().size ());
167+ assertEquals (0 , info .getSchedulerKeys ().size ());
165168
166169 req1 = ResourceRequest .newInstance (pri1 ,
167170 ResourceRequest .ANY , Resource .newInstance (1024 , 1 ), 5 );
168171 reqs .clear ();
169172 reqs .add (req1 );
170173 info .updateResourceRequests (reqs , false );
171- Assert . assertEquals (1 , info .getSchedulerKeys ().size ());
172- Assert . assertEquals (SchedulerRequestKey .create (req1 ),
174+ assertEquals (1 , info .getSchedulerKeys ().size ());
175+ assertEquals (SchedulerRequestKey .create (req1 ),
173176 info .getSchedulerKeys ().iterator ().next ());
174177 req1 = ResourceRequest .newInstance (pri1 ,
175178 ResourceRequest .ANY , Resource .newInstance (1024 , 1 ), 0 );
176179 reqs .clear ();
177180 reqs .add (req1 );
178181 info .updateResourceRequests (reqs , false );
179- Assert . assertEquals (0 , info .getSchedulerKeys ().size ());
182+ assertEquals (0 , info .getSchedulerKeys ().size ());
180183 }
181184
182185 @ Test
@@ -193,17 +196,17 @@ public void testApplicationPlacementType() {
193196 AppSchedulingInfo info = new AppSchedulingInfo (appAttemptId , "test" , queue ,
194197 mock (ActiveUsersManager .class ), 0 , new ResourceUsage (), new HashMap <>(),
195198 rmContext , false );
196- Assert . assertEquals (info .getApplicationSchedulingEnvs (), new HashMap <>());
199+ assertEquals (info .getApplicationSchedulingEnvs (), new HashMap <>());
197200 // This should return null as nothing is set in the conf.
198- Assert . assertNull (info .getDefaultResourceRequestAppPlacementType ());
201+ assertNull (info .getDefaultResourceRequestAppPlacementType ());
199202 conf = new Configuration ();
200203 conf .set (YarnConfiguration .APPLICATION_PLACEMENT_TYPE_CLASS ,
201204 DEFAULT_APPLICATION_PLACEMENT_TYPE_CLASS );
202205 when (rmContext .getYarnConfiguration ()).thenReturn (conf );
203206 info = new AppSchedulingInfo (appAttemptId , "test" , queue ,
204207 mock (ActiveUsersManager .class ), 0 , new ResourceUsage (), new HashMap <>(),
205208 rmContext , false );
206- Assert . assertEquals (info .getDefaultResourceRequestAppPlacementType (),
209+ assertEquals (info .getDefaultResourceRequestAppPlacementType (),
207210 DEFAULT_APPLICATION_PLACEMENT_TYPE_CLASS );
208211 }
209212
@@ -223,7 +226,7 @@ public void testApplicationPlacementTypeNotConfigured() {
223226 mock (ActiveUsersManager .class ), 0 , new ResourceUsage (),
224227 applicationSchedulingEnvs , rmContext , false );
225228 // This should be set from applicationSchedulingEnvs
226- Assert . assertEquals (info .getDefaultResourceRequestAppPlacementType (),
229+ assertEquals (info .getDefaultResourceRequestAppPlacementType (),
227230 LocalityAppPlacementAllocator .class .getName ());
228231 }
229232}
0 commit comments