Skip to content

Commit

Permalink
Use isTrue()/isFalse() instead of isEqualTo(true/false)
Browse files Browse the repository at this point in the history 
Also some minor code improvements and warning fixes.
  • Loading branch information
@matriv @mergify
matriv authored and mergify[bot] committed May 22, 2024
1 parent 95b5cad commit 3a9fd77
Show file tree
Hide file tree
Showing 47 changed files with 440 additions and 460 deletions.
2 changes: 1 addition & 1 deletion extensions/jmx-monitoring/src/test/java/io/crate/beans/NodeInfoTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public void test_local_node_is_master_node_no_shards_locally() {
// Unassigned shards are only counted on the master node
assertThat(shardStats.getUnassigned()).isEqualTo(1);

assertThat(nodeInfo.getShardInfo().isEmpty()).isEqualTo(true);
assertThat(nodeInfo.getShardInfo().isEmpty()).isTrue();
}

@Test
Expand Down
12 changes: 6 additions & 6 deletions libs/shared/src/test/java/io/crate/common/StringUtilsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,22 @@ void test_tryParseLong() {
long[] outputLong = new long[1];

wasLong = StringUtils.tryParseLong("-123456", outputLong);
assertThat(wasLong).isEqualTo(true);
assertThat(wasLong).isTrue();
assertThat(outputLong[0]).isEqualTo(-123456);

wasLong = StringUtils.tryParseLong("9223372036854775808", outputLong);
assertThat(wasLong).isEqualTo(false);
assertThat(wasLong).isFalse();

wasLong = StringUtils.tryParseLong("/", outputLong);
assertThat(wasLong).isEqualTo(false);
assertThat(wasLong).isFalse();

wasLong = StringUtils.tryParseLong("+", outputLong);
assertThat(wasLong).isEqualTo(false);
assertThat(wasLong).isFalse();

wasLong = StringUtils.tryParseLong("", outputLong);
assertThat(wasLong).isEqualTo(false);
assertThat(wasLong).isFalse();

wasLong = StringUtils.tryParseLong("++", outputLong);
assertThat(wasLong).isEqualTo(false);
assertThat(wasLong).isFalse();
}
}
2 changes: 1 addition & 1 deletion ...-repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3ClientSettingsTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,6 @@ public void testPathStyleAccessCanBeSet() {
Settings.builder()
.put("use_path_style_access", true)
.build());
assertThat(settings.pathStyleAccess).isEqualTo(true);
assertThat(settings.pathStyleAccess).isTrue();
}
}
10 changes: 5 additions & 5 deletions server/src/test/java/io/crate/analyze/CreateFunctionAnalyzerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
import org.junit.Test;

import io.crate.metadata.settings.CoordinatorSessionSettings;
import io.crate.role.Role;
import io.crate.sql.parser.SqlParser;
import io.crate.test.integration.CrateDummyClusterServiceUnitTest;
import io.crate.testing.SQLExecutor;
import io.crate.types.ArrayType;
import io.crate.types.DataTypes;
import io.crate.role.Role;

