From 85a0354d423841e743f6a808774f0204ec9683fc Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Sun, 25 Aug 2019 11:19:07 +1200 Subject: [PATCH] #1800 No effective change, test only, static imports and organise imports --- .../server/rawsql/TestRawSqlService.java | 96 ++++++++----------- 1 file changed, 41 insertions(+), 55 deletions(-) diff --git a/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java b/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java index eb7c440a4..699e33ac7 100644 --- a/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java +++ b/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java @@ -1,53 +1,39 @@ package io.ebeaninternal.server.rawsql; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; import io.ebean.SqlRow; -import io.ebeaninternal.server.rawsql.SpiRawSql.Sql; -import org.assertj.core.api.StrictAssertions; -import org.tests.model.basic.Customer; -import org.tests.model.basic.ResetBasicData; -import org.tests.model.rawsql.ERawSqlAggBean; - -import com.mysql.cj.protocol.Resultset; - import org.junit.Test; -import org.mockito.Mockito; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - -import java.sql.CallableStatement; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class TestRawSqlService extends BaseTestCase { @Test public void testDistinctColumnNames() throws SQLException { - ResultSetMetaData rsetmeta = Mockito.mock(ResultSetMetaData.class); - ResultSet rset = Mockito.mock(ResultSet.class); + ResultSetMetaData rsetmeta = mock(ResultSetMetaData.class); + ResultSet rset = mock(ResultSet.class); - Mockito.when(rsetmeta.getColumnCount()).thenReturn(3); - Mockito.when(rset.getMetaData()).thenReturn(rsetmeta); + when(rsetmeta.getColumnCount()).thenReturn(3); + when(rset.getMetaData()).thenReturn(rsetmeta); for (int i = 1; i < 4; i++) { - Mockito.when(rsetmeta.getColumnLabel(i)).thenReturn(null); - Mockito.when(rsetmeta.getColumnName(i)).thenReturn("col" + i); - Mockito.when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i); - Mockito.when(rsetmeta.getTableName(i)).thenReturn("table" + i); + when(rsetmeta.getColumnLabel(i)).thenReturn(null); + when(rsetmeta.getColumnName(i)).thenReturn("col" + i); + when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i); + when(rsetmeta.getTableName(i)).thenReturn("table" + i); - Mockito.when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i); + when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i); } DRawSqlService service = new DRawSqlService(); SqlRow result = service.sqlRow(rset, "1", false); - + assertThat(result.keySet()).contains("col1", "col2", "col3"); for (int i = 1; i < 4; i++) { assertThat(result.get("col" + i)).isEqualTo("dat1_" + i); @@ -64,18 +50,18 @@ public class TestRawSqlService extends BaseTestCase { @Test public void testDistinctColumnLabels() throws SQLException { - ResultSetMetaData rsetmeta = Mockito.mock(ResultSetMetaData.class); - ResultSet rset = Mockito.mock(ResultSet.class); + ResultSetMetaData rsetmeta = mock(ResultSetMetaData.class); + ResultSet rset = mock(ResultSet.class); - Mockito.when(rsetmeta.getColumnCount()).thenReturn(3); - Mockito.when(rset.getMetaData()).thenReturn(rsetmeta); + when(rsetmeta.getColumnCount()).thenReturn(3); + when(rset.getMetaData()).thenReturn(rsetmeta); for (int i = 1; i < 4; i++) { - Mockito.when(rsetmeta.getColumnLabel(i)).thenReturn("label" + i); - Mockito.when(rsetmeta.getColumnName(i)).thenReturn("col" + i); - Mockito.when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i); - Mockito.when(rsetmeta.getTableName(i)).thenReturn("table" + i); + when(rsetmeta.getColumnLabel(i)).thenReturn("label" + i); + when(rsetmeta.getColumnName(i)).thenReturn("col" + i); + when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i); + when(rsetmeta.getTableName(i)).thenReturn("table" + i); - Mockito.when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i); + when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i); } DRawSqlService service = new DRawSqlService(); @@ -97,18 +83,18 @@ public class TestRawSqlService extends BaseTestCase { @Test public void testIdenticalColumnNames() throws SQLException { - ResultSetMetaData rsetmeta = Mockito.mock(ResultSetMetaData.class); - ResultSet rset = Mockito.mock(ResultSet.class); + ResultSetMetaData rsetmeta = mock(ResultSetMetaData.class); + ResultSet rset = mock(ResultSet.class); - Mockito.when(rsetmeta.getColumnCount()).thenReturn(3); - Mockito.when(rset.getMetaData()).thenReturn(rsetmeta); + when(rsetmeta.getColumnCount()).thenReturn(3); + when(rset.getMetaData()).thenReturn(rsetmeta); for (int i = 1; i < 4; i++) { - Mockito.when(rsetmeta.getColumnLabel(i)).thenReturn(null); - Mockito.when(rsetmeta.getColumnName(i)).thenReturn("col"); - Mockito.when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i); - Mockito.when(rsetmeta.getTableName(i)).thenReturn("table" + i); + when(rsetmeta.getColumnLabel(i)).thenReturn(null); + when(rsetmeta.getColumnName(i)).thenReturn("col"); + when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i); + when(rsetmeta.getTableName(i)).thenReturn("table" + i); - Mockito.when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i); + when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i); } DRawSqlService service = new DRawSqlService(); @@ -130,18 +116,18 @@ public class TestRawSqlService extends BaseTestCase { @Test public void testIdenticalColumnLabels() throws SQLException { - ResultSetMetaData rsetmeta = Mockito.mock(ResultSetMetaData.class); - ResultSet rset = Mockito.mock(ResultSet.class); + ResultSetMetaData rsetmeta = mock(ResultSetMetaData.class); + ResultSet rset = mock(ResultSet.class); - Mockito.when(rsetmeta.getColumnCount()).thenReturn(3); - Mockito.when(rset.getMetaData()).thenReturn(rsetmeta); + when(rsetmeta.getColumnCount()).thenReturn(3); + when(rset.getMetaData()).thenReturn(rsetmeta); for (int i = 1; i < 4; i++) { - Mockito.when(rsetmeta.getColumnLabel(i)).thenReturn("label"); - Mockito.when(rsetmeta.getColumnName(i)).thenReturn("col"); - Mockito.when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i); - Mockito.when(rsetmeta.getTableName(i)).thenReturn("table" + i); + when(rsetmeta.getColumnLabel(i)).thenReturn("label"); + when(rsetmeta.getColumnName(i)).thenReturn("col"); + when(rsetmeta.getSchemaName(i)).thenReturn("schema" + i); + when(rsetmeta.getTableName(i)).thenReturn("table" + i); - Mockito.when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i); + when(rset.getObject(i)).thenReturn("dat1_" + i).thenReturn("dat2_" + i); } DRawSqlService service = new DRawSqlService();