Skip to content

Commit e4ab745

Browse files
committed
fix unit test
1 parent 744e1e9 commit e4ab745

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PushAggregationThroughUnionTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
package org.apache.iotdb.db.queryengine.plan.relational.analyzer;
2121

22+
import org.apache.iotdb.db.conf.IoTDBDescriptor;
2223
import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan;
2324
import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan;
2425
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
@@ -31,6 +32,7 @@
3132

3233
import com.google.common.collect.ImmutableList;
3334
import com.google.common.collect.ImmutableMap;
35+
import org.junit.Before;
3436
import org.junit.Test;
3537

3638
import java.util.Optional;
@@ -53,6 +55,10 @@
5355
import static org.junit.Assert.assertEquals;
5456

5557
public class PushAggregationThroughUnionTest {
58+
@Before
59+
public void setUp() {
60+
IoTDBDescriptor.getInstance().getConfig().setDataNodeId(1);
61+
}
5662

5763
@Test
5864
public void UnionAggregationTest() {

iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,20 +93,16 @@ private Type convertType(String columnName) {
9393

9494
private void mockException() {
9595
CteMaterializer cteMaterializer = Mockito.spy(new CteMaterializer());
96-
Mockito.when(cteMaterializer.fetchCteQueryResult(Mockito.any(), Mockito.any(), Mockito.any()))
97-
.thenReturn(null);
96+
Mockito.doReturn(null)
97+
.when(cteMaterializer)
98+
.fetchCteQueryResult(Mockito.any(), Mockito.any(), Mockito.any());
9899
CteMaterializer.setInstance(cteMaterializer);
99100
}
100101

101102
private void mockSubquery() {
102103
CteMaterializer cteMaterializer = Mockito.spy(new CteMaterializer());
103104

104-
Mockito.when(
105-
cteMaterializer.fetchCteQueryResult(
106-
Mockito.any(Table.class),
107-
Mockito.any(Query.class),
108-
Mockito.any(MPPQueryContext.class)))
109-
.thenAnswer(
105+
Mockito.doAnswer(
110106
(InvocationOnMock invocation) -> {
111107
Table table = invocation.getArgument(0);
112108
Query query = invocation.getArgument(1);
@@ -131,7 +127,10 @@ private void mockSubquery() {
131127

132128
TableSchema tableSchema = new TableSchema(table.getName().toString(), columnsSchemas);
133129
return new CteDataStore(query, tableSchema, ImmutableList.of(0, 1));
134-
});
130+
})
131+
.when(cteMaterializer)
132+
.fetchCteQueryResult(
133+
Mockito.any(Table.class), Mockito.any(Query.class), Mockito.any(MPPQueryContext.class));
135134
CteMaterializer.setInstance(cteMaterializer);
136135
}
137136

0 commit comments

Comments
 (0)