You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by tv...@apache.org on 2019/03/08 17:26:27 UTC
svn commit: r1855056 - in
/db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque:
criteria/CriterionTest.java om/ComboKeyTest.java
om/mapper/CompositeMapperTest.java
Author: tv
Date: Fri Mar 8 17:26:27 2019
New Revision: 1855056
URL: http://svn.apache.org/viewvc?rev=1855056&view=rev
Log:
Organize imports, fix deprecations
Modified:
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/om/ComboKeyTest.java
db/torque/torque4/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/CompositeMapperTest.java
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=1855056&r1=1855055&r2=1855056&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 Fri Mar 8 17:26:27 2019
@@ -19,19 +19,15 @@ package org.apache.torque.criteria;
* under the License.
*/
-import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
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.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
import org.apache.torque.BaseTestCase;
import org.apache.torque.ColumnImpl;
+import org.junit.jupiter.api.Test;
/**
* Test for the Criterion class.
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=1855056&r1=1855055&r2=1855056&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 Fri Mar 8 17:26:27 2019
@@ -1,11 +1,5 @@
package org.apache.torque.om;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import org.apache.torque.BaseTestCase;
-import org.junit.jupiter.api.Test;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -25,7 +19,12 @@ import org.junit.jupiter.api.Test;
* under the License.
*/
-import junit.framework.Assert;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.apache.torque.BaseTestCase;
+import org.junit.jupiter.api.Test;
/**
* TestCase for ComboKey
@@ -115,7 +114,7 @@ public class ComboKeyTest extends BaseTe
+ " thrown on new ComboKey(" + stringValue + "):"
+ e.getMessage());
}
- Assert.assertEquals(oldKey,newKey);
+ assertEquals(oldKey,newKey);
}
/**
@@ -141,7 +140,7 @@ public class ComboKeyTest extends BaseTe
+ " thrown on new ComboKey("
+ stringValue + "):" + e.getMessage());
}
- Assert.assertEquals(oldKey,newKey);
+ assertEquals(oldKey,newKey);
}
/**
@@ -180,7 +179,7 @@ public class ComboKeyTest extends BaseTe
{
StringBuilder sb = new StringBuilder();
c1a.appendTo(sb);
- Assert.assertEquals("Skey1:Skey2:", sb.toString());
+ assertEquals("Skey1:Skey2:", sb.toString());
}
/**
@@ -189,6 +188,6 @@ public class ComboKeyTest extends BaseTe
@Test
public void testToString()
{
- Assert.assertEquals("Skey1::N123456:", c4a.toString());
+ assertEquals("Skey1::N123456:", c4a.toString());
}
}
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=1855056&r1=1855055&r2=1855056&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 Fri Mar 8 17:26:27 2019
@@ -19,6 +19,8 @@ package org.apache.torque.om.mapper;
* under the License.
*/
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
@@ -29,16 +31,10 @@ import java.util.List;
import org.apache.torque.BaseTestCase;
import org.apache.torque.TorqueException;
import org.apache.torque.criteria.Criteria;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-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;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
public class CompositeMapperTest extends BaseTestCase
{
@@ -64,6 +60,7 @@ public class CompositeMapperTest extends
/** The fake criteria which produced the query .*/
private Criteria criteria = new Criteria();
+ @Override
@BeforeEach
public void setUp() throws Exception
{
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org