Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-6177 Refactor HBaseListLookupService tests to remove use of TestRecordLookupProcessor 

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #3400.
This commit is contained in:
Bryan Bende 2019-04-02 16:59:54 -04:00 committed by Pierre Villard
parent 75217b33d0
commit 25cb29e109
No known key found for this signature in database
GPG Key ID: BEE1599F0726E9CD
2 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/test/java/org/apache/nifi/hbase/TestHBase_1_1_2_ListLookupService.java
View File

@ -19,7 +19,12 @@ package org.apache.nifi.hbase;
import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.client.Table;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.hadoop.KerberosProperties; import org.apache.nifi.hadoop.KerberosProperties;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.util.TestRunner; import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners; import org.apache.nifi.util.TestRunners;
import org.junit.Before; import org.junit.Before;
@ -27,6 +32,7 @@ import org.junit.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import java.io.File; import java.io.File;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -38,18 +44,16 @@ import static org.mockito.Mockito.when;
public class TestHBase_1_1_2_ListLookupService { public class TestHBase_1_1_2_ListLookupService {
static final String TABLE_NAME = "guids"; static final String TABLE_NAME = "guids";
static final String ROW = "row1";
static final String COLS = "cf1:cq1,cf2:cq2";
private TestRunner runner; private TestRunner runner;
private HBase_1_1_2_ListLookupService lookupService; private HBase_1_1_2_ListLookupService lookupService;
private MockHBaseClientService clientService; private MockHBaseClientService clientService;
private TestRecordLookupProcessor testLookupProcessor; private NoOpProcessor processor;
@Before @Before
public void before() throws Exception { public void before() throws Exception {
testLookupProcessor = new TestRecordLookupProcessor(); processor = new NoOpProcessor();
runner = TestRunners.newTestRunner(testLookupProcessor); runner = TestRunners.newTestRunner(processor);
// setup mock HBaseClientService // setup mock HBaseClientService
final Table table = Mockito.mock(Table.class); final Table table = Mockito.mock(Table.class);
@ -67,10 +71,6 @@ public class TestHBase_1_1_2_ListLookupService {
runner.setProperty(lookupService, HBase_1_1_2_ListLookupService.HBASE_CLIENT_SERVICE, "clientService"); runner.setProperty(lookupService, HBase_1_1_2_ListLookupService.HBASE_CLIENT_SERVICE, "clientService");
runner.setProperty(lookupService, HBase_1_1_2_ListLookupService.TABLE_NAME, TABLE_NAME); runner.setProperty(lookupService, HBase_1_1_2_ListLookupService.TABLE_NAME, TABLE_NAME);
runner.enableControllerService(lookupService); runner.enableControllerService(lookupService);
// setup test processor
runner.setProperty(TestRecordLookupProcessor.HBASE_LOOKUP_SERVICE, "lookupService");
runner.setProperty(TestRecordLookupProcessor.HBASE_ROW, ROW);
} }
private Optional<List> setupAndRun() throws Exception { private Optional<List> setupAndRun() throws Exception {
@ -80,11 +80,6 @@ public class TestHBase_1_1_2_ListLookupService {
cells.put("cq2", "v2"); cells.put("cq2", "v2");
clientService.addResult("row1", cells, System.currentTimeMillis()); clientService.addResult("row1", cells, System.currentTimeMillis());
// run the processor
runner.enqueue("trigger flow file");
runner.run();
runner.assertAllFlowFilesTransferred(TestRecordLookupProcessor.REL_SUCCESS);
Map<String, Object> lookup = new HashMap<>(); Map<String, Object> lookup = new HashMap<>();
lookup.put("rowKey", "row1"); lookup.put("rowKey", "row1");
@ -115,4 +110,19 @@ public class TestHBase_1_1_2_ListLookupService {
assertTrue(result.contains("v1")); assertTrue(result.contains("v1"));
assertTrue(result.contains("v2")); assertTrue(result.contains("v2"));
} }
// Processor that does nothing just so we can create a TestRunner
private static class NoOpProcessor extends AbstractProcessor {
@Override
protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
return Collections.emptyList();
}
@Override
public void onTrigger(ProcessContext context, ProcessSession session) throws ProcessException {
}
}
} }

35
nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/src/test/java/org/apache/nifi/hbase/TestHBase_2_ListLookupService.java
View File

@ -19,7 +19,12 @@ package org.apache.nifi.hbase;
import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.client.Table;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.hadoop.KerberosProperties; import org.apache.nifi.hadoop.KerberosProperties;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.util.TestRunner; import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners; import org.apache.nifi.util.TestRunners;
import org.junit.Before; import org.junit.Before;
@ -27,6 +32,7 @@ import org.junit.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import java.io.File; import java.io.File;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -44,12 +50,12 @@ public class TestHBase_2_ListLookupService {
private TestRunner runner; private TestRunner runner;
private HBase_2_ListLookupService lookupService; private HBase_2_ListLookupService lookupService;
private MockHBaseClientService clientService; private MockHBaseClientService clientService;
private TestRecordLookupProcessor testLookupProcessor; private NoOpProcessor processor;
@Before @Before
public void before() throws Exception { public void before() throws Exception {
testLookupProcessor = new TestRecordLookupProcessor(); processor = new NoOpProcessor();
runner = TestRunners.newTestRunner(testLookupProcessor); runner = TestRunners.newTestRunner(processor);
// setup mock HBaseClientService // setup mock HBaseClientService
final Table table = Mockito.mock(Table.class); final Table table = Mockito.mock(Table.class);
@ -67,10 +73,6 @@ public class TestHBase_2_ListLookupService {
runner.setProperty(lookupService, HBase_2_ListLookupService.HBASE_CLIENT_SERVICE, "clientService"); runner.setProperty(lookupService, HBase_2_ListLookupService.HBASE_CLIENT_SERVICE, "clientService");
runner.setProperty(lookupService, HBase_2_RecordLookupService.TABLE_NAME, TABLE_NAME); runner.setProperty(lookupService, HBase_2_RecordLookupService.TABLE_NAME, TABLE_NAME);
runner.enableControllerService(lookupService); runner.enableControllerService(lookupService);
// setup test processor
runner.setProperty(TestRecordLookupProcessor.HBASE_LOOKUP_SERVICE, "lookupService");
runner.setProperty(TestRecordLookupProcessor.HBASE_ROW, ROW);
} }
private Optional<List> setupAndRun() throws Exception { private Optional<List> setupAndRun() throws Exception {
@ -80,11 +82,6 @@ public class TestHBase_2_ListLookupService {
cells.put("cq2", "v2"); cells.put("cq2", "v2");
clientService.addResult("row1", cells, System.currentTimeMillis()); clientService.addResult("row1", cells, System.currentTimeMillis());
// run the processor
runner.enqueue("trigger flow file");
runner.run();
runner.assertAllFlowFilesTransferred(TestRecordLookupProcessor.REL_SUCCESS);
Map<String, Object> lookup = new HashMap<>(); Map<String, Object> lookup = new HashMap<>();
lookup.put("rowKey", "row1"); lookup.put("rowKey", "row1");
@ -115,4 +112,18 @@ public class TestHBase_2_ListLookupService {
assertTrue(result.contains("v1")); assertTrue(result.contains("v1"));
assertTrue(result.contains("v2")); assertTrue(result.contains("v2"));
} }
// Processor that does nothing just so we can create a TestRunner
private static class NoOpProcessor extends AbstractProcessor {
@Override
protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
return Collections.emptyList();
}
@Override
public void onTrigger(ProcessContext context, ProcessSession session) throws ProcessException {
}
}
} }