InvisibleProgrammer commented on code in PR #4707:
URL: https://github.com/apache/hive/pull/4707#discussion_r1337262187
##########
ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestAtlasLoadTask.java:
##########
@@ -51,32 +55,21 @@ public class TestAtlasLoadTask {
@Test
public void testAtlasLoadMetrics() throws Exception {
+ AtlasLoadLogger logger = Mockito.mock(AtlasLoadLogger.class);
Mockito.when(work.getMetricCollector()).thenReturn(metricCollector);
- atlasLoadTask = new AtlasLoadTask(conf, work);
+ ReplLoggerFactory replLoggerFactoryMock = mock(ReplLoggerFactory.class);
+ when(replLoggerFactoryMock.createAtlasLoadLogger(anyString(), anyString(),
anyString())).thenReturn(logger);
+ atlasLoadTask = new AtlasLoadTask(conf, work, replLoggerFactoryMock);
AtlasLoadTask atlasLoadTaskSpy = Mockito.spy(atlasLoadTask);
Mockito.when(conf.getBoolVar(HiveConf.ConfVars.HIVE_IN_TEST_REPL)).thenReturn(true);
- Logger logger = Mockito.mock(Logger.class);
- Whitebox.setInternalState(ReplState.class, logger);
AtlasReplInfo atlasReplInfo = new
AtlasReplInfo("http://localhost:21000/atlas";, "srcDB",
"tgtDB", "srcCluster", "tgtCluster", new Path("hdfs://tmp"), null,
conf);
atlasReplInfo.setSrcFsUri("hdfs://srcFsUri:8020");
atlasReplInfo.setTgtFsUri("hdfs:tgtFsUri:8020");
Mockito.doReturn(atlasReplInfo).when(atlasLoadTaskSpy).createAtlasReplInfo();
int status = atlasLoadTaskSpy.execute();
Assert.assertEquals(0, status);
- ArgumentCaptor<String> replStateCaptor =
ArgumentCaptor.forClass(String.class);
- ArgumentCaptor<Object> eventCaptor = ArgumentCaptor.forClass(Object.class);
- ArgumentCaptor<Object> eventDetailsCaptor =
ArgumentCaptor.forClass(Object.class);
- Mockito.verify(logger,
- Mockito.times(2)).info(replStateCaptor.capture(),
- eventCaptor.capture(), eventDetailsCaptor.capture());
- Assert.assertEquals("REPL::{}: {}", replStateCaptor.getAllValues().get(0));
- Assert.assertEquals("ATLAS_LOAD_START", eventCaptor.getAllValues().get(0));
- Assert.assertEquals("ATLAS_LOAD_END", eventCaptor.getAllValues().get(1));
- Assert.assertTrue(eventDetailsCaptor.getAllValues().get(0)
-
.toString().contains("{\"sourceDbName\":\"srcDB\",\"targetDbName\":\"tgtDB\",\"loadStartTime\":"));
- Assert.assertTrue(eventDetailsCaptor
-
.getAllValues().get(1).toString().contains("{\"sourceDbName\":\"srcDB\",\"targetDbName\""
- + ":\"tgtDB\",\"numOfEntities\":0,\"loadEndTime\""));
Review Comment:
Same as Same as at TestAtlasDumpTask.java.
##########
ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestRangerDumpTask.java:
##########
@@ -124,50 +127,39 @@ public void testSuccessNonEmptyRangerPolicies() throws
Exception {
+
"\"dataMaskPolicyItems\":[],\"rowFilterPolicyItems\":[],\"id\":40,\"guid\":"
+
"\"4e2b3406-7b9a-4004-8cdf-7a239c8e2cae\",\"isEnabled\":true,\"version\":1}]}";
RangerExportPolicyList rangerPolicyList = new
Gson().fromJson(rangerResponse, RangerExportPolicyList.class);
- Mockito.when(mockClient.exportRangerPolicies(Mockito.anyString(),
Mockito.anyString(), Mockito.anyString(),
+ when(mockClient.exportRangerPolicies(Mockito.anyString(),
Mockito.anyString(), Mockito.anyString(),
Mockito.any()))
.thenReturn(rangerPolicyList);
- Mockito.when(conf.get(RANGER_REST_URL)).thenReturn("rangerEndpoint");
- Mockito.when(conf.get(RANGER_HIVE_SERVICE_NAME)).thenReturn("hive");
- Mockito.when(work.getDbName()).thenReturn("testdb");
+ when(conf.get(RANGER_REST_URL)).thenReturn("rangerEndpoint");
+ when(conf.get(RANGER_HIVE_SERVICE_NAME)).thenReturn("hive");
+ when(work.getDbName()).thenReturn("testdb");
Path rangerDumpPath = new Path("/tmp");
- Mockito.when(work.getCurrentDumpPath()).thenReturn(rangerDumpPath);
+ when(work.getCurrentDumpPath()).thenReturn(rangerDumpPath);
Path policyFile = new Path(rangerDumpPath,
ReplUtils.HIVE_RANGER_POLICIES_FILE_NAME);
- Mockito.when(mockClient.saveRangerPoliciesToFile(rangerPolicyList,
rangerDumpPath,
+ when(mockClient.saveRangerPoliciesToFile(rangerPolicyList, rangerDumpPath,
ReplUtils.HIVE_RANGER_POLICIES_FILE_NAME, conf)).thenReturn(policyFile);
- Mockito.when(work.getRangerConfigResource()).thenReturn(new
URL("file://ranger.xml"));
+ when(work.getRangerConfigResource()).thenReturn(new
URL("file://ranger.xml"));
int status = task.execute();
Assert.assertEquals(0, status);
}
@Test
public void testSuccessRangerDumpMetrics() throws Exception {
- Logger logger = Mockito.mock(Logger.class);
- Whitebox.setInternalState(ReplState.class, logger);
+ RangerDumpLogger logger = mock(RangerDumpLogger.class);
+ when(replLoggerFactory.createRangerDumpLogger(anyString(),
anyString())).thenReturn(logger);
RangerExportPolicyList rangerPolicyList = new RangerExportPolicyList();
rangerPolicyList.setPolicies(new ArrayList<RangerPolicy>());
- Mockito.when(mockClient.exportRangerPolicies(Mockito.anyString(),
Mockito.anyString(), Mockito.anyString(),
+ when(mockClient.exportRangerPolicies(Mockito.anyString(),
Mockito.anyString(), Mockito.anyString(),
Mockito.any()))
.thenReturn(rangerPolicyList);
- Mockito.when(conf.get(RANGER_REST_URL)).thenReturn("rangerEndpoint");
- Mockito.when(conf.get(RANGER_HIVE_SERVICE_NAME)).thenReturn("hive");
- Mockito.when(work.getDbName()).thenReturn("testdb");
- Mockito.when(work.getCurrentDumpPath()).thenReturn(new Path("/tmp"));
- Mockito.when(work.getRangerConfigResource()).thenReturn(new
URL("file://ranger.xml"));
+ when(conf.get(RANGER_REST_URL)).thenReturn("rangerEndpoint");
+ when(conf.get(RANGER_HIVE_SERVICE_NAME)).thenReturn("hive");
+ when(work.getDbName()).thenReturn("testdb");
+ when(work.getCurrentDumpPath()).thenReturn(new Path("/tmp"));
+ when(work.getRangerConfigResource()).thenReturn(new
URL("file://ranger.xml"));
int status = task.execute();
Assert.assertEquals(0, status);
- ArgumentCaptor<String> replStateCaptor =
ArgumentCaptor.forClass(String.class);
- ArgumentCaptor<Object> eventCaptor = ArgumentCaptor.forClass(Object.class);
- ArgumentCaptor<Object> eventDetailsCaptor =
ArgumentCaptor.forClass(Object.class);
- Mockito.verify(logger,
- Mockito.times(2)).info(replStateCaptor.capture(),
- eventCaptor.capture(), eventDetailsCaptor.capture());
- Assert.assertEquals("REPL::{}: {}", replStateCaptor.getAllValues().get(0));
- Assert.assertEquals("RANGER_DUMP_START",
eventCaptor.getAllValues().get(0));
- Assert.assertEquals("RANGER_DUMP_END", eventCaptor.getAllValues().get(1));
- Assert.assertTrue(eventDetailsCaptor.getAllValues().get(0)
- .toString().contains("{\"dbName\":\"testdb\",\"dumpStartTime"));
- Assert.assertTrue(eventDetailsCaptor
-
.getAllValues().get(1).toString().contains("{\"dbName\":\"testdb\",\"actualNumPolicies\":0,\"dumpEndTime\""));
Review Comment:
Same as Same as at TestAtlasDumpTask.java.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: gitbox-unsubscr...@hive.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscr...@hive.apache.org
For additional commands, e-mail: gitbox-h...@hive.apache.org
