[kylin] branch kylin5 updated: [KYLIN-5596] fix kylin5 dashboard test units error issue

[xxyu]

This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/kylin5 by this push:
     new eb3da3e985 [KYLIN-5596] fix kylin5 dashboard test units error issue
eb3da3e985 is described below

commit eb3da3e9853dda12dea91e5db02f57e1867622c2
Author: cli2 <ss_leec...@pku.edu.cn>
AuthorDate: Fri Jun 30 17:39:30 2023 +0800

    [KYLIN-5596] fix kylin5 dashboard test units error issue
---
 .../java/org/apache/kylin/rest/service/DashboardServiceTest.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/src/query-service/src/test/java/org/apache/kylin/rest/service/DashboardServiceTest.java
 
b/src/query-service/src/test/java/org/apache/kylin/rest/service/DashboardServiceTest.java
index 3710ec21ae..2ede77bad0 100644
--- 
a/src/query-service/src/test/java/org/apache/kylin/rest/service/DashboardServiceTest.java
+++ 
b/src/query-service/src/test/java/org/apache/kylin/rest/service/DashboardServiceTest.java
@@ -18,15 +18,15 @@
 
 package org.apache.kylin.rest.service;
 
-import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kylin.common.KylinConfig;
 import org.apache.kylin.common.response.MetricsResponse;
 import org.apache.kylin.engine.spark.utils.ComputedColumnEvalUtil;
+import org.apache.kylin.guava30.shaded.common.collect.Lists;
 import org.apache.kylin.metadata.model.util.ExpandableMeasureUtil;
 import org.apache.kylin.metadata.query.QueryStatistics;
 import org.apache.kylin.metadata.query.RDBMSQueryHistoryDAO;
-import org.apache.kylin.query.util.QueryUtil;
+import org.apache.kylin.query.util.PushDownUtil;
 import org.apache.kylin.rest.constant.Constant;
 import org.apache.kylin.rest.response.JobStatisticsResponse;
 import org.apache.kylin.rest.util.AclEvaluate;
@@ -107,7 +107,7 @@ public class DashboardServiceTest extends SourceTestCase{
         ReflectionTestUtils.setField(modelBuildService, "userGroupService", 
userGroupService);
         ReflectionTestUtils.setField(semanticService, "expandableMeasureUtil",
                 new ExpandableMeasureUtil((model, ccDesc) -> {
-                    String ccExpression = 
QueryUtil.massageComputedColumn(model, model.getProject(), ccDesc,
+                    String ccExpression = 
PushDownUtil.massageComputedColumn(model, model.getProject(), ccDesc,
                             AclPermissionUtil.createAclInfo(model.getProject(),
                                     semanticService.getCurrentUserGroups()));
                     ccDesc.setInnerExpression(ccExpression);