You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by st...@apache.org on 2018/10/15 19:52:03 UTC
[openjpa] branch master updated: move openjpa-persistence tests to
junit4
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git
The following commit(s) were added to refs/heads/master by this push:
new 3fa4380 move openjpa-persistence tests to junit4
3fa4380 is described below
commit 3fa4380b478c9d7ae705720c7c70aed89e5e2aab
Author: Mark Struberg <st...@apache.org>
AuthorDate: Mon Oct 15 21:50:32 2018 +0200
move openjpa-persistence tests to junit4
---
.../TestEnumToKernelConstantMappings.java | 18 ++-
.../TestPersistenceProductDerivation.java | 138 +++++++++++----------
2 files changed, 87 insertions(+), 69 deletions(-)
diff --git a/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestEnumToKernelConstantMappings.java b/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestEnumToKernelConstantMappings.java
index c873f38..fe2a5ed 100644
--- a/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestEnumToKernelConstantMappings.java
+++ b/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestEnumToKernelConstantMappings.java
@@ -28,11 +28,13 @@ import org.apache.openjpa.kernel.DetachState;
import org.apache.openjpa.kernel.QueryOperations;
import org.apache.openjpa.kernel.RestoreState;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class TestEnumToKernelConstantMappings
- extends TestCase {
+import static org.junit.Assert.assertEquals;
+public class TestEnumToKernelConstantMappings {
+
+ @Test
public void testConnectionRetainModes() {
assertEquals(ConnectionRetainModes.CONN_RETAIN_ALWAYS,
ConnectionRetainMode.ALWAYS.toKernelConstant());
@@ -62,6 +64,7 @@ public class TestEnumToKernelConstantMappings
ConnectionRetainMode.values().length);
}
+ @Test
public void testDetachState() {
assertEquals(DetachState.DETACH_ALL,
DetachStateType.ALL.toKernelConstant());
@@ -90,6 +93,7 @@ public class TestEnumToKernelConstantMappings
DetachStateType.values().length);
}
+ @Test
public void testRestoreState() {
assertEquals(RestoreState.RESTORE_ALL,
RestoreStateType.ALL.toKernelConstant());
@@ -117,6 +121,7 @@ public class TestEnumToKernelConstantMappings
RestoreStateType.values().length);
}
+ @Test
public void testAutoClear() {
assertEquals(AutoClear.CLEAR_ALL, AutoClearType.ALL.toKernelConstant());
assertEquals(AutoClearType.ALL,
@@ -135,6 +140,7 @@ public class TestEnumToKernelConstantMappings
AutoClearType.values().length);
}
+ @Test
public void testAutoDetach() {
// Commenting out constant count test for now. Subtracting 2 is brittle.
// assertEquals(getConstantCount(AutoDetach.class) - 2,
@@ -172,19 +178,20 @@ public class TestEnumToKernelConstantMappings
assertEquals(EnumSet.allOf(AutoDetachType.class),
AutoDetachType.toEnumSet(
- AutoDetach.DETACH_NONE
+ AutoDetach.DETACH_NONE
| AutoDetach.DETACH_CLOSE
| AutoDetach.DETACH_COMMIT
| AutoDetach.DETACH_NONTXREAD
| AutoDetach.DETACH_ROLLBACK));
assertEquals( AutoDetach.DETACH_NONE
- | AutoDetach.DETACH_CLOSE
+ | AutoDetach.DETACH_CLOSE
| AutoDetach.DETACH_COMMIT
| AutoDetach.DETACH_NONTXREAD
| AutoDetach.DETACH_ROLLBACK,
AutoDetachType.fromEnumSet(EnumSet.allOf(AutoDetachType.class)));
}
+ @Test
public void testCallbackMode() {
assertEquals(getConstantCount(CallbackModes.class),
CallbackMode.values().length);
@@ -239,6 +246,7 @@ public class TestEnumToKernelConstantMappings
CallbackMode.fromEnumSet(EnumSet.allOf(CallbackMode.class)));
}
+ @Test
public void testQueryOperationTypes() {
assertEquals(QueryOperations.OP_SELECT,
QueryOperationType.SELECT.toKernelConstant());
diff --git a/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestPersistenceProductDerivation.java b/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestPersistenceProductDerivation.java
index db38482..5734d3e 100644
--- a/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestPersistenceProductDerivation.java
+++ b/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestPersistenceProductDerivation.java
@@ -42,18 +42,21 @@ import org.apache.openjpa.lib.conf.ConfigurationProvider;
import org.apache.openjpa.lib.encryption.EncryptionProvider;
import org.apache.openjpa.lib.util.J2DoPrivHelper;
-import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
-public class TestPersistenceProductDerivation extends TestCase {
+import static org.junit.Assert.*;
+
+public class TestPersistenceProductDerivation {
private File sourceFile;
private File targetFile;
ClassLoader originalLoader = null;
ClassLoader tempLoader = null;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
String currentDir = System.getProperty("user.dir");
// openjpa-persistence/target/test-classes/resources/second-persistence/META-INF/persistence.xml
@@ -82,9 +85,8 @@ public class TestPersistenceProductDerivation extends TestCase {
.setContextClassLoaderAction(tempLoader));
}
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
+ @After
+ public void tearDown() throws Exception {
// Restore the original classloader.
Thread.currentThread().setContextClassLoader(originalLoader);
@@ -104,6 +106,7 @@ public class TestPersistenceProductDerivation extends TestCase {
*
* @throws Exception
*/
+ @Test
public void testGetAnchorsInResource()throws Exception {
List<String> expectedPUs = Arrays.asList(
@@ -117,47 +120,52 @@ public class TestPersistenceProductDerivation extends TestCase {
// Added for OPENJPA-993
assertFalse(actual.contains("bad_provider"));
}
+
+ @Test
public void testEncryptionPluginConfiguration() throws Exception {
- PersistenceProductDerivation ppd = new PersistenceProductDerivation();
- OpenJPAConfiguration conf = new OpenJPAConfigurationImpl();
- String encryptedPassword = "encrypted_password";
- ClassLoader loader = null;
-
- ConfigurationProvider provider = ppd.load(
- PersistenceProductDerivation.RSRC_DEFAULT,
- "encryption_plugin_pu", loader);
- provider.setInto(conf);
- EncryptionProvider ep = conf.getEncryptionProvider();
- assertNotNull(ep);
- // Cast to test impl
- TestEncryptionProvider tep = (TestEncryptionProvider) ep;
-
- conf.setConnectionPassword(encryptedPassword);
- // Validate that when we get the ConnectionPassword from configuration
- // that it is decrypted
- assertEquals(TestEncryptionProvider.decryptedPassword, conf
- .getConnectionPassword());
- // Validate that the EncryptionProvider is called with the 'encrypted'
- // password
- assertEquals(encryptedPassword, tep.getEncryptedPassword());
- }
+ PersistenceProductDerivation ppd = new PersistenceProductDerivation();
+ OpenJPAConfiguration conf = new OpenJPAConfigurationImpl();
+ String encryptedPassword = "encrypted_password";
+ ClassLoader loader = null;
+
+ ConfigurationProvider provider = ppd.load(
+ PersistenceProductDerivation.RSRC_DEFAULT,
+ "encryption_plugin_pu", loader);
+ provider.setInto(conf);
+ EncryptionProvider ep = conf.getEncryptionProvider();
+ assertNotNull(ep);
+ // Cast to test impl
+ TestEncryptionProvider tep = (TestEncryptionProvider) ep;
+
+ conf.setConnectionPassword(encryptedPassword);
+ // Validate that when we get the ConnectionPassword from configuration
+ // that it is decrypted
+ assertEquals(TestEncryptionProvider.decryptedPassword, conf
+ .getConnectionPassword());
+ // Validate that the EncryptionProvider is called with the 'encrypted'
+ // password
+ assertEquals(encryptedPassword, tep.getEncryptedPassword());
+ }
+
+ @Test
public void testEncryptionPluginConfigurationDefaultValue() throws Exception {
- PersistenceProductDerivation ppd = new PersistenceProductDerivation();
- OpenJPAConfiguration conf = new OpenJPAConfigurationImpl();
- ClassLoader loader = null;
+ PersistenceProductDerivation ppd = new PersistenceProductDerivation();
+ OpenJPAConfiguration conf = new OpenJPAConfigurationImpl();
+ ClassLoader loader = null;
- ConfigurationProvider provider = ppd.load(
- PersistenceProductDerivation.RSRC_DEFAULT,
- "encryption_plugin_default_pu", loader);
- provider.setInto(conf);
+ ConfigurationProvider provider = ppd.load(
+ PersistenceProductDerivation.RSRC_DEFAULT,
+ "encryption_plugin_default_pu", loader);
+ provider.setInto(conf);
- assertNull(conf.getEncryptionProvider());
- }
+ assertNull(conf.getEncryptionProvider());
+ }
/*
* Verifies value of exclude-unlisted-classes with a version 1.0
* persistence.xml.
*/
+ @Test
public void testJPA1ExcludeUnlistedClasses() throws Exception {
PersistenceProductDerivation.ConfigurationParser cp =
new PersistenceProductDerivation.ConfigurationParser(new HashMap());
@@ -202,6 +210,7 @@ public class TestPersistenceProductDerivation extends TestCase {
* Verifies value of exclude-unlisted-classes with a version 2.0
* persistence.xml.
*/
+ @Test
public void testExcludeUnlistedClasses() throws Exception {
PersistenceProductDerivation.ConfigurationParser cp =
new PersistenceProductDerivation.ConfigurationParser(new HashMap());
@@ -291,33 +300,34 @@ public class TestPersistenceProductDerivation extends TestCase {
super(urls,parent);
}
}
+
public static class TestEncryptionProvider implements EncryptionProvider {
- public static final String decryptedPassword = "decypted_password";
- // Save the 'encrypted' password so our UT can perform validation.
- private String encryptedPassword;
-
- public String getEncryptedPassword() {
- return encryptedPassword;
- }
-
- /**
- * This method ALWAYS returns the String "decypted_password".
- *
- * @see EncryptionProvider#decrypt(String)
- */
- @Override
+ public static final String decryptedPassword = "decypted_password";
+ // Save the 'encrypted' password so our UT can perform validation.
+ private String encryptedPassword;
+
+ public String getEncryptedPassword() {
+ return encryptedPassword;
+ }
+
+ /**
+ * This method ALWAYS returns the String "decypted_password".
+ *
+ * @see EncryptionProvider#decrypt(String)
+ */
+ @Override
public String decrypt(String password) {
- encryptedPassword = password;
+ encryptedPassword = password;
- return decryptedPassword;
- }
+ return decryptedPassword;
+ }
- /**
- * @see EncryptionProvider#encrypt(String)
- */
- @Override
+ /**
+ * @see EncryptionProvider#encrypt(String)
+ */
+ @Override
public String encrypt(String password) {
- return password;
- }
- }
+ return password;
+ }
+ }
}