ayushtkn commented on code in PR #4707: URL: https://github.com/apache/hive/pull/4707#discussion_r1336842488
########## ql/src/java/org/apache/hadoop/hive/ql/util/TimeUtil.java: ########## @@ -0,0 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hive.ql.util; + +/** + * Makes it possible to mock test your code. + */ +public class TimeUtil { Review Comment: Why is this class required? For mocking? Can't we use the existing util class like ```Time.monotonicNowNanos()```? rather than introducing our own ########## ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestAtlasDumpTask.java: ########## @@ -92,48 +90,40 @@ public class TestAtlasDumpTask { @Test public void testAtlasDumpMetrics() throws Exception { - Mockito.when(work.getMetricCollector()).thenReturn(metricCollector); - Mockito.when(conf.get(HiveConf.ConfVars.REPL_ATLAS_ENDPOINT.varname)).thenReturn("http://localhost:21000/atlas";); - Mockito.when(conf.get(HiveConf.ConfVars.REPL_ATLAS_REPLICATED_TO_DB.varname)).thenReturn("tgtDb"); - Mockito.when(conf.get(HiveConf.ConfVars.REPL_SOURCE_CLUSTER_NAME.varname)).thenReturn("srcCluster"); - Mockito.when(conf.get(HiveConf.ConfVars.REPL_TARGET_CLUSTER_NAME.varname)).thenReturn("tgtCluster"); - Mockito.when(conf.get(ReplUtils.DEFAULT_FS_CONFIG)).thenReturn("hdfs:tgtFsUri:8020"); - Mockito.when(work.getStagingDir()).thenReturn(new Path("hdfs://tmp:8020/staging")); - Mockito.when(work.getSrcDB()).thenReturn("srcDB"); - Mockito.when(work.isBootstrap()).thenReturn(true); - atlasDumpTask = new AtlasDumpTask(atlasRestClient, conf, work); + AtlasDumpLogger logger = mock(AtlasDumpLogger.class); + when(work.getMetricCollector()).thenReturn(metricCollector); + when(conf.get(HiveConf.ConfVars.REPL_ATLAS_ENDPOINT.varname)).thenReturn("http://localhost:21000/atlas";); + when(conf.get(HiveConf.ConfVars.REPL_ATLAS_REPLICATED_TO_DB.varname)).thenReturn("tgtDb"); + when(conf.get(HiveConf.ConfVars.REPL_SOURCE_CLUSTER_NAME.varname)).thenReturn("srcCluster"); + when(conf.get(HiveConf.ConfVars.REPL_TARGET_CLUSTER_NAME.varname)).thenReturn("tgtCluster"); + when(conf.get(ReplUtils.DEFAULT_FS_CONFIG)).thenReturn("hdfs:tgtFsUri:8020"); + when(work.getStagingDir()).thenReturn(new Path("hdfs://tmp:8020/staging")); + when(work.getSrcDB()).thenReturn("srcDB"); + when(work.isBootstrap()).thenReturn(true); + ReplLoggerFactory replLoggerFactoryMock = mock(ReplLoggerFactory.class); + when(replLoggerFactoryMock.createAtlasDumpLogger(anyString(), anyString())).thenReturn(logger); + atlasDumpTask = new AtlasDumpTask(atlasRestClient, conf, work, replLoggerFactoryMock); AtlasDumpTask atlasDumpTaskSpy = Mockito.spy(atlasDumpTask); - Mockito.when(conf.getBoolVar(HiveConf.ConfVars.HIVE_IN_TEST_REPL)).thenReturn(true); - Logger logger = Mockito.mock(Logger.class); - Whitebox.setInternalState(ReplState.class, logger); + when(conf.getBoolVar(HiveConf.ConfVars.HIVE_IN_TEST_REPL)).thenReturn(true); Mockito.doReturn(0L).when(atlasDumpTaskSpy) - .dumpAtlasMetaData(Mockito.any(AtlasRequestBuilder.class), Mockito.any(AtlasReplInfo.class)); - Mockito.doNothing().when(atlasDumpTaskSpy).createDumpMetadata(Mockito.any(AtlasReplInfo.class), - Mockito.any(Long.class)); + .dumpAtlasMetaData(any(AtlasRequestBuilder.class), any(AtlasReplInfo.class)); + Mockito.doNothing().when(atlasDumpTaskSpy).createDumpMetadata(any(AtlasReplInfo.class), + any(Long.class)); int status = atlasDumpTaskSpy.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_DUMP_START", eventCaptor.getAllValues().get(0)); - Assert.assertEquals("ATLAS_DUMP_END", eventCaptor.getAllValues().get(1)); - Assert.assertTrue(eventDetailsCaptor.getAllValues().get(1).toString(), eventDetailsCaptor.getAllValues().get(0) - .toString().contains("{\"dbName\":\"srcDB\",\"dumpStartTime")); - Assert.assertTrue(eventDetailsCaptor - .getAllValues().get(1).toString().contains("{\"dbName\":\"srcDB\",\"dumpEndTime\"")); Review Comment: Where are we validating these things now? ########## 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: removing assertions? ########## ql/src/test/org/apache/hadoop/hive/ql/exec/util/TestRetryable.java: ########## @@ -340,7 +345,7 @@ public void testRetrySuccessSecureCallable() throws Throwable { ArgumentCaptor<PrivilegedExceptionAction> privilegedActionArgumentCaptor = ArgumentCaptor.forClass(PrivilegedExceptionAction.class); Mockito.verify(userGroupInformation, - Mockito.times(3)).doAs(privilegedActionArgumentCaptor.capture()); + Mockito.times(1)).doAs(privilegedActionArgumentCaptor.capture()); Review Comment: why did the value change? ########## 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: removed? ########## ql/src/test/org/apache/hadoop/hive/ql/parse/repl/TestCopyUtils.java: ########## @@ -97,151 +96,159 @@ public void shouldThrowExceptionOnDistcpFailure() throws Exception { List<Path> srcPaths = Arrays.asList(source, source); HiveConf conf = mock(HiveConf.class); CopyUtils copyUtils = Mockito.spy(new CopyUtils(null, conf, fs)); + doReturn(false).when(copyUtils).regularCopy(same(fs), anyList()); - mockStatic(FileUtils.class); - mockStatic(Utils.class); - when(destination.getFileSystem(same(conf))).thenReturn(fs); when(source.getFileSystem(same(conf))).thenReturn(fs); - when(FileUtils.distCp(same(fs), anyListOf(Path.class), same(destination), - anyBoolean(), eq(null), same(conf), - same(ShimLoader.getHadoopShims()))) - .thenReturn(false); - when(Utils.getUGI()).thenReturn(mock(UserGroupInformation.class)); - doReturn(false).when(copyUtils).regularCopy(same(fs), anyListOf(ReplChangeManager.FileInfo.class)); - - copyUtils.doCopy(destination, srcPaths); + try ( + MockedStatic<FileUtils> fileUtilsMockedStatic = mockStatic(FileUtils.class); + MockedStatic<Utils> utilsMockedStatic = mockStatic(Utils.class) + ) { + fileUtilsMockedStatic.when(() -> FileUtils.distCp(same(fs), anyList(), same(destination), + anyBoolean(), eq(null), same(conf), + same(ShimLoader.getHadoopShims()))) + .thenReturn(false); + utilsMockedStatic.when(Utils::getUGI).thenReturn(mock(UserGroupInformation.class)); + + copyUtils.doCopy(destination, srcPaths); + } Review Comment: this doesn't look formatted properly ``` when(source.getFileSystem(same(conf))).thenReturn(fs); try (MockedStatic<FileUtils> fileUtilsMockedStatic = mockStatic(FileUtils.class); MockedStatic<Utils> utilsMockedStatic = mockStatic(Utils.class)) { fileUtilsMockedStatic.when( () -> FileUtils.distCp(same(fs), anyList(), same(destination), anyBoolean(), eq(null), same(conf), same(ShimLoader.getHadoopShims()))).thenReturn(false); utilsMockedStatic.when(Utils::getUGI).thenReturn(mock(UserGroupInformation.class)); copyUtils.doCopy(destination, srcPaths); } ``` -- 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
