diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/LoggerServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/LoggerServiceTest.java index 193ecb4129..31034e5993 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/LoggerServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/LoggerServiceTest.java @@ -17,24 +17,21 @@ package org.apache.dolphinscheduler.api.service; import org.apache.dolphinscheduler.api.enums.Status; -import org.apache.dolphinscheduler.api.log.LogClient; import org.apache.dolphinscheduler.api.utils.Result; import org.apache.dolphinscheduler.dao.ProcessDao; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; -import org.powermock.api.mockito.PowerMockito; +import org.mockito.junit.MockitoJUnitRunner; import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@RunWith(PowerMockRunner.class) +@RunWith(MockitoJUnitRunner.class) @PrepareForTest({LoggerService.class}) public class LoggerServiceTest { @@ -44,18 +41,7 @@ public class LoggerServiceTest { private LoggerService loggerService; @Mock private ProcessDao processDao; - @Mock - private LogClient logClient; - @Before - public void setUp() { - - try { - PowerMockito.whenNew(LogClient.class).withAnyArguments().thenReturn(logClient); - } catch (Exception e) { - logger.error("setUp error: {}",e.getMessage()); - } - } @Test public void testQueryDataSourceList(){ @@ -73,7 +59,6 @@ public class LoggerServiceTest { //SUCCESS taskInstance.setHost("127.0.0.1"); taskInstance.setLogPath("/temp/log"); - Mockito.when(logClient.rollViewLog("/temp/log",1,1 )).thenReturn("test"); Mockito.when(processDao.findTaskInstanceById(1)).thenReturn(taskInstance); result = loggerService.queryLog(1,1,1); Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue()); @@ -102,11 +87,10 @@ public class LoggerServiceTest { } //success - Mockito.when(logClient.getLogBytes("/temp/log")).thenReturn(new byte[]{}); taskInstance.setHost("127.0.0.1"); taskInstance.setLogPath("/temp/log"); - byte [] result = loggerService.getLogBytes(1); - Assert.assertEquals(0,result.length); + loggerService.getLogBytes(1); + } } \ No newline at end of file