Author: gk Date: Fri Apr 12 12:00:13 2024 New Revision: 1916927 URL: http://svn.apache.org/viewvc?rev=1916927&view=rev Log: Update Mock.initMocks using wrapper class
Added: db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/MockBaseTestCase.java Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/BigDecimalMapperTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/CompositeMapperTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/DateMapperTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/IntegerMapperTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/LongMapperTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/ObjectListMapperTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/StringMapperTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/util/BasePeerImplTest.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/util/SummaryHelperTest.java Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java?rev=1916927&r1=1916926&r2=1916927&view=diff ============================================================================== --- db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java (original) +++ db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java Fri Apr 12 12:00:13 2024 @@ -35,6 +35,8 @@ import org.apache.torque.TorqueException * @author <a href="mailto:jmcna...@apache.org">John McNally</a> * @author <a href="mailto:h...@intermeta.de">Henning P. Schmiedehausen</a> * @version $Id$ + * + * Use {@link SharedPool2DataSourceFactory}, which uses org.apache.commons.dbcp2.cpdsadapter and datasources. */ @Deprecated public class SharedPoolDataSourceFactory Added: db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/MockBaseTestCase.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/MockBaseTestCase.java?rev=1916927&view=auto ============================================================================== --- db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/MockBaseTestCase.java (added) +++ db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/MockBaseTestCase.java Fri Apr 12 12:00:13 2024 @@ -0,0 +1,56 @@ +package org.apache.torque; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.mockito.MockitoAnnotations; + + +/** + * Base functionality to be extended by all Torque test cases. Test + * case implementations are used to automate unit testing via JUnit. + * + * @author <a href="mailto:d...@finemaltcoding.com">Daniel Rall</a> + * @author <a href="mailto:celk...@scardini.com">Christopher Elkins</a> + * @version $Id: BaseTestCase.java 1867515 2019-09-25 15:02:03Z gk $ + */ +public abstract class MockBaseTestCase extends BaseTestCase +{ + protected AutoCloseable closeable; + + /** + * Re-Initialize Torque and fill supplied data. Subclasses which + * override setUp() must call super.setUp() as their first action. + * + * @throws Exception if initialization fails. + */ + @BeforeEach + public void setUp() throws Exception + { + super.setUp(); + closeable = MockitoAnnotations.openMocks(this); + } + + @AfterEach + void closeMocks() throws Exception { + closeable.close(); + } +} Modified: db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/BigDecimalMapperTest.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/BigDecimalMapperTest.java?rev=1916927&r1=1916926&r2=1916927&view=diff ============================================================================== --- db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/BigDecimalMapperTest.java (original) +++ db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/BigDecimalMapperTest.java Fri Apr 12 12:00:13 2024 @@ -30,15 +30,14 @@ import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; -import org.apache.torque.BaseTestCase; +import org.apache.torque.MockBaseTestCase; import org.apache.torque.TorqueException; import org.apache.torque.criteria.Criteria; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -public class BigDecimalMapperTest extends BaseTestCase +public class BigDecimalMapperTest extends MockBaseTestCase { /** Mock result set. */ @Mock @@ -48,7 +47,6 @@ public class BigDecimalMapperTest extend public void setUp() throws Exception { super.setUp(); - MockitoAnnotations.initMocks(this); when(resultSet.getBigDecimal(1)).thenReturn(null); when(resultSet.getBigDecimal(2)).thenReturn(new BigDecimal(0)); when(resultSet.getBigDecimal(3)).thenReturn(new BigDecimal("123.456")); Modified: db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/CompositeMapperTest.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/CompositeMapperTest.java?rev=1916927&r1=1916926&r2=1916927&view=diff ============================================================================== --- db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/CompositeMapperTest.java (original) +++ db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/CompositeMapperTest.java Fri Apr 12 12:00:13 2024 @@ -28,15 +28,14 @@ import static org.mockito.Mockito.when; import java.sql.ResultSet; import java.util.List; -import org.apache.torque.BaseTestCase; +import org.apache.torque.MockBaseTestCase; import org.apache.torque.TorqueException; import org.apache.torque.criteria.Criteria; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -public class CompositeMapperTest extends BaseTestCase +public class CompositeMapperTest extends MockBaseTestCase { /** System under test. */ CompositeMapper mapper; @@ -59,19 +58,20 @@ public class CompositeMapperTest extends /** The fake criteria which produced the query .*/ private Criteria criteria = new Criteria(); + @Override @BeforeEach public void setUp() throws Exception { super.setUp(); - MockitoAnnotations.initMocks(this); + // assumes offset of 2 for CompositeMapper mapper when(recordMapper1.processRow(resultSet,3, criteria)) .thenReturn(null); when(recordMapper2.processRow(resultSet, 4, criteria)) .thenReturn(Integer.valueOf(1)); when(recordMapper3.processRow(resultSet, 5, criteria)) - .thenReturn(new Long(2)); + .thenReturn(Long.valueOf(2)); mapper = new CompositeMapper(); mapper.addMapper(recordMapper1, 1); @@ -94,7 +94,7 @@ public class CompositeMapperTest extends assertEquals(3, result.size()); assertEquals(null, result.get(0)); assertEquals(Integer.valueOf(1), result.get(1)); - assertEquals(new Long(2), result.get(2)); + assertEquals(Long.valueOf(2), result.get(2)); verify(recordMapper1).processRow(resultSet, 3, criteria); verify(recordMapper2).processRow(resultSet, 4, criteria); verify(recordMapper3).processRow(resultSet, 5, criteria); @@ -128,4 +128,5 @@ public class CompositeMapperTest extends verifyNoMoreInteractions(resultSet); } } + } Modified: db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/DateMapperTest.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/DateMapperTest.java?rev=1916927&r1=1916926&r2=1916927&view=diff ============================================================================== --- db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/DateMapperTest.java (original) +++ db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/DateMapperTest.java Fri Apr 12 12:00:13 2024 @@ -31,6 +31,7 @@ import java.sql.SQLException; import java.util.Date; import org.apache.torque.BaseTestCase; +import org.apache.torque.MockBaseTestCase; import org.apache.torque.TorqueException; import org.apache.torque.criteria.Criteria; import org.junit.jupiter.api.BeforeEach; @@ -38,7 +39,7 @@ import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -public class DateMapperTest extends BaseTestCase +public class DateMapperTest extends MockBaseTestCase { /** Mock result set. */ @Mock @@ -48,7 +49,6 @@ public class DateMapperTest extends Base public void setUp() throws Exception { super.setUp(); - MockitoAnnotations.initMocks(this); when(resultSet.getTimestamp(1)).thenReturn(null); when(resultSet.getTimestamp(2)).thenReturn( new java.sql.Timestamp(0)); Modified: db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/IntegerMapperTest.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/IntegerMapperTest.java?rev=1916927&r1=1916926&r2=1916927&view=diff ============================================================================== --- db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/IntegerMapperTest.java (original) +++ db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/IntegerMapperTest.java Fri Apr 12 12:00:13 2024 @@ -29,15 +29,14 @@ import static org.mockito.Mockito.when; import java.sql.ResultSet; import java.sql.SQLException; -import org.apache.torque.BaseTestCase; +import org.apache.torque.MockBaseTestCase; import org.apache.torque.TorqueException; import org.apache.torque.criteria.Criteria; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -public class IntegerMapperTest extends BaseTestCase +public class IntegerMapperTest extends MockBaseTestCase { /** Mock result set. */ @Mock @@ -47,7 +46,6 @@ public class IntegerMapperTest extends B public void setUp() throws Exception { super.setUp(); - MockitoAnnotations.initMocks(this); when(resultSet.getInt(1)).thenReturn(0); when(resultSet.getInt(2)).thenReturn(-273343444); when(resultSet.getInt(3)).thenReturn(353344556); Modified: db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/LongMapperTest.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/LongMapperTest.java?rev=1916927&r1=1916926&r2=1916927&view=diff ============================================================================== --- db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/LongMapperTest.java (original) +++ db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/LongMapperTest.java Fri Apr 12 12:00:13 2024 @@ -30,6 +30,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import org.apache.torque.BaseTestCase; +import org.apache.torque.MockBaseTestCase; import org.apache.torque.TorqueException; import org.apache.torque.criteria.Criteria; import org.junit.jupiter.api.BeforeEach; @@ -37,7 +38,7 @@ import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -public class LongMapperTest extends BaseTestCase +public class LongMapperTest extends MockBaseTestCase { /** Mock result set. */ @Mock @@ -47,7 +48,6 @@ public class LongMapperTest extends Base public void setUp() throws Exception { super.setUp(); - MockitoAnnotations.initMocks(this); when(resultSet.getLong(1)).thenReturn(0L); when(resultSet.getLong(2)).thenReturn(-2733434442345777L); when(resultSet.getLong(3)).thenReturn(35334455623667566L); Modified: db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/ObjectListMapperTest.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/ObjectListMapperTest.java?rev=1916927&r1=1916926&r2=1916927&view=diff ============================================================================== --- db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/ObjectListMapperTest.java (original) +++ db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/ObjectListMapperTest.java Fri Apr 12 12:00:13 2024 @@ -45,15 +45,14 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.torque.BaseTestCase; +import org.apache.torque.MockBaseTestCase; import org.apache.torque.TorqueException; import org.apache.torque.criteria.Criteria; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -public class ObjectListMapperTest extends BaseTestCase +public class ObjectListMapperTest extends MockBaseTestCase { /** Mock result set. */ @Mock @@ -94,7 +93,6 @@ public class ObjectListMapperTest extend public void setUp() throws Exception { super.setUp(); - MockitoAnnotations.initMocks(this); when(resultSet.getObject(0)).thenThrow( new SQLException("index is 1 based")); when(resultSet.getBigDecimal(1)).thenReturn(null); Modified: db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/StringMapperTest.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/StringMapperTest.java?rev=1916927&r1=1916926&r2=1916927&view=diff ============================================================================== --- db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/StringMapperTest.java (original) +++ db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/StringMapperTest.java Fri Apr 12 12:00:13 2024 @@ -29,15 +29,14 @@ import static org.mockito.Mockito.when; import java.sql.ResultSet; import java.sql.SQLException; -import org.apache.torque.BaseTestCase; +import org.apache.torque.MockBaseTestCase; import org.apache.torque.TorqueException; import org.apache.torque.criteria.Criteria; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -public class StringMapperTest extends BaseTestCase +public class StringMapperTest extends MockBaseTestCase { /** Mock result set. */ @Mock @@ -47,7 +46,6 @@ public class StringMapperTest extends Ba public void setUp() throws Exception { super.setUp(); - MockitoAnnotations.initMocks(this); when(resultSet.getString(1)).thenReturn(null); when(resultSet.getString(2)).thenReturn(""); when(resultSet.getString(3)).thenReturn("abcDEF"); Modified: db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/util/BasePeerImplTest.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/util/BasePeerImplTest.java?rev=1916927&r1=1916926&r2=1916927&view=diff ============================================================================== --- db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/util/BasePeerImplTest.java (original) +++ db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/util/BasePeerImplTest.java Fri Apr 12 12:00:13 2024 @@ -37,9 +37,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.torque.BaseTestCase; import org.apache.torque.Column; import org.apache.torque.ColumnImpl; +import org.apache.torque.MockBaseTestCase; import org.apache.torque.Torque; import org.apache.torque.TorqueException; import org.apache.torque.adapter.IDMethod; @@ -59,7 +59,6 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; /** @@ -67,7 +66,7 @@ import org.mockito.MockitoAnnotations; * * @version $Id$ */ -public class BasePeerImplTest extends BaseTestCase +public class BasePeerImplTest extends MockBaseTestCase { private static final BigDecimal DEFAULT_GENERATED_ID = new BigDecimal(56); @@ -103,7 +102,6 @@ public class BasePeerImplTest extends Ba basePeerImpl.setDatabaseName("databaseName"); basePeerImpl.setRecordMapper(new ObjectListMapper()); oldTransactionManager = Transaction.getTransactionManager(); - MockitoAnnotations.initMocks(this); when(connection.prepareStatement((String) any())) .thenReturn(preparedStatement); when(connection.createStatement()).thenReturn(preparedStatement); Modified: db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/util/SummaryHelperTest.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/util/SummaryHelperTest.java?rev=1916927&r1=1916926&r2=1916927&view=diff ============================================================================== --- db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/util/SummaryHelperTest.java (original) +++ db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/util/SummaryHelperTest.java Fri Apr 12 12:00:13 2024 @@ -39,6 +39,7 @@ import org.apache.torque.map.ColumnMap; import org.apache.torque.map.DatabaseMap; import org.apache.torque.map.TableMap; import org.apache.torque.util.functions.Count; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; @@ -83,6 +84,8 @@ public class SummaryHelperTest extends B /** Mock result set metadata. */ @Mock private ResultSetMetaData resultSetMetaData; + + private AutoCloseable closeable; /** * Sets up the helper objects and the test. @@ -123,7 +126,7 @@ public class SummaryHelperTest extends B } // set up mocks - MockitoAnnotations.initMocks(this); + closeable = MockitoAnnotations.openMocks(this); when(connection.prepareStatement((String) any())) .thenReturn(preparedStatement); when(connection.createStatement()).thenReturn(preparedStatement); @@ -168,5 +171,10 @@ public class SummaryHelperTest extends B verify(resultSetMetaData).getColumnCount(); verifyNoMoreInteractions(connection, preparedStatement, resultSet, resultSetMetaData); } + + @AfterEach + void closeMocks() throws Exception { + closeable.close(); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org