Skip to content

Commit ec117cb

Browse files
committed
Refactor code
1 parent a422223 commit ec117cb

File tree

4 files changed

+4
-62
lines changed

4 files changed

+4
-62
lines changed

wrangler-core/src/test/java/io/cdap/MockRelationalTransformContext.java

-7
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
import java.util.Map;
2929
import java.util.Set;
3030

31-
/**
32-
* Basic implementation of the {@link RelationalTranformContext} with single output port
33-
*/
3431
public class MockRelationalTransformContext implements RelationalTranformContext {
3532
private Engine engine;
3633
private Map<String, Relation> inputMap;
@@ -39,7 +36,6 @@ public class MockRelationalTransformContext implements RelationalTranformContext
3936
private FeatureFlagsProvider featureFlagsProvider;
4037
private Relation outputRelation;
4138

42-
4339
public MockRelationalTransformContext(Engine engine,
4440
Map<String, Relation> inputMap,
4541
Map<String, Schema> inputSchemas,
@@ -92,9 +88,6 @@ public boolean isFeatureEnabled(String name) {
9288
return this.featureFlagsProvider.isFeatureEnabled(name);
9389
}
9490

95-
public Relation getOutputRelation() {
96-
return outputRelation;
97-
}
9891

9992
public Collection<Capability> getDefaultLanguageCapabilityList() {
10093
return Collections.singleton(StandardSQLCapabilities.POSTGRES);

wrangler-core/src/test/java/io/cdap/directives/column/RenameTest.java

-12
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,14 @@
1616

1717
package io.cdap.directives.column;
1818

19-
import io.cdap.MockEngine;
20-
import io.cdap.MockExpression;
21-
import io.cdap.MockRelation;
22-
import io.cdap.MockRelationalTransformContext;
23-
import io.cdap.cdap.etl.api.relational.Engine;
24-
import io.cdap.cdap.etl.api.relational.Relation;
25-
import io.cdap.cdap.etl.api.relational.RelationalTranformContext;
2619
import io.cdap.wrangler.TestingRig;
27-
import io.cdap.wrangler.api.DirectiveParseException;
2820
import io.cdap.wrangler.api.RecipeException;
2921
import io.cdap.wrangler.api.Row;
3022
import org.junit.Assert;
3123
import org.junit.Test;
3224

3325
import java.util.Arrays;
3426
import java.util.List;
35-
36-
import static io.cdap.RelationalDirectiveTest.runTransform;
37-
import static org.mockito.ArgumentMatchers.any;
38-
3927
/**
4028
* Tests {@link Rename}
4129
*/

wrangler-core/src/test/java/io/cdap/directives/transformation/RightTrimTest.java

+4-12
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,8 @@ public void testSentenceRightTrim() throws Exception {
9090
public void testRelationColumn() throws DirectiveParseException, RecipeException {
9191
MockRelation relation = new MockRelation(null, null);
9292
Engine engine = new MockEngine();
93-
RelationalTranformContext relationalTranformContext = new MockRelationalTransformContext(engine, null
94-
, null
95-
,
96-
null
97-
, null
98-
);
93+
RelationalTranformContext relationalTranformContext = new MockRelationalTransformContext(engine,
94+
null, null, null, null);
9995
String[] recipe = {"rtrim testColumn"};
10096
Relation relation1 = runTransform(recipe, relationalTranformContext, relation);
10197
Assert.assertEquals(((MockRelation) relation1).getColumn(), "testColumn");
@@ -105,12 +101,8 @@ public void testRelationColumn() throws DirectiveParseException, RecipeException
105101
public void testRelationExpression() throws DirectiveParseException, RecipeException {
106102
MockRelation relation = new MockRelation(null, null);
107103
Engine engine = new MockEngine();
108-
RelationalTranformContext relationalTranformContext = new MockRelationalTransformContext(engine, null
109-
, null
110-
,
111-
null
112-
, null
113-
);
104+
RelationalTranformContext relationalTranformContext = new MockRelationalTransformContext(engine,
105+
null, null, null, null);
114106
String[] recipe = {"rtrim testColumn"};
115107
Relation relation1 = runTransform(recipe, relationalTranformContext, relation);
116108
Assert.assertEquals(((MockExpression) ((MockRelation) relation1).getExpression()).getExpression(),

wrangler-transform/src/test/java/io/cdap/wrangler/WranglerTransformTest.java

-31
Original file line numberDiff line numberDiff line change
@@ -16,43 +16,12 @@
1616

1717
package io.cdap.wrangler;
1818

19-
import io.cdap.cdap.api.data.schema.Schema;
20-
import io.cdap.cdap.etl.api.relational.Capability;
21-
import io.cdap.cdap.etl.api.relational.Engine;
22-
import io.cdap.cdap.etl.api.relational.Expression;
23-
import io.cdap.cdap.etl.api.relational.ExpressionFactory;
24-
import io.cdap.cdap.etl.api.relational.ExpressionFactoryType;
2519
import io.cdap.cdap.etl.api.relational.InvalidRelation;
2620
import io.cdap.cdap.etl.api.relational.Relation;
2721

28-
import io.cdap.cdap.etl.api.relational.RelationalTranformContext;
29-
import io.cdap.directives.transformation.Lower;
30-
import io.cdap.wrangler.api.Directive;
31-
import io.cdap.wrangler.api.DirectiveLoadException;
32-
import io.cdap.wrangler.api.DirectiveParseException;
33-
import io.cdap.wrangler.api.RecipeException;
34-
import io.cdap.wrangler.parser.GrammarBasedParser;
35-
import io.cdap.wrangler.parser.MigrateToV2;
36-
import io.cdap.wrangler.registry.DirectiveRegistry;
37-
import io.cdap.wrangler.registry.SystemDirectiveRegistry;
38-
import io.cdap.wrangler.utils.SqlExpressionGenerator;
39-
import org.apache.poi.ss.formula.functions.T;
4022
import org.junit.Assert;
4123
import org.junit.Test;
42-
import org.junit.runner.RunWith;
43-
import org.mockito.InjectMocks;
44-
import org.mockito.Mock;
45-
import org.mockito.Mockito;
46-
import org.mockito.junit.MockitoJUnitRunner;
4724

48-
import java.util.ArrayList;
49-
import java.util.Arrays;
50-
import java.util.Collection;
51-
import java.util.List;
52-
import java.util.Optional;
53-
import java.util.Set;
54-
55-
import static org.mockito.ArgumentMatchers.any;
5625
import static org.mockito.Mockito.mock;
5726

5827

0 commit comments

Comments
 (0)