You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by ra...@apache.org on 2017/06/19 01:06:22 UTC
[2/3] lens git commit: LENS-1438: Testcase failure after LENS-1432
LENS-1438: Testcase failure after LENS-1432
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/42d60d26
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/42d60d26
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/42d60d26
Branch: refs/heads/current-release-line
Commit: 42d60d2623fae53609be93c5c71ece4e2adc267e
Parents: 28aa4a1
Author: Rajat Khandelwal <pr...@apache.org>
Authored: Fri Jun 16 14:52:57 2017 +0530
Committer: rajub <ra...@lazada.com>
Committed: Mon Jun 19 09:04:52 2017 +0800
----------------------------------------------------------------------
.../lens/server/rewrite/TestRewriting.java | 31 ++++++++++----------
1 file changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/42d60d26/lens-server/src/test/java/org/apache/lens/server/rewrite/TestRewriting.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/rewrite/TestRewriting.java b/lens-server/src/test/java/org/apache/lens/server/rewrite/TestRewriting.java
index 83dd1f7..304d21e 100644
--- a/lens-server/src/test/java/org/apache/lens/server/rewrite/TestRewriting.java
+++ b/lens-server/src/test/java/org/apache/lens/server/rewrite/TestRewriting.java
@@ -25,6 +25,7 @@ import org.apache.lens.cube.metadata.CubeMetastoreClient;
import org.apache.lens.cube.parse.CubeQueryContext;
import org.apache.lens.cube.parse.CubeQueryRewriter;
import org.apache.lens.cube.parse.HQLParser;
+import org.apache.lens.cube.parse.QueryWriterContext;
import org.apache.lens.server.api.LensConfConstants;
import org.apache.lens.server.api.driver.LensDriver;
import org.apache.lens.server.api.driver.MockDriver;
@@ -55,6 +56,7 @@ import org.testng.annotations.ObjectFactory;
import org.testng.annotations.Test;
import com.codahale.metrics.MetricRegistry;
+import com.google.common.collect.Maps;
/**
* The Class TestRewriting.
@@ -96,24 +98,18 @@ public class TestRewriting {
private CubeQueryRewriter getMockedRewriter() throws ParseException, LensException, HiveException {
CubeQueryRewriter mockwriter = Mockito.mock(CubeQueryRewriter.class);
- Mockito.when(mockwriter.rewrite(Matchers.any(String.class))).thenAnswer(new Answer<CubeQueryContext>() {
- @Override
- public CubeQueryContext answer(InvocationOnMock invocation) throws Throwable {
- Object[] args = invocation.getArguments();
- // return query for first NUM_SUCCESS calls and fail later
- if (++i <= NUM_SUCCESS) {
- return getMockedCubeContext((String) args[0]);
- } else {
- throw new RuntimeException("Mock fail");
- }
+ Mockito.when(mockwriter.rewrite(Matchers.any(String.class))).thenAnswer(invocation -> {
+ Object[] args = invocation.getArguments();
+ // return query for first NUM_SUCCESS calls and fail later
+ if (++i <= NUM_SUCCESS) {
+ return getMockedCubeContext((String) args[0]);
+ } else {
+ throw new RuntimeException("Mock fail");
}
});
- Mockito.when(mockwriter.rewrite(Matchers.any(ASTNode.class))).thenAnswer(new Answer<CubeQueryContext>() {
- @Override
- public CubeQueryContext answer(InvocationOnMock invocation) throws Throwable {
- Object[] args = invocation.getArguments();
- return getMockedCubeContext((ASTNode) args[0]);
- }
+ Mockito.when(mockwriter.rewrite(Matchers.any(ASTNode.class))).thenAnswer(invocation -> {
+ Object[] args = invocation.getArguments();
+ return getMockedCubeContext((ASTNode) args[0]);
});
Mockito.doCallRealMethod().when(mockwriter).clear();
return mockwriter;
@@ -130,6 +126,9 @@ public class TestRewriting {
private CubeQueryContext getMockedCubeContext(String query)
throws ParseException, LensException {
CubeQueryContext context = Mockito.mock(CubeQueryContext.class);
+ QueryWriterContext mockQueryWriterContext = Mockito.mock(QueryWriterContext.class);
+ Mockito.when(mockQueryWriterContext.getDimsToQuery()).thenReturn(Maps.newHashMap());
+ Mockito.when(context.getQueryWriterContext()).thenReturn(mockQueryWriterContext);
Mockito.when(context.toHQL()).thenReturn(query.substring(4));
Mockito.when(context.toAST(Matchers.any(Context.class)))
.thenReturn(HQLParser.parseHQL(query.toLowerCase().replaceFirst("^cube", ""), hconf));