You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/03/29 12:26:38 UTC
svn commit: r1582989 - in /cayenne/main/trunk: ./ cayenne-crypto/
cayenne-crypto/src/test/java/org/apache/cayenne/crypto/
cayenne-crypto/src/test/java/org/apache/cayenne/crypto/cipher/
cayenne-crypto/src/test/java/org/apache/cayenne/crypto/map/ cayenne...
Author: aadamchik
Date: Sat Mar 29 11:26:37 2014
New Revision: 1582989
URL: http://svn.apache.org/r1582989
Log:
starting to use JUnit 4 .. for now in crypto module
Modified:
cayenne/main/trunk/cayenne-crypto/pom.xml
cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Crypto_InRuntime_Test.java
cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/cipher/DefaultCipherFactoryTest.java
cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/map/PatternColumnMapperTest.java
cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/JceTransformerFactoryTest.java
cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13TransformerFactoryTest.java
cayenne/main/trunk/pom.xml
Modified: cayenne/main/trunk/cayenne-crypto/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-crypto/pom.xml?rev=1582989&r1=1582988&r2=1582989&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-crypto/pom.xml (original)
+++ cayenne/main/trunk/cayenne-crypto/pom.xml Sat Mar 29 11:26:37 2014
@@ -33,6 +33,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>${junit4.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Crypto_InRuntime_Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Crypto_InRuntime_Test.java?rev=1582989&r1=1582988&r2=1582989&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Crypto_InRuntime_Test.java (original)
+++ cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Crypto_InRuntime_Test.java Sat Mar 29 11:26:37 2014
@@ -18,13 +18,13 @@
****************************************************************/
package org.apache.cayenne.crypto;
+import static org.junit.Assert.assertEquals;
+
import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.crypto.db.Table1;
@@ -34,15 +34,17 @@ import org.apache.cayenne.di.Module;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.test.jdbc.TableHelper;
+import org.junit.Before;
+import org.junit.Test;
-public class Crypto_InRuntime_Test extends TestCase {
+public class Crypto_InRuntime_Test {
private ServerRuntime runtime;
private TableHelper table1;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
Module crypto = new CryptoModuleBuilder().valueTransformer(Rot13TransformerFactory.class)
.columnMapper(new PatternColumnMapper("^CRYPTO_")).build();
@@ -55,6 +57,7 @@ public class Crypto_InRuntime_Test exten
table1.deleteAll();
}
+ @Test
public void testInsert() throws SQLException {
ObjectContext context = runtime.newContext();
@@ -70,6 +73,7 @@ public class Crypto_InRuntime_Test exten
assertEquals(Rot13TransformerFactory.rotate("crypto_1"), data[2]);
}
+ @Test
public void testInsert_MultipleObjects() throws SQLException {
ObjectContext context = runtime.newContext();
@@ -96,6 +100,7 @@ public class Crypto_InRuntime_Test exten
assertEquals(Rot13TransformerFactory.rotate("crypto_2"), cipherByPlain.get("b"));
}
+ @Test
public void test_SelectQuery() throws SQLException {
table1.insert(1, "plain_1", Rot13TransformerFactory.rotate("crypto_1"));
Modified: cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/cipher/DefaultCipherFactoryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/cipher/DefaultCipherFactoryTest.java?rev=1582989&r1=1582988&r2=1582989&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/cipher/DefaultCipherFactoryTest.java (original)
+++ cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/cipher/DefaultCipherFactoryTest.java Sat Mar 29 11:26:37 2014
@@ -18,50 +18,57 @@
****************************************************************/
package org.apache.cayenne.crypto.cipher;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.util.HashMap;
import java.util.Map;
import javax.crypto.Cipher;
-import junit.framework.TestCase;
-
import org.apache.cayenne.crypto.CayenneCryptoException;
import org.apache.cayenne.crypto.CryptoConstants;
+import org.junit.Test;
-public class DefaultCipherFactoryTest extends TestCase {
+public class DefaultCipherFactoryTest {
+ @Test
public void testConstructor() {
Map<String, String> properties = new HashMap<String, String>();
-
- try {
- new DefaultCipherFactory(properties);
- fail("Must have thrown");
- } catch (CayenneCryptoException e) {
- // expected
- }
-
properties.put(CryptoConstants.CIPHER_ALGORITHM, "AES");
- try {
- new DefaultCipherFactory(properties);
- fail("Must have thrown");
- } catch (CayenneCryptoException e) {
- // expected
- }
-
properties.put(CryptoConstants.CIPHER_MODE, "CBC");
- try {
- new DefaultCipherFactory(properties);
- fail("Must have thrown");
- } catch (CayenneCryptoException e) {
- // expected
- }
-
properties.put(CryptoConstants.CIPHER_PADDING, "PKCS5Padding");
+
DefaultCipherFactory f = new DefaultCipherFactory(properties);
assertEquals("AES/CBC/PKCS5Padding", f.transformation);
}
+ @Test(expected = CayenneCryptoException.class)
+ public void testConstructor_Missing3Props() {
+ Map<String, String> properties = new HashMap<String, String>();
+
+ new DefaultCipherFactory(properties);
+ }
+
+ @Test(expected = CayenneCryptoException.class)
+ public void testConstructor_Missing2Props() {
+ Map<String, String> properties = new HashMap<String, String>();
+ properties.put(CryptoConstants.CIPHER_ALGORITHM, "AES");
+
+ new DefaultCipherFactory(properties);
+ }
+
+ @Test(expected = CayenneCryptoException.class)
+ public void testConstructor_Missing1Props() {
+ Map<String, String> properties = new HashMap<String, String>();
+ properties.put(CryptoConstants.CIPHER_ALGORITHM, "AES");
+ properties.put(CryptoConstants.CIPHER_MODE, "CBC");
+
+ new DefaultCipherFactory(properties);
+ }
+
+ @Test
public void testGetCipher() {
Map<String, String> properties = new HashMap<String, String>();
properties.put(CryptoConstants.CIPHER_ALGORITHM, "AES");
Modified: cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/map/PatternColumnMapperTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/map/PatternColumnMapperTest.java?rev=1582989&r1=1582988&r2=1582989&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/map/PatternColumnMapperTest.java (original)
+++ cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/map/PatternColumnMapperTest.java Sat Mar 29 11:26:37 2014
@@ -18,12 +18,15 @@
****************************************************************/
package org.apache.cayenne.crypto.map;
-import org.apache.cayenne.map.DbAttribute;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import org.apache.cayenne.map.DbAttribute;
+import org.junit.Test;
-public class PatternColumnMapperTest extends TestCase {
+public class PatternColumnMapperTest {
+ @Test
public void testIsEncrypted() {
PatternColumnMapper mapper = new PatternColumnMapper("^bla_");
Modified: cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/JceTransformerFactoryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/JceTransformerFactoryTest.java?rev=1582989&r1=1582988&r2=1582989&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/JceTransformerFactoryTest.java (original)
+++ cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/JceTransformerFactoryTest.java Sat Mar 29 11:26:37 2014
@@ -18,29 +18,35 @@
****************************************************************/
package org.apache.cayenne.crypto.transformer.value;
+import static org.junit.Assert.assertEquals;
+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.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.sql.Types;
-import junit.framework.TestCase;
-
import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
+import org.junit.Before;
+import org.junit.Test;
-public class JceTransformerFactoryTest extends TestCase {
+public class JceTransformerFactoryTest {
private DbEntity t1;
private DbEntity t2;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
ServerRuntime runtime = new ServerRuntime("cayenne-crypto.xml");
this.t1 = runtime.getChannel().getEntityResolver().getDbEntity("TABLE1");
this.t2 = runtime.getChannel().getEntityResolver().getDbEntity("TABLE2");
}
+ @Test
public void testGetJavaType() {
JceTransformerFactory f = new JceTransformerFactory();
@@ -69,6 +75,7 @@ public class JceTransformerFactoryTest e
assertEquals("java.lang.String", f.getJavaType(fakeA2));
}
+ @Test
public void testCreateEncryptor() {
JceTransformerFactory f = new JceTransformerFactory();
Modified: cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13TransformerFactoryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13TransformerFactoryTest.java?rev=1582989&r1=1582988&r2=1582989&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13TransformerFactoryTest.java (original)
+++ cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13TransformerFactoryTest.java Sat Mar 29 11:26:37 2014
@@ -18,18 +18,21 @@
****************************************************************/
package org.apache.cayenne.crypto.unit;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
import org.apache.cayenne.map.DbAttribute;
+import org.junit.Test;
-public class Rot13TransformerFactoryTest extends TestCase {
+public class Rot13TransformerFactoryTest {
+ @Test
public void testEncrypt() {
Rot13TransformerFactory factory = new Rot13TransformerFactory();
assertEquals("nop", factory.encryptor(new DbAttribute()).transform(null, "abc"));
}
+ @Test
public void testDecrypt() {
Rot13TransformerFactory factory = new Rot13TransformerFactory();
Modified: cayenne/main/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=1582989&r1=1582988&r2=1582989&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Sat Mar 29 11:26:37 2014
@@ -38,6 +38,10 @@
<properties>
<maven.build.timestamp.format>MMM dd yyyy HH:mm:ss</maven.build.timestamp.format>
<project.build.datetime>${maven.build.timestamp}</project.build.datetime>
+
+ <!-- 2 junit generations will coexist for some time -->
+ <junit3.version>3.8.1</junit3.version>
+ <junit4.version>4.11</junit4.version>
</properties>
<url>http://cayenne.apache.org/</url>
@@ -447,7 +451,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit3.version}</version>
<scope>test</scope>
</dependency>
<dependency>