Author: gk
Date: Tue Jan 8 10:56:07 2019
New Revision: 1850726
URL: http://svn.apache.org/viewvc?rev=1850726&view=rev
Log:
- pom.xml: Remove SNAPSHOT from testcontainer version and not required deps
- torque-runtime: Update from JUnit 4 to 5 (not updating JUnit 3 in
o.a.t.util.functions.*)
Modified:
db/torque/torque4/trunk/pom.xml
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/BaseTestCase.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/ColumnImplTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueRuntimeExceptionTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/avalon/AvalonTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/JoinTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/manager/AbstractBaseManagerTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/manager/MethodResultCacheTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/map/ColumnMapTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/ComboKeyTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/NumberKeyTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/BigDecimalMapperTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/CompositeMapperTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/DateMapperTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/IntegerMapperTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/LongMapperTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/ObjectListMapperTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/StringMapperTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/QueryTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/BasePeerImplTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/SummaryHelperTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/UniqueListTest.java
Modified: db/torque/torque4/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/pom.xml?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Tue Jan 8 10:56:07 2019
@@ -372,40 +372,6 @@
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>${junit.jupiter.version}</version>
- <!--scope>test</scope-->
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <version>${junit.jupiter.version}</version>
- <!--scope>test</scope-->
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit.jupiter.version}</version>
- </dependency>
- <!-- use Junit 4 within Junit 5 -->
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <version>${junit.jupiter.version}</version>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-runner</artifactId>
- <version>${junit.platform}</version>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-launcher</artifactId>
- <version>${junit.platform}</version>
- </dependency>
-
<dependency>
<groupId>junit-addons</groupId>
@@ -443,7 +409,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8-SNAPSHOT</version>
+ <version>1.0.8</version>
<scope>test</scope>
</dependency>
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/BaseTestCase.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/BaseTestCase.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/BaseTestCase.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/BaseTestCase.java
Tue Jan 8 10:56:07 2019
@@ -24,8 +24,8 @@ import org.apache.torque.adapter.IDMetho
import org.apache.torque.map.ColumnMap;
import org.apache.torque.map.DatabaseMap;
import org.apache.torque.map.TableMap;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Before;
/**
* Base functionality to be extended by all Torque test cases. Test
@@ -77,7 +77,7 @@ public abstract class BaseTestCase
*
* @throws Exception if initialization fails.
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
Torque.setInstance(null);
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/ColumnImplTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/ColumnImplTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/ColumnImplTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/ColumnImplTest.java
Tue Jan 8 10:56:07 2019
@@ -1,6 +1,11 @@
package org.apache.torque;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,12 +26,6 @@ package org.apache.torque;
* under the License.
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.junit.Test;
/**
* Test for the class ColumnImpl
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java
Tue Jan 8 10:56:07 2019
@@ -1,12 +1,14 @@
package org.apache.torque;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.junit.jupiter.api.Test;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -32,7 +34,7 @@ import java.util.Map;
import org.apache.torque.adapter.Adapter;
import org.apache.torque.adapter.PostgresAdapter;
import org.apache.torque.dsfactory.DataSourceFactory;
-import org.junit.Test;
+
/**
* Tests the TorqueInstance Class.
@@ -76,18 +78,17 @@ public class TorqueInstanceTest extends
{
DataSourceFactory defaultDataSourceFactory
= Torque.getInstance().getDataSourceFactory(DEFAULT_NAME);
- assertNotNull(
- "The DataSourceFactory for Key "
- + DEFAULT_NAME
- + " should not be null",
- defaultDataSourceFactory);
+ assertNotNull( defaultDataSourceFactory,
+ "The DataSourceFactory for Key "
+ + DEFAULT_NAME
+ + " should not be null");
DataSourceFactory postgresqlDataSourceFactory
= Torque.getInstance().getDataSourceFactory(POSTGRESQL_NAME);
- assertSame("The default DataSourceFactory "
- + "and the postgresql DataSourceFactory "
- + "are not the same object",
- defaultDataSourceFactory,
- postgresqlDataSourceFactory);
+ assertSame( defaultDataSourceFactory,
+ postgresqlDataSourceFactory,
+ "The default DataSourceFactory "
+ + "and the postgresql DataSourceFactory "
+ + "are not the same object");
}
/**
@@ -99,21 +100,19 @@ public class TorqueInstanceTest extends
{
Map<String, Database> databases = Torque.getDatabases();
// check whether all expected databases are contained in the Map
- assertEquals(
- "Databases should contain 4 Databases, not "
- + databases.size(),
- 4,
- databases.size());
+ assertEquals(4, databases.size(),
+ "Databases should contain 4 Databases, not "
+ + databases.size());
// check that the default database and the turbine database
// refer to the same object
Database defaultDatabase = Torque.getDatabase(DEFAULT_NAME);
Database postgresqlDatabase = Torque.getDatabase(POSTGRESQL_NAME);
- assertNotSame("The default database and the turbine database "
- + "are the same object",
- defaultDatabase,
- postgresqlDatabase);
+ assertNotSame( defaultDatabase,
+ postgresqlDatabase,
+ "The default database and the turbine database "
+ + "are the same object");
}
/**
@@ -145,8 +144,8 @@ public class TorqueInstanceTest extends
Torque.getDatabase(POSTGRESQL_NAME).setDataSourceFactory(null);
Torque.shutdown();
- assertFalse("Torque.isInit() should return false after shutdown",
- Torque.isInit());
+ assertFalse( Torque.isInit(),
+ "Torque.isInit() should return false after shutdown");
try
{
Torque.getDatabases();
@@ -155,7 +154,8 @@ public class TorqueInstanceTest extends
}
catch (TorqueException e)
{
- assertEquals("Torque is not initialized.", e.getMessage());
+ assertEquals(e.getMessage(),
+ "Torque is not initialized.");
}
}
}
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueRuntimeExceptionTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueRuntimeExceptionTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueRuntimeExceptionTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueRuntimeExceptionTest.java
Tue Jan 8 10:56:07 2019
@@ -1,5 +1,7 @@
package org.apache.torque;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -22,9 +24,7 @@ package org.apache.torque;
import java.io.PrintWriter;
import java.io.StringWriter;
-import org.junit.Test;
-
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
/**
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/avalon/AvalonTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/avalon/AvalonTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/avalon/AvalonTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/avalon/AvalonTest.java
Tue Jan 8 10:56:07 2019
@@ -1,5 +1,7 @@
package org.apache.torque.avalon;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,10 +21,10 @@ package org.apache.torque.avalon;
* under the License.
*/
-import org.apache.fulcrum.testcontainer.BaseUnitTest;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
import org.apache.torque.BaseTestCase;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Basic testing of the Torque Avalon Component
@@ -30,21 +32,11 @@ import org.junit.Test;
* @author <a href="mailto:t...@apache.org";>Thomas Vandahl</a>
* @version $Id$
*/
-public class AvalonTest extends BaseUnitTest
+public class AvalonTest extends BaseUnit5Test
{
private Torque torque = null;
- /**
- * Constructor for test.
- *
- * @param name The name of the test being executed
- */
- public AvalonTest(String name)
- {
- super(name);
- }
-
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
}
@@ -57,11 +49,11 @@ public class AvalonTest extends BaseUnit
{
setConfigurationFileName("src/test/resources/TestComponentConfig.xml");
setRoleFileName("src/test/resources/TestRoleConfig.xml");
- super.setUp();
- torque = (Torque) this.resolve(Torque.class.getName());
+ torque = (Torque) this.lookup(Torque.class.getName());
assertTrue(torque.isInit());
- assertTrue("Instances should be identical", torque ==
org.apache.torque.Torque.getInstance());
+ assertTrue(torque == org.apache.torque.Torque.getInstance(),
+ "Instances should be identical");
}
/**
@@ -74,10 +66,10 @@ public class AvalonTest extends BaseUnit
org.apache.torque.Torque.init(BaseTestCase.CONFIG_FILE);
setConfigurationFileName("src/test/resources/TestComponentConfig.xml");
setRoleFileName("src/test/resources/TestRoleConfig.xml");
- super.setUp();
- torque = (Torque) this.resolve(Torque.class.getName());
+ torque = (Torque) this.lookup(Torque.class.getName());
assertTrue(torque.isInit());
- assertTrue("Instances should be identical", torque ==
org.apache.torque.Torque.getInstance());
+ assertTrue(torque == org.apache.torque.Torque.getInstance(),
+ "Instances should be identical");
}
}
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java
Tue Jan 8 10:56:07 2019
@@ -41,14 +41,15 @@ import org.apache.torque.sql.OrderBy;
import org.apache.torque.sql.Query;
import org.apache.torque.sql.SqlBuilder;
import org.apache.torque.util.UniqueList;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test class for Criteria.
@@ -67,7 +68,7 @@ public class CriteriaTest extends BaseTe
/**
* Initializes the criteria.
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
super.setUp();
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriterionTest.java
Tue Jan 8 10:56:07 2019
@@ -19,14 +19,16 @@ package org.apache.torque.criteria;
* under the License.
*/
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.torque.BaseTestCase;
import org.apache.torque.ColumnImpl;
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/JoinTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/JoinTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/JoinTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/JoinTest.java
Tue Jan 8 10:56:07 2019
@@ -1,5 +1,7 @@
package org.apache.torque.criteria;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,10 +23,7 @@ package org.apache.torque.criteria;
import org.apache.torque.BaseTestCase;
import org.apache.torque.ColumnImpl;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
/**
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/manager/AbstractBaseManagerTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/manager/AbstractBaseManagerTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/manager/AbstractBaseManagerTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/manager/AbstractBaseManagerTest.java
Tue Jan 8 10:56:07 2019
@@ -1,5 +1,11 @@
package org.apache.torque.manager;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,13 +25,9 @@ package org.apache.torque.manager;
* under the License.
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
import java.util.List;
@@ -37,11 +39,12 @@ import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
import org.apache.torque.om.ObjectKey;
import org.apache.torque.om.SimpleKey;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
public class AbstractBaseManagerTest implements CacheListener<TestPersistent>
{
@@ -53,7 +56,7 @@ public class AbstractBaseManagerTest imp
private boolean refreshedObjectCalled;
private boolean removedObjectCalled;
- @BeforeClass
+ @BeforeAll
public static void initTorque()
{
try
@@ -67,7 +70,7 @@ public class AbstractBaseManagerTest imp
}
}
- @AfterClass
+ @AfterAll
public static void shutdownTorque()
{
try
@@ -108,7 +111,7 @@ public class AbstractBaseManagerTest imp
return columnList;
}
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
this.manager = new TestManager();
@@ -116,7 +119,7 @@ public class AbstractBaseManagerTest imp
this.manager.setRegion(CACHE_REGION);
}
- @After
+ @AfterEach
public void tearDown() throws Exception
{
manager.cache.clear();
@@ -126,17 +129,17 @@ public class AbstractBaseManagerTest imp
public void testGetOMInstance() throws TorqueException
{
TestPersistent test = manager.getOMInstance();
- assertNotNull("Instance should not be null", test);
- assertTrue("Instance should be a TestPersistent", test instanceof
TestPersistent);
+ assertNotNull(test, "Instance should not be null");
+ assertTrue(test instanceof TestPersistent, "Instance should be a
TestPersistent");
}
@Test
public void testGetOMInstanceObjectKey() throws TorqueException
{
TestPersistent test = manager.getOMInstance(TEST_PRIMARY_KEY);
- assertNotNull("Instance should not be null", test);
- assertTrue("Instance should be a TestPersistent", test instanceof
TestPersistent);
- assertEquals("Instance should have id 'testID'", TEST_PRIMARY_KEY,
test.getPrimaryKey());
+ assertNotNull( test, "Instance should not be null");
+ assertTrue( test instanceof TestPersistent, "Instance should be a
TestPersistent");
+ assertEquals(TEST_PRIMARY_KEY, test.getPrimaryKey(), "Instance should
have id 'testID'");
}
@Test
@@ -144,21 +147,21 @@ public class AbstractBaseManagerTest imp
{
TestPersistent test1 = manager.getOMInstance(TEST_PRIMARY_KEY, false);
TestPersistent test2 = manager.getOMInstance(TEST_PRIMARY_KEY, false);
- assertNotSame("Should be different instances", test1, test2);
+ assertNotSame( test1, test2, "Should be different instances");
TestPersistent test3 = manager.getOMInstance(TEST_PRIMARY_KEY, true);
TestPersistent test4 = manager.getOMInstance(TEST_PRIMARY_KEY, true);
- assertSame("Should be same instances", test3, test4);
+ assertSame( test3, test4, "Should be same instances");
}
@Test
public void testCacheGet() throws TorqueException
{
TestPersistent test1 = manager.cacheGet(TEST_PRIMARY_KEY);
- assertNull("Should not be in cache", test1);
+ assertNull( test1, "Should not be in cache");
test1 = manager.getOMInstance(TEST_PRIMARY_KEY, true);
TestPersistent test2 = manager.cacheGet(TEST_PRIMARY_KEY);
- assertSame("Should be same instances", test1, test2);
+ assertSame( test1, test2, "Should be same instances");
}
@Test
@@ -166,11 +169,11 @@ public class AbstractBaseManagerTest imp
{
TestPersistent test1 = manager.getOMInstance(TEST_PRIMARY_KEY, true);
TestPersistent test2 = manager.cacheGet(TEST_PRIMARY_KEY);
- assertNotNull("Should be in cache", test2);
- assertSame("Should be same instances", test1, test2);
+ assertNotNull( test2, "Should be in cache");
+ assertSame( test1, test2, "Should be same instances");
manager.clearImpl();
TestPersistent test3 = manager.cacheGet(TEST_PRIMARY_KEY);
- assertNull("Should not be in cache", test3);
+ assertNull( test3, "Should not be in cache");
}
@Test
@@ -178,9 +181,9 @@ public class AbstractBaseManagerTest imp
{
TestPersistent test1 = manager.getOMInstance(TEST_PRIMARY_KEY, true);
TestPersistent test2 = manager.removeInstanceImpl(TEST_PRIMARY_KEY);
- assertSame("Should be same instances", test1, test2);
+ assertSame( test1, test2, "Should be same instances");
TestPersistent test3 = manager.cacheGet(TEST_PRIMARY_KEY);
- assertNull("Should not be in cache", test3);
+ assertNull(test3, "Should not be in cache");
}
@Test
@@ -189,16 +192,16 @@ public class AbstractBaseManagerTest imp
TestPersistent test1 = manager.getOMInstance(TEST_PRIMARY_KEY, true);
TestPersistent test2 = manager.getOMInstance(TEST_PRIMARY_KEY, false);
TestPersistent test3 = manager.putInstanceImpl(TEST_PRIMARY_KEY,
test2);
- assertSame("Should be same instances", test1, test3);
+ assertSame(test1, test3, "Should be same instances");
TestPersistent test4 = manager.cacheGet(TEST_PRIMARY_KEY);
- assertSame("Should be same instances", test2, test4);
+ assertSame( test2, test4, "Should be same instances");
}
@Test
public void testGetMethodResultCache()
{
MethodResultCache mrc = manager.getMethodResultCache();
- assertNotNull("Should have MethodResultCache", mrc);
+ assertNotNull(mrc, "Should have MethodResultCache");
}
@Test
@@ -212,24 +215,24 @@ public class AbstractBaseManagerTest imp
TestPersistent test1 = new TestPersistent();
TestPersistent test2 = new TestPersistent();
manager.notifyListeners(new ColumnImpl("test1"), (TestPersistent)null,
test1);
- assertTrue("Should call addedObject", addedObjectCalled);
- assertFalse("Should not call refreshedObject", refreshedObjectCalled);
- assertFalse("Should not call removedObject", removedObjectCalled);
+ assertTrue(addedObjectCalled, "Should call addedObject");
+ assertFalse(refreshedObjectCalled,"Should not call refreshedObject");
+ assertFalse(removedObjectCalled, "Should not call removedObject");
this.addedObjectCalled = false;
this.refreshedObjectCalled = false;
this.removedObjectCalled = false;
manager.notifyListeners(new ColumnImpl("test2"), test2, test1);
- assertFalse("Should not call addedObject", addedObjectCalled);
- assertTrue("Should call refreshedObject", refreshedObjectCalled);
- assertFalse("Should not call removedObject", removedObjectCalled);
+ assertFalse(addedObjectCalled, "Should not call addedObject");
+ assertTrue(refreshedObjectCalled, "Should call refreshedObject");
+ assertFalse(removedObjectCalled, "Should not call removedObject");
this.addedObjectCalled = false;
this.refreshedObjectCalled = false;
this.removedObjectCalled = false;
manager.notifyListeners(new ColumnImpl("test2"), test2, null);
- assertFalse("Should not call addedObject", addedObjectCalled);
- assertFalse("Should not call refreshedObject", refreshedObjectCalled);
- assertTrue("Should call removedObject", removedObjectCalled);
+ assertFalse(addedObjectCalled, "Should not call addedObject");
+ assertFalse(refreshedObjectCalled, "Should not call refreshedObject");
+ assertTrue(removedObjectCalled, "Should call removedObject");
}
}
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/manager/MethodResultCacheTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/manager/MethodResultCacheTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/manager/MethodResultCacheTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/manager/MethodResultCacheTest.java
Tue Jan 8 10:56:07 2019
@@ -1,5 +1,8 @@
package org.apache.torque.manager;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,18 +22,17 @@ package org.apache.torque.manager;
* under the License.
*/
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
import org.apache.torque.BaseTestCase;
import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
public class MethodResultCacheTest
{
@@ -44,7 +46,7 @@ public class MethodResultCacheTest
private TestManager manager;
private MethodResultCache mrc;
- @BeforeClass
+ @BeforeAll
public static void initTorque()
{
try
@@ -58,7 +60,7 @@ public class MethodResultCacheTest
}
}
- @AfterClass
+ @AfterAll
public static void shutdownTorque()
{
try
@@ -71,7 +73,7 @@ public class MethodResultCacheTest
}
}
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
this.manager = new TestManager();
@@ -80,7 +82,7 @@ public class MethodResultCacheTest
this.mrc = this.manager.getMethodResultCache();
}
- @After
+ @AfterEach
public void tearDown() throws Exception
{
mrc.clear();
@@ -92,8 +94,8 @@ public class MethodResultCacheTest
TestPersistent test1 = new TestPersistent();
mrc.put(test1, TestPersistent.class, TEST_METHOD1, TEST_ARG_ONE,
TEST_ARG_TWO);
TestPersistent test2 = mrc.get(TestPersistent.class, TEST_METHOD1,
TEST_ARG_ONE, TEST_ARG_TWO);
- assertNotNull("Should be in cache", test2);
- assertSame("Should be same instance", test1, test2);
+ assertNotNull(test2, "Should be in cache");
+ assertSame( test1, test2, "Should be same instance");
}
@Test
@@ -101,25 +103,25 @@ public class MethodResultCacheTest
{
TestPersistent test1 = new TestPersistent();
mrc.put(test1, TestPersistent.class, TEST_METHOD1, TEST_ARG_ONE,
TEST_ARG_TWO);
- assertNotNull("Should be in cache", mrc.get(TestPersistent.class,
TEST_METHOD1, TEST_ARG_ONE, TEST_ARG_TWO));
+ assertNotNull( mrc.get(TestPersistent.class, TEST_METHOD1,
TEST_ARG_ONE, TEST_ARG_TWO), "Should be in cache");
TestPersistent test2 = new TestPersistent();
mrc.put(test2, TestPersistent.class, TEST_METHOD1, TEST_ARG_ONE,
TEST_ARG_THREE);
- assertNotNull("Should be in cache", mrc.get(TestPersistent.class,
TEST_METHOD1, TEST_ARG_ONE, TEST_ARG_THREE));
+ assertNotNull( mrc.get(TestPersistent.class, TEST_METHOD1,
TEST_ARG_ONE, TEST_ARG_THREE), "Should be in cache");
TestPersistent test3 = new TestPersistent();
mrc.put(test3, TestPersistent.class, TEST_METHOD2, TEST_ARG_ONE,
TEST_ARG_TWO);
- assertNotNull("Should be in cache", mrc.get(TestPersistent.class,
TEST_METHOD2, TEST_ARG_ONE, TEST_ARG_TWO));
+ assertNotNull( mrc.get(TestPersistent.class, TEST_METHOD2,
TEST_ARG_ONE, TEST_ARG_TWO), "Should be in cache");
TestPersistent test4 = new TestPersistent();
mrc.put(test4, TestPersistent.class, TEST_METHOD2, TEST_ARG_ONE,
TEST_ARG_THREE);
- assertNotNull("Should be in cache", mrc.get(TestPersistent.class,
TEST_METHOD2, TEST_ARG_ONE, TEST_ARG_THREE));
+ assertNotNull( mrc.get(TestPersistent.class, TEST_METHOD2,
TEST_ARG_ONE, TEST_ARG_THREE), "Should be in cache");
mrc.removeAll(TestPersistent.class, TEST_METHOD1);
- assertNull("Should not be in cache", mrc.get(TestPersistent.class,
TEST_METHOD1, TEST_ARG_ONE, TEST_ARG_TWO));
- assertNull("Should not be in cache", mrc.get(TestPersistent.class,
TEST_METHOD1, TEST_ARG_ONE, TEST_ARG_THREE));
+ assertNull( mrc.get(TestPersistent.class, TEST_METHOD1, TEST_ARG_ONE,
TEST_ARG_TWO), "Should not be in cache");
+ assertNull( mrc.get(TestPersistent.class, TEST_METHOD1, TEST_ARG_ONE,
TEST_ARG_THREE), "Should not be in cache");
- assertNotNull("Should still be in cache",
mrc.get(TestPersistent.class, TEST_METHOD2, TEST_ARG_ONE, TEST_ARG_TWO));
- assertNotNull("Should still be in cache",
mrc.get(TestPersistent.class, TEST_METHOD2, TEST_ARG_ONE, TEST_ARG_THREE));
+ assertNotNull( mrc.get(TestPersistent.class, TEST_METHOD2,
TEST_ARG_ONE, TEST_ARG_TWO), "Should still be in cache");
+ assertNotNull( mrc.get(TestPersistent.class, TEST_METHOD2,
TEST_ARG_ONE, TEST_ARG_THREE), "Should still be in cache");
}
@Test
@@ -127,11 +129,11 @@ public class MethodResultCacheTest
{
TestPersistent test1 = new TestPersistent();
mrc.put(test1, TestPersistent.class, TEST_METHOD1, TEST_ARG_ONE,
TEST_ARG_TWO);
- assertNotNull("Should be in cache", mrc.get(TestPersistent.class,
TEST_METHOD1, TEST_ARG_ONE, TEST_ARG_TWO));
+ assertNotNull(mrc.get(TestPersistent.class, TEST_METHOD1,
TEST_ARG_ONE, TEST_ARG_TWO), "Should be in cache");
TestPersistent test3 = mrc.remove(TestPersistent.class, TEST_METHOD1,
TEST_ARG_ONE, TEST_ARG_TWO);
- assertNull("Should not be in cache", mrc.get(TestPersistent.class,
TEST_METHOD1, TEST_ARG_ONE, TEST_ARG_TWO));
- assertSame("Should be same instance", test1, test3);
+ assertNull( mrc.get(TestPersistent.class, TEST_METHOD1, TEST_ARG_ONE,
TEST_ARG_TWO), "Should not be in cache");
+ assertSame( test1, test3, "Should be same instance");
}
}
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/map/ColumnMapTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/map/ColumnMapTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/map/ColumnMapTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/map/ColumnMapTest.java
Tue Jan 8 10:56:07 2019
@@ -1,11 +1,9 @@
package org.apache.torque.map;
-import org.apache.torque.BaseTestCase;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.torque.BaseTestCase;
+import org.junit.jupiter.api.Test;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/ComboKeyTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/ComboKeyTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/ComboKeyTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/ComboKeyTest.java
Tue Jan 8 10:56:07 2019
@@ -1,10 +1,10 @@
package org.apache.torque.om;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.torque.BaseTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/NumberKeyTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/NumberKeyTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/NumberKeyTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/NumberKeyTest.java
Tue Jan 8 10:56:07 2019
@@ -1,8 +1,10 @@
package org.apache.torque.om;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,7 +29,7 @@ import java.math.BigDecimal;
import java.util.Arrays;
import org.apache.torque.BaseTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/BigDecimalMapperTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/BigDecimalMapperTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/BigDecimalMapperTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/BigDecimalMapperTest.java
Tue Jan 8 10:56:07 2019
@@ -1,5 +1,8 @@
package org.apache.torque.om.mapper;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -30,26 +33,18 @@ import java.sql.SQLException;
import org.apache.torque.BaseTestCase;
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;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-
public class BigDecimalMapperTest extends BaseTestCase
{
/** Mock result set. */
@Mock
private ResultSet resultSet;
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
super.setUp();
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/CompositeMapperTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/CompositeMapperTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/CompositeMapperTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/CompositeMapperTest.java
Tue Jan 8 10:56:07 2019
@@ -32,11 +32,13 @@ import org.apache.torque.criteria.Criter
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class CompositeMapperTest extends BaseTestCase
{
@@ -62,7 +64,7 @@ public class CompositeMapperTest extends
/** The fake criteria which produced the query .*/
private Criteria criteria = new Criteria();
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
super.setUp();
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/DateMapperTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/DateMapperTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/DateMapperTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/DateMapperTest.java
Tue Jan 8 10:56:07 2019
@@ -1,5 +1,8 @@
package org.apache.torque.om.mapper;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -30,22 +33,18 @@ import java.util.Date;
import org.apache.torque.BaseTestCase;
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;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class DateMapperTest extends BaseTestCase
{
/** Mock result set. */
@Mock
private ResultSet resultSet;
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
super.setUp();
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/IntegerMapperTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/IntegerMapperTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/IntegerMapperTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/IntegerMapperTest.java
Tue Jan 8 10:56:07 2019
@@ -1,5 +1,8 @@
package org.apache.torque.om.mapper;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -29,22 +32,18 @@ import java.sql.SQLException;
import org.apache.torque.BaseTestCase;
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;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class IntegerMapperTest extends BaseTestCase
{
/** Mock result set. */
@Mock
private ResultSet resultSet;
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
super.setUp();
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/LongMapperTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/LongMapperTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/LongMapperTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/LongMapperTest.java
Tue Jan 8 10:56:07 2019
@@ -1,5 +1,8 @@
package org.apache.torque.om.mapper;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -29,22 +32,18 @@ import java.sql.SQLException;
import org.apache.torque.BaseTestCase;
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;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class LongMapperTest extends BaseTestCase
{
/** Mock result set. */
@Mock
private ResultSet resultSet;
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
super.setUp();
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/ObjectListMapperTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/ObjectListMapperTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/ObjectListMapperTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/ObjectListMapperTest.java
Tue Jan 8 10:56:07 2019
@@ -1,5 +1,9 @@
package org.apache.torque.om.mapper;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -44,16 +48,11 @@ import java.util.List;
import org.apache.torque.BaseTestCase;
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;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
public class ObjectListMapperTest extends BaseTestCase
{
/** Mock result set. */
@@ -91,7 +90,7 @@ public class ObjectListMapperTest extend
/** Object instance. */
private Object object = new Object();
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
super.setUp();
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/StringMapperTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/StringMapperTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/StringMapperTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/StringMapperTest.java
Tue Jan 8 10:56:07 2019
@@ -1,5 +1,8 @@
package org.apache.torque.om.mapper;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -29,22 +32,18 @@ import java.sql.SQLException;
import org.apache.torque.BaseTestCase;
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;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
public class StringMapperTest extends BaseTestCase
{
/** Mock result set. */
@Mock
private ResultSet resultSet;
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
super.setUp();
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/QueryTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/QueryTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/QueryTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/QueryTest.java
Tue Jan 8 10:56:07 2019
@@ -1,5 +1,7 @@
package org.apache.torque.sql;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -23,15 +25,6 @@ import org.apache.torque.BaseTestCase;
import org.apache.torque.criteria.FromElement;
import org.apache.torque.util.UniqueList;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
/**
* Tests for Query
*
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java
Tue Jan 8 10:56:07 2019
@@ -1,5 +1,9 @@
package org.apache.torque.sql;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -36,15 +40,6 @@ import org.apache.torque.criteria.Prepar
import org.apache.torque.criteria.SqlEnum;
import org.apache.torque.om.NumberKey;
import org.apache.torque.util.functions.Count;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
/**
* Tests for SqlExpression
@@ -2240,9 +2235,9 @@ public class SqlBuilderTest extends Base
long end = System.currentTimeMillis();
List<Object> replacements = query.getPreparedStatementReplacements();
assertEquals(size, replacements.size());
- assertTrue("Exceeded time limit of " + LARGE_ARRAY_TIME_LIMIT
- + " ms. Execution time was " + (end - start) + " ms",
- end - start < LARGE_ARRAY_TIME_LIMIT);
+ assertTrue( end - start < LARGE_ARRAY_TIME_LIMIT,
+ "Exceeded time limit of " + LARGE_ARRAY_TIME_LIMIT
+ + " ms. Execution time was " + (end - start) + " ms");
}
public void testInString() throws Exception
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/BasePeerImplTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/BasePeerImplTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/BasePeerImplTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/BasePeerImplTest.java
Tue Jan 8 10:56:07 2019
@@ -1,5 +1,14 @@
package org.apache.torque.util;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,12 +28,6 @@ package org.apache.torque.util;
* under the License.
*/
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
import java.math.BigDecimal;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -52,15 +55,11 @@ import org.apache.torque.om.mapper.Integ
import org.apache.torque.om.mapper.ObjectListMapper;
import org.apache.torque.om.mapper.StringMapper;
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;
import org.mockito.MockitoAnnotations;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
/**
@@ -95,7 +94,7 @@ public class BasePeerImplTest extends Ba
@Mock
private IdGenerator idGenerator;
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
basePeerImpl = new BasePeerImpl<>();
@@ -123,7 +122,7 @@ public class BasePeerImplTest extends Ba
Transaction.setTransactionManager(transactionManager);
}
- @After
+ @AfterEach
public void tearDown()
{
Transaction.setTransactionManager(oldTransactionManager);
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/SummaryHelperTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/SummaryHelperTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/SummaryHelperTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/SummaryHelperTest.java
Tue Jan 8 10:56:07 2019
@@ -1,5 +1,12 @@
package org.apache.torque.util;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,12 +26,6 @@ package org.apache.torque.util;
* under the License.
*/
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -38,14 +39,11 @@ 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.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
/**
* Test class for SummaryHelper.
@@ -89,7 +87,7 @@ public class SummaryHelperTest extends B
/**
* Sets up the helper objects and the test.
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
super.setUp();
Modified:
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/UniqueListTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/UniqueListTest.java?rev=1850726&r1=1850725&r2=1850726&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/UniqueListTest.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/util/UniqueListTest.java
Tue Jan 8 10:56:07 2019
@@ -1,9 +1,10 @@
package org.apache.torque.util;
-import static org.junit.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.torque.BaseTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -43,7 +44,7 @@ public class UniqueListTest extends Base
UniqueList<Object> uniqueList = new UniqueList<>();
Object o = null;
boolean actualReturn = uniqueList.add(o);
- assertEquals("return value", false, actualReturn);
+ assertEquals(false, actualReturn, "return value");
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