public class CreateFunctionAnalyzerTest extends CrateDummyClusterServiceUnitTest {

Expand All @@ -52,7 +52,7 @@ public void testCreateFunctionSimple() {
AnalyzedCreateFunction analysis = (AnalyzedCreateFunction) analyzedStatement;
assertThat(analysis.schema()).isEqualTo("doc");
assertThat(analysis.name()).isEqualTo("bar");
assertThat(analysis.replace()).isEqualTo(false);
assertThat(analysis.replace()).isFalse();
assertThat(analysis.returnType()).isEqualTo(DataTypes.LONG);
assertThat(analysis.arguments().get(0)).isEqualTo(FunctionArgumentDefinition.of(DataTypes.LONG));
assertThat(analysis.arguments().get(1)).isEqualTo(FunctionArgumentDefinition.of(DataTypes.LONG));
Expand Down Expand Up @@ -106,7 +106,7 @@ public void testCreateFunctionOrReplace() {

AnalyzedCreateFunction analysis = (AnalyzedCreateFunction) analyzedStatement;
assertThat(analysis.name()).isEqualTo("bar");
assertThat(analysis.replace()).isEqualTo(true);
assertThat(analysis.replace()).isTrue();
assertThat(analysis.returnType()).isEqualTo(DataTypes.LONG);
assertThat(analysis.language()).isLiteral("dummy_lang");
assertThat(analysis.definition()).isLiteral("function() { return 1; }");
Expand All @@ -120,7 +120,7 @@ public void testCreateFunctionWithComplexGeoDataTypes() {

AnalyzedCreateFunction analysis = (AnalyzedCreateFunction) analyzedStatement;
assertThat(analysis.name()).isEqualTo("bar");
assertThat(analysis.replace()).isEqualTo(false);
assertThat(analysis.replace()).isFalse();
assertThat(analysis.returnType()).isEqualTo(DataTypes.GEO_POINT);
assertThat(analysis.arguments().get(0)).isEqualTo(FunctionArgumentDefinition.of(DataTypes.GEO_POINT));
assertThat(analysis.arguments().get(1)).isEqualTo(FunctionArgumentDefinition.of(DataTypes.GEO_SHAPE));
Expand All @@ -139,7 +139,7 @@ public void testCreateFunctionWithComplexComplexTypes() {

AnalyzedCreateFunction analysis = (AnalyzedCreateFunction) analyzedStatement;
assertThat(analysis.name()).isEqualTo("bar");
assertThat(analysis.replace()).isEqualTo(false);
assertThat(analysis.replace()).isFalse();
assertThat(analysis.returnType()).isEqualTo(new ArrayType<>(DataTypes.GEO_POINT));
assertThat(analysis.arguments().get(0)).isEqualTo(FunctionArgumentDefinition.of(new ArrayType<>(DataTypes.INTEGER)));
assertThat(analysis.arguments().get(1)).isEqualTo(FunctionArgumentDefinition.of(DataTypes.UNTYPED_OBJECT));
Expand Down
1 change: 0 additions & 1 deletion server/src/test/java/io/crate/analyze/DeleteAnalyzerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import static io.crate.testing.Asserts.isFunction;
import static io.crate.testing.Asserts.isLiteral;
import static io.crate.testing.Asserts.isReference;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import java.io.IOException;
Expand Down
39 changes: 19 additions & 20 deletions server/src/test/java/io/crate/analyze/GroupByAnalyzerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import static io.crate.testing.Asserts.isFunction;
import static io.crate.testing.Asserts.isLiteral;
import static io.crate.testing.Asserts.isReference;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import java.io.IOException;
Expand Down Expand Up @@ -91,7 +90,7 @@ public void testGroupByOnAlias() throws Exception {
.satisfiesExactly(
isFunction("count"),
isAlias("n", isReference("name")));
assertThat(relation.groupBy().get(0)).isEqualTo(relation.outputs().get(1));
assertThat(relation.groupBy().getFirst()).isEqualTo(relation.outputs().get(1));
}

@Test
Expand Down Expand Up @@ -128,7 +127,7 @@ public void testGroupByScalarAliasAndValueInScalar() {
analyze("select 1/age as age from foo.users group by age order by age");
assertThat(relation.groupBy()).isNotEmpty();
List<Symbol> groupBySymbols = relation.groupBy();
assertThat(((Reference) groupBySymbols.get(0)).column().fqn()).isEqualTo("age");
assertThat(((Reference) groupBySymbols.getFirst()).column().fqn()).isEqualTo("age");
}

@Test
Expand All @@ -137,7 +136,7 @@ public void testGroupByScalarAlias() {
QueriedSelectRelation relation = analyze("select 1/age as theAlias from foo.users group by theAlias");
assertThat(relation.groupBy()).isNotEmpty();
List<Symbol> groupBySymbols = relation.groupBy();
Symbol groupBy = groupBySymbols.get(0);
Symbol groupBy = groupBySymbols.getFirst();
assertThat(groupBy).isAlias("thealias", isFunction("divide"));
}

Expand All @@ -147,15 +146,15 @@ public void testGroupByColumnInScalar() {
QueriedSelectRelation relation = analyze("select 1/age as height from foo.users group by age");
assertThat(relation.groupBy()).isNotEmpty();
List<Symbol> groupBySymbols = relation.groupBy();
assertThat(((Reference) groupBySymbols.get(0)).column().fqn()).isEqualTo("age");
assertThat(((Reference) groupBySymbols.getFirst()).column().fqn()).isEqualTo("age");
}

@Test
public void testGroupByScalar() {
QueriedSelectRelation relation = analyze("select 1/age from foo.users group by 1/age;");
assertThat(relation.groupBy()).isNotEmpty();
List<Symbol> groupBySymbols = relation.groupBy();
Symbol groupBy = groupBySymbols.get(0);
Symbol groupBy = groupBySymbols.getFirst();
assertThat(groupBy).isExactlyInstanceOf(Function.class);
}

Expand All @@ -164,15 +163,15 @@ public void testGroupByAliasedLiteral() {
QueriedSelectRelation relation = analyze("select 58 as fiftyEight from foo.users group by fiftyEight;");
assertThat(relation.groupBy()).isNotEmpty();
List<Symbol> groupBySymbols = relation.groupBy();
assertThat(groupBySymbols.get(0)).isAlias("fiftyeight", isLiteral(58));
assertThat(groupBySymbols.getFirst()).isAlias("fiftyeight", isLiteral(58));
}

@Test
public void testGroupByLiteralAliasedWithRealColumnNameGroupsByColumnValue() {
QueriedSelectRelation relation = analyze("select 58 as age from foo.users group by age;");
assertThat(relation.groupBy()).isNotEmpty();
List<Symbol> groupBySymbols = relation.groupBy();
ReferenceIdent groupByIdent = ((Reference) groupBySymbols.get(0)).ident();
ReferenceIdent groupByIdent = ((Reference) groupBySymbols.getFirst()).ident();
assertThat(groupByIdent.columnIdent().fqn()).isEqualTo("age");
assertThat(groupByIdent.tableIdent().fqn()).isEqualTo("foo.users");
}
Expand All @@ -182,7 +181,7 @@ public void testNegateAliasRealColumnGroupByAlias() {
QueriedSelectRelation relation = analyze("select age age, - age age from foo.users group by age;");
assertThat(relation.groupBy()).isNotEmpty();
List<Symbol> groupBySymbols = relation.groupBy();
ReferenceIdent groupByIdent = ((Reference) groupBySymbols.get(0)).ident();
ReferenceIdent groupByIdent = ((Reference) groupBySymbols.getFirst()).ident();
assertThat(groupByIdent.columnIdent().fqn()).isEqualTo("age");
assertThat(groupByIdent.tableIdent().fqn()).isEqualTo("foo.users");
}
Expand All @@ -195,7 +194,7 @@ public void testGroupBySubscript() throws Exception {
assertThat(relation.groupBy()).isNotNull();
assertThat(relation.outputs()).hasSize(2);
assertThat(relation.groupBy()).hasSize(1);
assertThat(relation.groupBy().get(0)).isReference().hasName("load['1']");
assertThat(relation.groupBy().getFirst()).isReference().hasName("load['1']");
}

@Test
Expand All @@ -209,7 +208,7 @@ public void testSelectGroupByOrderByWithColumnMissingFromSelect() throws Excepti
@Test
public void testSelectGroupByOrderByWithAggregateFunctionInOrderByClauseWithoutHavingThemInTheSelectList() throws Exception {
QueriedSelectRelation stmt = analyze("select name, count(id) from users group by name order by count(1)");
assertThat(stmt.orderBy().orderBySymbols().get(0)).isFunction("count");
assertThat(stmt.orderBy().orderBySymbols().getFirst()).isFunction("count");
}

@Test
Expand Down Expand Up @@ -238,7 +237,7 @@ public void testSelectGlobalDistinctAggregationMissingGroupBy() {
@Test
public void testSelectDistinctWithGroupBy() {
QueriedSelectRelation relation = analyze("select distinct max(id) from users group by name order by 1");
assertThat(relation.isDistinct()).isEqualTo(true);
assertThat(relation.isDistinct()).isTrue();
assertThat(relation)
.isSQL("SELECT max(doc.users.id) GROUP BY doc.users.name ORDER BY max(doc.users.id)");
}
Expand All @@ -247,7 +246,7 @@ public void testSelectDistinctWithGroupBy() {
public void testSelectDistinctWithGroupByLimitAndOffset() {
QueriedSelectRelation relation =
analyze("select distinct max(id) from users group by name order by 1 limit 5 offset 10");
assertThat(relation.isDistinct()).isEqualTo(true);
assertThat(relation.isDistinct()).isTrue();
assertThat(relation)
.isSQL("SELECT max(doc.users.id) GROUP BY doc.users.name " +
"ORDER BY max(doc.users.id) LIMIT 5::bigint OFFSET 10::bigint");
Expand All @@ -259,7 +258,7 @@ public void testSelectDistinctWithGroupByOnJoin() {
analyze("select DISTINCT max(users.id) from users " +
" inner join users_multi_pk on users.id = users_multi_pk.id " +
"group by users.name order by 1");
assertThat(relation.isDistinct()).isEqualTo(true);
assertThat(relation.isDistinct()).isTrue();
assertThat(relation)
.isSQL("SELECT max(doc.users.id) GROUP BY doc.users.name ORDER BY max(doc.users.id)");
}
Expand All @@ -269,7 +268,7 @@ public void testSelectDistinctWithGroupByOnSubSelectOuter() {
QueriedSelectRelation relation = analyze("select distinct max(id) from (" +
" select * from users order by name limit 10" +
") t group by name order by 1");
assertThat(relation.isDistinct()).isEqualTo(true);
assertThat(relation.isDistinct()).isTrue();
assertThat(relation)
.isSQL("SELECT max(t.id) " +
"GROUP BY t.name " +
Expand All @@ -289,9 +288,9 @@ public void testSelectDistinctWithGroupByOnSubSelectInner() {
assertThat(outerRelation.groupBy()).isEmpty();
assertThat(outerRelation.orderBy().orderBySymbols()).satisfiesExactly(isField("id"));

AliasedAnalyzedRelation aliasedRelation = (AliasedAnalyzedRelation) outerRelation.from().get(0);
AliasedAnalyzedRelation aliasedRelation = (AliasedAnalyzedRelation) outerRelation.from().getFirst();
QueriedSelectRelation innerRelation = (QueriedSelectRelation) aliasedRelation.relation();
assertThat(innerRelation.isDistinct()).isEqualTo(true);
assertThat(innerRelation.isDistinct()).isTrue();
assertThat(innerRelation.groupBy())
.satisfiesExactly(isReference("id"), isReference("name"));
}
Expand Down Expand Up @@ -377,10 +376,10 @@ public void testGroupByHavingOtherColumnInAggregate() throws Exception {
assertThat(relation.having()).isFunction("op_=");
Function havingFunction = (Function) relation.having();
assertThat(havingFunction.arguments()).hasSize(2);
assertThat(havingFunction.arguments().get(0)).isFunction("max");
Function maxFunction = (Function) havingFunction.arguments().get(0);
assertThat(havingFunction.arguments().getFirst()).isFunction("max");
Function maxFunction = (Function) havingFunction.arguments().getFirst();

assertThat(maxFunction.arguments().get(0)).isReference().hasName("bytes");
assertThat(maxFunction.arguments().getFirst()).isReference().hasName("bytes");
assertThat(havingFunction.arguments().get(1)).isLiteral((byte) 4);
}

Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/io/crate/analyze/RoleDDLAnalyzerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void test_drop_role_if_exists() {
String userOrRole = randomBoolean() ? "USER" : "ROLE";
AnalyzedDropRole analysis = e.analyze("DROP " + userOrRole + " IF EXISTS ROOT");
assertThat(analysis.roleName()).isEqualTo("root");
assertThat(analysis.ifExists()).isEqualTo(true);
assertThat(analysis.ifExists()).isTrue();
}

@Test
Expand Down
10 changes: 5 additions & 5 deletions server/src/test/java/io/crate/analyze/SelectStatementAnalyzerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ public void testWhereSelect() throws Exception {

Function whereClause = (Function) relation.where();
assertThat(whereClause.name()).isEqualTo(OrOperator.NAME);
assertThat(whereClause.signature().getKind() == FunctionType.AGGREGATE).isEqualTo(false);
assertThat(whereClause.signature().getKind() == FunctionType.AGGREGATE).isFalse();

Function left = (Function) whereClause.arguments().getFirst();
assertThat(left.name()).isEqualTo(EqOperator.NAME);
Expand All @@ -255,7 +255,7 @@ public void testSelectWithParameters() throws Exception {
"or load['1'] = ? or name = ?");
Function whereClause = (Function) relation.where();
assertThat(whereClause.name()).isEqualTo(OrOperator.NAME);
assertThat(whereClause.signature().getKind() == FunctionType.AGGREGATE).isEqualTo(false);
assertThat(whereClause.signature().getKind() == FunctionType.AGGREGATE).isFalse();

Function function = (Function) whereClause.arguments().getFirst();
assertThat(function.name()).isEqualTo(OrOperator.NAME);
Expand Down Expand Up @@ -564,7 +564,7 @@ public void testSelectDistinctWithFunction() throws Exception {
var executor = SQLExecutor.of(clusterService)
.addTable(TableDefinitions.USER_TABLE_DEFINITION);
QueriedSelectRelation relation = executor.analyze("select distinct id + 1 from users");
assertThat(relation.isDistinct()).isEqualTo(true);
assertThat(relation.isDistinct()).isTrue();
assertList(relation.outputs()).isSQL("(doc.users.id + 1::bigint)");
}

Expand Down Expand Up @@ -592,7 +592,7 @@ public void testDistinctOnLiteral() throws Exception {
var executor = SQLExecutor.of(clusterService)
.addTable(TableDefinitions.USER_TABLE_DEFINITION);
QueriedSelectRelation relation = executor.analyze("select distinct [1,2,3] from users");
assertThat(relation.isDistinct()).isEqualTo(true);
assertThat(relation.isDistinct()).isTrue();
assertList(relation.outputs()).isSQL("[1, 2, 3]");
}

Expand All @@ -601,7 +601,7 @@ public void testDistinctOnNullLiteral() throws Exception {
var executor = SQLExecutor.of(clusterService)
.addTable(TableDefinitions.USER_TABLE_DEFINITION);
QueriedSelectRelation relation = executor.analyze("select distinct null from users");
assertThat(relation.isDistinct()).isEqualTo(true);
assertThat(relation.isDistinct()).isTrue();
assertList(relation.outputs()).isSQL("NULL");
}

Expand Down
Loading

0 comments on commit 3a9fd77

Please sign in to comment.