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 2017/09/05 07:56:47 UTC
incubator-griffin git commit: edits unit tests and some api
Repository: incubator-griffin
Updated Branches:
refs/heads/master 9ae8c4d86 -> ac8351f0c
edits unit tests and some api
1. GET /metrics/org?measureName=measureName -> GET /orgName?measureName=measureName
2. Delete GET /hive/metadata/table and GET /hive/metadata/default/{table}
3. GET /hive/metadata?db={dbName}&table={tableName} -> GET /hive/metadata/table?db={dbName}&table={tableName}
4. Edits unit tests discussed in code review
Author: xiangrongchen <xi...@163.com>
Author: Hang-Hu <hu...@gmail.com>
Author: RachelYang2 <ln...@163.com>
Author: Yang <xi...@ebay.com>
Author: Xuan <yu...@ebay.com>
Author: dodobel <12...@qq.com>
Author: Chen <xi...@lm-shc-16501061.corp.ebay.com>
Author: Hu <ha...@ebay.com>
Author: Hang Hu <hu...@gmail.com>
Closes #122 from Hang-Hu/apiChange.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/ac8351f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/ac8351f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/ac8351f0
Branch: refs/heads/master
Commit: ac8351f0c3aa4af8ea5dcd00d0dbeea7f15ccc21
Parents: 9ae8c4d
Author: xiangrongchen <xi...@163.com>
Authored: Tue Sep 5 15:56:30 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Tue Sep 5 15:56:30 2017 +0800
----------------------------------------------------------------------
.../griffin/core/common/CacheEvictor.java | 2 +-
.../core/measure/MeasureServiceImpl.java | 8 +--
.../metastore/hive/HiveMetastoreController.java | 17 +------
.../metastore/hive/HiveMetastoreService.java | 2 +-
.../hive/HiveMetastoreServiceImpl.java | 3 +-
.../metastore/kafka/KafkaSchemaController.java | 2 +-
.../griffin/core/metric/MetricController.java | 6 +--
.../main/resources/application-dev.properties | 2 +-
.../src/main/resources/application.properties | 2 +-
service/src/main/resources/sparkJob.properties | 12 ++---
.../griffin/core/job/SparkSubmitJobTest.java | 12 ++---
.../core/measure/MeasureServiceImplTest.java | 52 ++++++++++----------
.../hive/HiveMetastoreControllerTest.java | 27 ++--------
.../hive/HiveMetastoreServiceImplTest.java | 4 +-
.../kafka/KafkaSchemaServiceImplTest.java | 29 ++++-------
.../core/metric/MetricControllerTest.java | 2 +-
.../src/test/resources/application.properties | 4 +-
ui/js/services/services.js | 2 +-
18 files changed, 69 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ac8351f0/service/src/main/java/org/apache/griffin/core/common/CacheEvictor.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/common/CacheEvictor.java b/service/src/main/java/org/apache/griffin/core/common/CacheEvictor.java
index 48be313..c64cc1b 100644
--- a/service/src/main/java/org/apache/griffin/core/common/CacheEvictor.java
+++ b/service/src/main/java/org/apache/griffin/core/common/CacheEvictor.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Component;
public class CacheEvictor {
private static final Logger LOGGER = LoggerFactory.getLogger(CacheEvictor.class);
- @Scheduled(fixedRateString = "${cache.evict.hive.fixedRate}")
+ @Scheduled(fixedRateString = "${cache.evict.hive.fixedRate.in.milliseconds}")
@CacheEvict(cacheNames = "hive", allEntries = true, beforeInvocation = true)
public void evictHiveCache() {
LOGGER.info("Evict hive cache");
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ac8351f0/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java b/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java
index f79bd25..61b16b6 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/MeasureServiceImpl.java
@@ -57,9 +57,9 @@ public class MeasureServiceImpl implements MeasureService {
return measureRepo.findOne(id);
}
- /*
- TODO: require to be fixed: deleting measure doesn't deal with job protocol related to it, leading quartz to throw error that measure cannot be found.
- */
+
+
+
@Override
public GriffinOperationMessage deleteMeasureById(Long measureId) {
if (measureRepo.exists(measureId) == false) {
@@ -85,7 +85,7 @@ public class MeasureServiceImpl implements MeasureService {
return GriffinOperationMessage.CREATE_MEASURE_FAIL;
}
} else {
- LOGGER.info("Failed to create new measure " + measure.getName() + ", it already exists");
+ LOGGER.warn("Failed to create new measure " + measure.getName() + ", it already exists");
return GriffinOperationMessage.CREATE_MEASURE_FAIL_DUPLICATE;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ac8351f0/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetastoreController.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetastoreController.java b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetastoreController.java
index 077b1af..169051e 100644
--- a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetastoreController.java
+++ b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetastoreController.java
@@ -33,17 +33,11 @@ public class HiveMetastoreController {
@Autowired
HiveMetastoreServiceImpl hiveMetastoreService;
-
@RequestMapping(value = "/db",method = RequestMethod.GET)
public Iterable<String> getAllDatabases() {
return hiveMetastoreService.getAllDatabases();
}
- @RequestMapping(value = "/table",method = RequestMethod.GET)
- public Iterable<String> getDefAllTables() {
- return hiveMetastoreService.getAllTableNames("");
- }
-
@RequestMapping(value = "/allTableNames",method = RequestMethod.GET)
public Iterable<String> getAllTableNames(@RequestParam("db") String dbName) {
return hiveMetastoreService.getAllTableNames(dbName);
@@ -51,7 +45,7 @@ public class HiveMetastoreController {
@RequestMapping(value = "/db/allTables",method = RequestMethod.GET)
public List<Table> getAllTables(@RequestParam("db") String dbName) {
- return hiveMetastoreService.getAllTable(dbName);
+ return hiveMetastoreService.getAllTablesByDbName(dbName);
}
@RequestMapping(value = "/allTables",method = RequestMethod.GET)
@@ -59,15 +53,8 @@ public class HiveMetastoreController {
return hiveMetastoreService.getAllTable();
}
- @RequestMapping(value = "/default/{table}",method = RequestMethod.GET)
- public Table getDefTable(@PathVariable("table") String tableName) {
- return hiveMetastoreService.getTable("", tableName);
- }
-
- @RequestMapping(value = "",method = RequestMethod.GET)
+ @RequestMapping(value = "table",method = RequestMethod.GET)
public Table getTable(@RequestParam("db") String dbName, @RequestParam("table") String tableName) {
return hiveMetastoreService.getTable(dbName, tableName);
}
-
-
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ac8351f0/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetastoreService.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetastoreService.java b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetastoreService.java
index 5292a8d..34eab57 100644
--- a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetastoreService.java
+++ b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetastoreService.java
@@ -30,7 +30,7 @@ public interface HiveMetastoreService {
Iterable<String> getAllTableNames(String dbName) ;
- List<Table> getAllTable(String db) ;
+ List<Table> getAllTablesByDbName(String db) ;
Map<String,List<Table>> getAllTable() ;
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ac8351f0/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetastoreServiceImpl.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetastoreServiceImpl.java b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetastoreServiceImpl.java
index 26efd63..2f95b19 100644
--- a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetastoreServiceImpl.java
+++ b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetastoreServiceImpl.java
@@ -87,9 +87,8 @@ public class HiveMetastoreServiceImpl implements HiveMetastoreService{
}
- @Override
@Cacheable
- public List<Table> getAllTable(String db) {
+ public List<Table> getAllTablesByDbName(String db) {
List<Table> results = new ArrayList<Table>();
String useDbName = getUseDbName(db);
try {
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ac8351f0/service/src/main/java/org/apache/griffin/core/metastore/kafka/KafkaSchemaController.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metastore/kafka/KafkaSchemaController.java b/service/src/main/java/org/apache/griffin/core/metastore/kafka/KafkaSchemaController.java
index 2e15b88..bb55e1c 100644
--- a/service/src/main/java/org/apache/griffin/core/metastore/kafka/KafkaSchemaController.java
+++ b/service/src/main/java/org/apache/griffin/core/metastore/kafka/KafkaSchemaController.java
@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/metadata/kafka")
public class KafkaSchemaController {
-
+ //TODO subject should be replaced with topic
@Autowired
KafkaSchemaServiceImpl kafkaSchemaService;
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ac8351f0/service/src/main/java/org/apache/griffin/core/metric/MetricController.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/metric/MetricController.java b/service/src/main/java/org/apache/griffin/core/metric/MetricController.java
index 0796e73..e68ec8f 100644
--- a/service/src/main/java/org/apache/griffin/core/metric/MetricController.java
+++ b/service/src/main/java/org/apache/griffin/core/metric/MetricController.java
@@ -32,14 +32,12 @@ import org.springframework.web.bind.annotation.RestController;
*/
@RestController
-@RequestMapping("/metrics")
public class MetricController {
private static final Logger LOGGER = LoggerFactory.getLogger(MetricController.class);
@Autowired
MetricService metricService;
-
- @RequestMapping(value = "/org",method = RequestMethod.GET)
+ @RequestMapping(value = "/orgName",method = RequestMethod.GET)
public String getOrgByMeasureName(@RequestParam("measureName") String measureName) {
return metricService.getOrgByMeasureName(measureName);
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ac8351f0/service/src/main/resources/application-dev.properties
----------------------------------------------------------------------
diff --git a/service/src/main/resources/application-dev.properties b/service/src/main/resources/application-dev.properties
index 0af61a4..057d412 100644
--- a/service/src/main/resources/application-dev.properties
+++ b/service/src/main/resources/application-dev.properties
@@ -48,4 +48,4 @@ kafka.schema.registry.url = http://10.65.159.119:8081
jobInstance.fixedDelay.in.milliseconds=60000
# spring cache
-cache.evict.hive.fixedRate=900000
\ No newline at end of file
+cache.evict.hive.fixedRate.in.milliseconds=900000
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ac8351f0/service/src/main/resources/application.properties
----------------------------------------------------------------------
diff --git a/service/src/main/resources/application.properties b/service/src/main/resources/application.properties
index 5355eea..802c270 100644
--- a/service/src/main/resources/application.properties
+++ b/service/src/main/resources/application.properties
@@ -42,4 +42,4 @@ kafka.schema.registry.url = http://localhost:8081
jobInstance.fixedDelay.in.milliseconds=60000
# spring cache
-cache.evict.hive.fixedRate=900000
\ No newline at end of file
+cache.evict.hive.fixedRate.in.milliseconds=900000
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ac8351f0/service/src/main/resources/sparkJob.properties
----------------------------------------------------------------------
diff --git a/service/src/main/resources/sparkJob.properties b/service/src/main/resources/sparkJob.properties
index 4e8aace..e01058e 100644
--- a/service/src/main/resources/sparkJob.properties
+++ b/service/src/main/resources/sparkJob.properties
@@ -38,15 +38,15 @@ sparkJob.jars_1=hdfs:///livy/datanucleus-api-jdo-3.2.6.jar
sparkJob.jars_2=hdfs:///livy/datanucleus-core-3.2.10.jar
sparkJob.jars_3=hdfs:///livy/datanucleus-rdbms-3.2.9.jar
-#partitionItem
+# partitionItem
sparkJob.dateAndHour=dt,hour
-#livy
-#livy.uri=http://10.9.246.187:8998/batches
+# livy
+# livy.uri=http://10.9.246.187:8998/batches
livy.uri=http://localhost:8998/batches
-#spark-admin
-#spark.uri=http://10.149.247.156:28088
-#spark.uri=http://10.9.246.187:8088
+# spark-admin
+# spark.uri=http://10.149.247.156:28088
+# spark.uri=http://10.9.246.187:8088
spark.uri=http://localhost:8088
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ac8351f0/service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java b/service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java
index 3478534..d748b01 100644
--- a/service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java
+++ b/service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java
@@ -62,16 +62,10 @@ import java.util.Properties;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.*;
-/*
-@RunWith(PowerMockRunner.class)
-*/
-@PrepareForTest(value = {SparkSubmitJob.class, JobExecutionContext.class})
-@RunWith(SpringRunner.class)
+@RunWith(SpringRunner.class)
public class SparkSubmitJobTest{
- @MockBean
- JobExecutionContext context;
@InjectMocks
private SparkSubmitJob ssj=new SparkSubmitJob();
@@ -145,8 +139,8 @@ public class SparkSubmitJobTest{
when(jdmap.getString("periodTime")).thenReturn("10");
Measure measure = createATestMeasure("viewitem_hourly","bullseye");
when(measureRepo.findOne(Long.valueOf("0"))).thenReturn(measure);
- Properties sparkJobProperties=new Properties();
- sparkJobProperties.load(new FileInputStream(new ClassPathResource("sparkJob.properties").getFile()));
+ Properties sparkJobProperties=new Properties();
+ sparkJobProperties.load(new FileInputStream(new ClassPathResource("sparkJob.properties").getFile()));
when(sparkJobProps.getProperty("sparkJob.dateAndHour")).thenReturn(sparkJobProperties.getProperty("sparkJob.dateAndHour"));
when(sparkJobProps.getProperty("sparkJob.numExecutors")).thenReturn(sparkJobProperties.getProperty("sparkJob.numExecutors"));
when(sparkJobProps.getProperty("sparkJob.executorCores")).thenReturn(sparkJobProperties.getProperty("sparkJob.executorCores"));
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ac8351f0/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java b/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java
index 09de670..00fad9c 100644
--- a/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java
+++ b/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java
@@ -39,10 +39,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.test.context.junit4.SpringRunner;
import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import static org.assertj.core.api.Assertions.fail;
import static org.junit.Assert.assertEquals;
@@ -134,32 +131,33 @@ public class MeasureServiceImplTest {
fail("Cannot delete Measure in db By name: viewitem_hourly");
}
}*/
-
@Test
- public void testCreateNewMeasure() throws Exception {
-/*
+ public void testCreateNewMeasure() {
try {
-*/
- String measureName="viewitem_hourly";
- String org="bullseye";
- Measure measure=createATestMeasure(measureName,org);
- given(measureRepo.findOne(0L)).willReturn(null);
- GriffinOperationMessage message=service.createMeasure(measure);
- assertEquals(message,GriffinOperationMessage.CREATE_MEASURE_FAIL);
- assertTrue(true);
-
- Measure measure1=createATestMeasure(measureName,"bullseye1");
- given(measureRepo.findOne(0L)).willReturn(measure1);
- GriffinOperationMessage message1=service.createMeasure(measure);
- assertEquals(message1,GriffinOperationMessage.CREATE_MEASURE_FAIL);
-
- given(measureRepo.findOne(0L)).willReturn(null);
+ // CREATE_MEASURE_SUCCESS
+ String measureName = "viewitem_hourly";
+ String org = "bullseye";
+ Measure measure = createATestMeasure(measureName, org);
+ given(measureRepo.findByNameAndDeleted(measureName, false)).willReturn(new LinkedList<>());
given(measureRepo.save(measure)).willReturn(measure);
- GriffinOperationMessage message2=service.createMeasure(measure);
- assertEquals(message2,GriffinOperationMessage.CREATE_MEASURE_SUCCESS);
- /*}catch (Throwable t){
- fail("Cannot create new measure viewitem_hourly");
- }*/
+ GriffinOperationMessage message = service.createMeasure(measure);
+ assertEquals(message, GriffinOperationMessage.CREATE_MEASURE_SUCCESS);
+ assertTrue(true);
+ // CREATE_MEASURE_FAIL_DUPLICATE
+ Measure measure1 = createATestMeasure(measureName, "bullseye1");
+ LinkedList<Measure> list = new LinkedList<>();
+ list.add(measure);
+ given(measureRepo.findByNameAndDeleted(measureName, false)).willReturn(list);
+ GriffinOperationMessage message1 = service.createMeasure(measure);
+ assertEquals(message1, GriffinOperationMessage.CREATE_MEASURE_FAIL_DUPLICATE);
+ // CREATE_MEASURE_FAIL
+ given(measureRepo.findByNameAndDeleted(measureName, false)).willReturn(new LinkedList<>());
+ given(measureRepo.save(measure)).willReturn(null);
+ GriffinOperationMessage message2 = service.createMeasure(measure);
+ assertEquals(message2, GriffinOperationMessage.CREATE_MEASURE_FAIL);
+ }catch (Throwable t){
+ fail("Cannot create new measure viewitem_hourly");
+ }
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ac8351f0/service/src/test/java/org/apache/griffin/core/metastore/hive/HiveMetastoreControllerTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/metastore/hive/HiveMetastoreControllerTest.java b/service/src/test/java/org/apache/griffin/core/metastore/hive/HiveMetastoreControllerTest.java
index 08f0fd9..50ece98 100644
--- a/service/src/test/java/org/apache/griffin/core/metastore/hive/HiveMetastoreControllerTest.java
+++ b/service/src/test/java/org/apache/griffin/core/metastore/hive/HiveMetastoreControllerTest.java
@@ -19,8 +19,6 @@ under the License.
package org.apache.griffin.core.metastore.hive;
-import org.apache.griffin.core.metastore.hive.HiveMetastoreController;
-import org.apache.griffin.core.metastore.hive.HiveMetastoreServiceImpl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -59,14 +57,7 @@ public class HiveMetastoreControllerTest {
.andExpect(status().isOk());
verify(hiveMetastoreService).getAllDatabases();
}
-
- @Test
- public void test_getDefAllTables() throws Exception{
- when(hiveMetastoreService.getAllTableNames("")).thenReturn(null);
- mockMvc.perform(get("/metadata/hive/table"))
- .andExpect(status().isOk());
- verify(hiveMetastoreService).getAllTableNames("");
- }
+
@Test
public void test_getAllTableNames() throws Exception {
@@ -80,10 +71,10 @@ public class HiveMetastoreControllerTest {
@Test
public void test_getAllTables() throws Exception {
String db="default";
- when(hiveMetastoreService.getAllTable(db)).thenReturn(null);
+ when(hiveMetastoreService.getAllTablesByDbName(db)).thenReturn(null);
mockMvc.perform(get("/metadata/hive/db/allTables?db={db}",db))
.andExpect(status().isOk());
- verify(hiveMetastoreService).getAllTable(db);
+ verify(hiveMetastoreService).getAllTablesByDbName(db);
}
/**
@@ -96,22 +87,14 @@ public class HiveMetastoreControllerTest {
verify(hiveMetastoreService).getAllTable();
}
- @Test
- public void test_getDefTable() throws Exception {
- String dbName="";
- String tableName="cout";
- when(hiveMetastoreService.getTable(dbName,tableName)).thenReturn(null);
- mockMvc.perform(get("/metadata/hive/default/{table}",tableName))
- .andExpect(status().isOk());
- verify(hiveMetastoreService).getTable(dbName,tableName);
- }
+
@Test
public void test_getTable() throws Exception{
String db="default";
String table="cout";
when(hiveMetastoreService.getTable(db,table)).thenReturn(null);
- mockMvc.perform(get("/metadata/hive?db={db}&table={table}",db,table))
+ mockMvc.perform(get("/metadata/hive/table?db={db}&table={table}",db,table))
.andExpect(status().isOk());
verify(hiveMetastoreService).getTable(db,table);
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ac8351f0/service/src/test/java/org/apache/griffin/core/metastore/hive/HiveMetastoreServiceImplTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/metastore/hive/HiveMetastoreServiceImplTest.java b/service/src/test/java/org/apache/griffin/core/metastore/hive/HiveMetastoreServiceImplTest.java
index 67f303d..9ee7ff1 100644
--- a/service/src/test/java/org/apache/griffin/core/metastore/hive/HiveMetastoreServiceImplTest.java
+++ b/service/src/test/java/org/apache/griffin/core/metastore/hive/HiveMetastoreServiceImplTest.java
@@ -113,7 +113,7 @@ public class HiveMetastoreServiceImplTest {
try {
String useDbName="default";
given(client.getAllTables(useDbName)).willReturn(Arrays.asList("cout","cout1"));
- List<Table> tmp = service.getAllTable(useDbName);
+ List<Table> tmp = service.getAllTablesByDbName(useDbName);
assertTrue(true);
}catch (Throwable t){
fail("Cannot get all tables in default db");
@@ -121,7 +121,7 @@ public class HiveMetastoreServiceImplTest {
try {
given(client.getAllTables("default")).willThrow(MetaException.class);
doNothing().when(client).reconnect();
- service.getAllTable("default");
+ service.getAllTablesByDbName("default");
} catch (Exception e) {
log.info("testGetAllTableByDBName: test catch "+e);
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ac8351f0/service/src/test/java/org/apache/griffin/core/metastore/kafka/KafkaSchemaServiceImplTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/metastore/kafka/KafkaSchemaServiceImplTest.java b/service/src/test/java/org/apache/griffin/core/metastore/kafka/KafkaSchemaServiceImplTest.java
index 5735cf5..96b1f73 100644
--- a/service/src/test/java/org/apache/griffin/core/metastore/kafka/KafkaSchemaServiceImplTest.java
+++ b/service/src/test/java/org/apache/griffin/core/metastore/kafka/KafkaSchemaServiceImplTest.java
@@ -47,19 +47,15 @@ import java.util.Properties;
import static org.assertj.core.api.Assertions.fail;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@RunWith(SpringRunner.class)
@PropertySource("classpath:application.properties")
public class KafkaSchemaServiceImplTest {
- /*@TestConfiguration
- public static class KafkaSchemaServiceConfiguration {
- @Bean
- public KafkaSchemaServiceImpl service() {
- return new KafkaSchemaServiceImpl();
- }
- }*/
+
@InjectMocks
private KafkaSchemaServiceImpl service;
@@ -80,8 +76,8 @@ public class KafkaSchemaServiceImplTest {
@Test
public void testGetSchemaString(){
try {
- String regUrl="null/schemas/ids/1";
- when(restTemplate.getForEntity(regUrl, SchemaString.class)).thenReturn(new ResponseEntity<SchemaString>(new SchemaString(), HttpStatus.OK));
+
+ when(restTemplate.getForEntity(anyString(), any())).thenReturn(new ResponseEntity<>(new SchemaString(), HttpStatus.OK));
SchemaString tmp = service.getSchemaString(1);
assertTrue(true);
}catch (Throwable t){
@@ -92,8 +88,7 @@ public class KafkaSchemaServiceImplTest {
@Test
public void testGetSubjects(){
try {
- String regUrl="null/subjects";
- when(restTemplate.getForEntity(regUrl, String[].class)).thenReturn(new ResponseEntity<String[]>(new String[2], HttpStatus.OK));
+ when(restTemplate.getForEntity(anyString(), any())).thenReturn(new ResponseEntity<>(new String[2], HttpStatus.OK));
Iterable<String> tmp = service.getSubjects();
assertTrue(true);
}catch (Throwable t){
@@ -104,8 +99,7 @@ public class KafkaSchemaServiceImplTest {
@Test
public void testGetSubjectVersions(){
try {
- String regUrl="null/subjects/1.0/versions";
- when(restTemplate.getForEntity(regUrl, Integer[].class)).thenReturn(new ResponseEntity<Integer[]>(new Integer[2], HttpStatus.OK));
+ when(restTemplate.getForEntity(anyString(), any())).thenReturn(new ResponseEntity<>(new Integer[2], HttpStatus.OK));
Iterable<Integer> tmp = service.getSubjectVersions("1.0");
assertTrue(true);
}catch (Throwable t){
@@ -116,8 +110,7 @@ public class KafkaSchemaServiceImplTest {
@Test
public void testGetSubjectSchema(){
try {
- String regUrl="null/subjects/subject1/versions/version1";
- when(restTemplate.getForEntity(regUrl, Schema.class)).thenReturn(new ResponseEntity<Schema>(new Schema("",0,0, ""), HttpStatus.OK));
+ when(restTemplate.getForEntity(anyString(), any())).thenReturn(new ResponseEntity<>(new Schema("",0,0, ""), HttpStatus.OK));
Schema tmp = service.getSubjectSchema("subject1","version1");
assertTrue(true);
}catch (Throwable t){
@@ -128,8 +121,7 @@ public class KafkaSchemaServiceImplTest {
@Test
public void testGetTopLevelConfig(){
try {
- String regUrl="null/config";
- when(restTemplate.getForEntity(regUrl, Config.class)).thenReturn(new ResponseEntity<Config>(new Config(), HttpStatus.OK));
+ when(restTemplate.getForEntity(anyString(), any())).thenReturn(new ResponseEntity<>(new Config(), HttpStatus.OK));
Config tmp = service.getTopLevelConfig();
assertTrue(true);
}catch (Throwable t){
@@ -140,8 +132,7 @@ public class KafkaSchemaServiceImplTest {
@Test
public void testGetSubjectLevelConfig(){
try {
- String regUrl="null/config/";
- when(restTemplate.getForEntity(regUrl, Config.class)).thenReturn(new ResponseEntity<Config>(new Config(), HttpStatus.OK));
+ when(restTemplate.getForEntity(anyString(), any())).thenReturn(new ResponseEntity<>(new Config(), HttpStatus.OK));
Config tmp = service.getSubjectLevelConfig("");
assertTrue(true);
}catch (Throwable t){
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ac8351f0/service/src/test/java/org/apache/griffin/core/metric/MetricControllerTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/metric/MetricControllerTest.java b/service/src/test/java/org/apache/griffin/core/metric/MetricControllerTest.java
index 21655cc..95d8b0c 100644
--- a/service/src/test/java/org/apache/griffin/core/metric/MetricControllerTest.java
+++ b/service/src/test/java/org/apache/griffin/core/metric/MetricControllerTest.java
@@ -57,7 +57,7 @@ public class MetricControllerTest {
given(service.getOrgByMeasureName("m14")).willReturn("bullseye");
- mvc.perform(get("/metrics/org?measureName=m14").contentType(MediaType.APPLICATION_JSON))
+ mvc.perform(get("/orgName?measureName=m14").contentType(MediaType.APPLICATION_JSON))
// .andDo(print())
.andExpect(status().isOk())
.andExpect(jsonPath("$").isString())
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ac8351f0/service/src/test/resources/application.properties
----------------------------------------------------------------------
diff --git a/service/src/test/resources/application.properties b/service/src/test/resources/application.properties
index 1b9a14c..f303911 100644
--- a/service/src/test/resources/application.properties
+++ b/service/src/test/resources/application.properties
@@ -20,7 +20,7 @@
# spring.datasource.x
spring.datasource.driver-class-name=org.h2.Driver
-spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
spring.datasource.username=sa
spring.datasource.password=sa
#spring.datasource.url= jdbc:mysql://localhost:3306/quartz?autoReconnect=true&useSSL=false
@@ -58,4 +58,4 @@ logging.file=target/test.log
jobInstance.fixedDelay.in.milliseconds=60000
# spring cache
-cache.evict.hive.fixedRate=900000
\ No newline at end of file
+cache.evict.hive.fixedRate.in.milliseconds=900000
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ac8351f0/ui/js/services/services.js
----------------------------------------------------------------------
diff --git a/ui/js/services/services.js b/ui/js/services/services.js
index 756dcba..2975121 100644
--- a/ui/js/services/services.js
+++ b/ui/js/services/services.js
@@ -40,7 +40,7 @@ define(['./module'], function (services) {
base: BACKEND_SERVER + API_ROOT_PATH,
dbtree:BACKEND_SERVER + '/metadata/hive/allTables',
- schemadefinition: BACKEND_SERVER + '/metadata/hive',
+ schemadefinition: BACKEND_SERVER + '/metadata/hive/table',
dataassetlist: BACKEND_SERVER + '/metadata/hive/allTables',
adddataasset: BACKEND_SERVER + API_ROOT_PATH + '/dataassets',