You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2019/10/24 11:30:53 UTC
[griffin] branch master updated: fix tests failure
This is an automated email from the ASF dual-hosted git repository.
guoyp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/griffin.git
The following commit(s) were added to refs/heads/master by this push:
new 30eb3dd fix tests failure
30eb3dd is described below
commit 30eb3dd9796ac10b30e7a21dc6c46926d8a56738
Author: ahutsunshine <ah...@gmail.com>
AuthorDate: Thu Oct 24 19:30:35 2019 +0800
fix tests failure
1. fix hive connect failure
2.improve test run time
Author: ahutsunshine <ah...@gmail.com>
Closes #543 from ahutsunshine/master.
---
.../src/test/java/org/apache/griffin/core/job/EventServiceTest.java | 5 +++++
.../java/org/apache/griffin/core/job/JobInstanceBeanRepoTest.java | 5 +++++
.../java/org/apache/griffin/core/job/repo/JobInstanceRepoTest.java | 6 ++++++
.../src/test/java/org/apache/griffin/core/job/repo/JobRepoTest.java | 6 ++++++
.../org/apache/griffin/core/measure/repo/DataConnectorRepoTest.java | 5 +++++
.../java/org/apache/griffin/core/measure/repo/MeasureRepoTest.java | 5 +++++
6 files changed, 32 insertions(+)
diff --git a/service/src/test/java/org/apache/griffin/core/job/EventServiceTest.java b/service/src/test/java/org/apache/griffin/core/job/EventServiceTest.java
index bcd5356..16102e4 100644
--- a/service/src/test/java/org/apache/griffin/core/job/EventServiceTest.java
+++ b/service/src/test/java/org/apache/griffin/core/job/EventServiceTest.java
@@ -34,6 +34,7 @@ import org.apache.griffin.core.job.entity.JobDataSegment;
import org.apache.griffin.core.measure.entity.GriffinMeasure;
import org.apache.griffin.core.measure.entity.Measure;
import org.apache.griffin.core.util.EntityMocksHelper;
+import org.apache.hadoop.hive.metastore.IMetaStoreClient;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -41,6 +42,7 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@@ -59,6 +61,9 @@ public class EventServiceTest {
@Autowired
private List<GriffinEvent> eventList;
+ @MockBean
+ private IMetaStoreClient client;
+
@Before
public void setup() throws Exception {
entityManager.clear();
diff --git a/service/src/test/java/org/apache/griffin/core/job/JobInstanceBeanRepoTest.java b/service/src/test/java/org/apache/griffin/core/job/JobInstanceBeanRepoTest.java
index 7ef743b..76f08e9 100644
--- a/service/src/test/java/org/apache/griffin/core/job/JobInstanceBeanRepoTest.java
+++ b/service/src/test/java/org/apache/griffin/core/job/JobInstanceBeanRepoTest.java
@@ -34,12 +34,14 @@ import org.apache.griffin.core.job.entity.JobInstanceBean;
import org.apache.griffin.core.job.entity.LivySessionStates;
import org.apache.griffin.core.job.entity.VirtualJob;
import org.apache.griffin.core.job.repo.JobInstanceRepo;
+import org.apache.hadoop.hive.metastore.IMetaStoreClient;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.PropertySource;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
@@ -59,6 +61,9 @@ public class JobInstanceBeanRepoTest {
@Autowired
private JobInstanceRepo jobInstanceRepo;
+ @MockBean
+ private IMetaStoreClient client;
+
@Before
public void setUp() {
setEntityManager();
diff --git a/service/src/test/java/org/apache/griffin/core/job/repo/JobInstanceRepoTest.java b/service/src/test/java/org/apache/griffin/core/job/repo/JobInstanceRepoTest.java
index 508a663..d745dd5 100644
--- a/service/src/test/java/org/apache/griffin/core/job/repo/JobInstanceRepoTest.java
+++ b/service/src/test/java/org/apache/griffin/core/job/repo/JobInstanceRepoTest.java
@@ -39,12 +39,15 @@ import org.apache.griffin.core.config.EclipseLinkJpaConfigForTest;
import org.apache.griffin.core.job.entity.BatchJob;
import org.apache.griffin.core.job.entity.JobInstanceBean;
import org.apache.griffin.core.job.entity.StreamingJob;
+import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
+import org.apache.hadoop.hive.metastore.IMetaStoreClient;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
@@ -58,6 +61,9 @@ public class JobInstanceRepoTest {
@Autowired
private JobInstanceRepo jobInstanceRepo;
+
+ @MockBean
+ private IMetaStoreClient client;
private List<Long> entityIds;
diff --git a/service/src/test/java/org/apache/griffin/core/job/repo/JobRepoTest.java b/service/src/test/java/org/apache/griffin/core/job/repo/JobRepoTest.java
index 2b775c8..66cb327 100644
--- a/service/src/test/java/org/apache/griffin/core/job/repo/JobRepoTest.java
+++ b/service/src/test/java/org/apache/griffin/core/job/repo/JobRepoTest.java
@@ -27,12 +27,14 @@ import org.apache.griffin.core.config.EclipseLinkJpaConfigForTest;
import org.apache.griffin.core.job.entity.AbstractJob;
import org.apache.griffin.core.job.entity.BatchJob;
import org.apache.griffin.core.job.entity.VirtualJob;
+import org.apache.hadoop.hive.metastore.IMetaStoreClient;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
@@ -47,6 +49,10 @@ public class JobRepoTest {
@Autowired
private JobRepo jobRepo;
+ @MockBean
+ private IMetaStoreClient client;
+
+
@Before
public void setup() {
entityManager.clear();
diff --git a/service/src/test/java/org/apache/griffin/core/measure/repo/DataConnectorRepoTest.java b/service/src/test/java/org/apache/griffin/core/measure/repo/DataConnectorRepoTest.java
index 59f6450..7a68c98 100644
--- a/service/src/test/java/org/apache/griffin/core/measure/repo/DataConnectorRepoTest.java
+++ b/service/src/test/java/org/apache/griffin/core/measure/repo/DataConnectorRepoTest.java
@@ -28,12 +28,14 @@ import java.util.List;
import org.apache.griffin.core.config.EclipseLinkJpaConfigForTest;
import org.apache.griffin.core.measure.entity.DataConnector;
+import org.apache.hadoop.hive.metastore.IMetaStoreClient;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
@@ -48,6 +50,9 @@ public class DataConnectorRepoTest {
@Autowired
private DataConnectorRepo dcRepo;
+ @MockBean
+ private IMetaStoreClient client;
+
@Before
public void setup() throws Exception {
entityManager.clear();
diff --git a/service/src/test/java/org/apache/griffin/core/measure/repo/MeasureRepoTest.java b/service/src/test/java/org/apache/griffin/core/measure/repo/MeasureRepoTest.java
index 84de12d..00ce1fa 100644
--- a/service/src/test/java/org/apache/griffin/core/measure/repo/MeasureRepoTest.java
+++ b/service/src/test/java/org/apache/griffin/core/measure/repo/MeasureRepoTest.java
@@ -27,12 +27,14 @@ import java.util.List;
import org.apache.griffin.core.config.EclipseLinkJpaConfigForTest;
import org.apache.griffin.core.measure.entity.*;
+import org.apache.hadoop.hive.metastore.IMetaStoreClient;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
@@ -47,6 +49,9 @@ public class MeasureRepoTest {
@Autowired
private MeasureRepo measureRepo;
+ @MockBean
+ private IMetaStoreClient client;
+
@Before
public void setup() throws Exception {
entityManager.clear();