Author: jgbutler
Date: Wed Jun 17 19:18:19 2009
New Revision: 785762
URL: http://svn.apache.org/viewvc?rev=785762&view=rev
Log:
[Ibator] Upgrade JUnit
Added:
ibatis/trunk/java/tools/ibator/core/devlib/junit-4.6.jar (with props)
Removed:
ibatis/trunk/java/tools/ibator/core/devlib/junit.jar
Modified:
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTests.java
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTests.java
Modified: ibatis/trunk/java/tools/ibator/core/build/version.properties
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/build/version.properties?rev=785762&r1=785761&r2=785762&view=diff
==============================================================================
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Wed Jun 17
19:18:19 2009
@@ -1,4 +1,4 @@
#Ibator build version info
-#Tue Jun 16 17:01:10 CDT 2009
+#Wed Jun 17 13:58:14 CDT 2009
version=1.2.2
-buildNum=745
+buildNum=746
Added: ibatis/trunk/java/tools/ibator/core/devlib/junit-4.6.jar
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/devlib/junit-4.6.jar?rev=785762&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ibatis/trunk/java/tools/ibator/core/devlib/junit-4.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTests.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTests.java?rev=785762&r1=785761&r2=785762&view=diff
==============================================================================
---
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTests.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/api/dom/java/FullyQualifiedJavaTypeTests.java
Wed Jun 17 19:18:19 2009
@@ -16,14 +16,19 @@
package org.apache.ibatis.ibator.api.dom.java;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
/**
* @author Jeff Butler
*
*/
-public class FullyQualifiedJavaTypeTests extends TestCase {
+public class FullyQualifiedJavaTypeTests {
+ @Test
public void testJavaType() {
FullyQualifiedJavaType fqjt =
new FullyQualifiedJavaType("java.lang.String"); //$NON-NLS-1$
@@ -34,6 +39,7 @@
assertEquals(0, fqjt.getImportList().size());
}
+ @Test
public void testSimpleType() {
FullyQualifiedJavaType fqjt =
new FullyQualifiedJavaType("com.foo.Bar"); //$NON-NLS-1$
@@ -44,6 +50,7 @@
assertEquals(1, fqjt.getImportList().size());
}
+ @Test
public void testGenericType1() {
FullyQualifiedJavaType fqjt =
new FullyQualifiedJavaType("java.util.List<java.lang.String>");
//$NON-NLS-1$
@@ -55,6 +62,7 @@
}
+ @Test
public void testGenericType2() {
FullyQualifiedJavaType fqjt =
new FullyQualifiedJavaType("java.util.Map<java.lang.String,
java.util.List<java.lang.String>>"); //$NON-NLS-1$
@@ -66,6 +74,7 @@
}
+ @Test
public void testGenericType3() {
FullyQualifiedJavaType listOfStrings = new
FullyQualifiedJavaType("java.util.List"); //$NON-NLS-1$
listOfStrings.addTypeArgument(new
FullyQualifiedJavaType("java.lang.String")); //$NON-NLS-1$
Modified:
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTests.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTests.java?rev=785762&r1=785761&r2=785762&view=diff
==============================================================================
---
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTests.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/test/org/apache/ibatis/ibator/internal/util/JavaBeansUtilTests.java
Wed Jun 17 19:18:19 2009
@@ -16,15 +16,16 @@
package org.apache.ibatis.ibator.internal.util;
-import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.ibatis.ibator.api.dom.java.FullyQualifiedJavaType;
+import org.junit.Test;
/**
* @author Jeff Butler
*
*/
-public class JavaBeansUtilTests extends TestCase {
+public class JavaBeansUtilTests {
/**
*
@@ -33,13 +34,7 @@
super();
}
- /**
- * @param arg0
- */
- public JavaBeansUtilTests(String arg0) {
- super(arg0);
- }
-
+ @Test
public void testGetValidPropertyName() {
assertEquals("eMail", JavaBeansUtil.getValidPropertyName("eMail"));
//$NON-NLS-1$ //$NON-NLS-2$
assertEquals("firstName",
JavaBeansUtil.getValidPropertyName("firstName")); //$NON-NLS-1$ //$NON-NLS-2$
@@ -53,6 +48,7 @@
assertEquals("accountType",
JavaBeansUtil.getValidPropertyName("AccountType")); //$NON-NLS-1$ //$NON-NLS-2$
}
+ @Test
public void testGetGetterMethodName() {
assertEquals("geteMail", JavaBeansUtil.getGetterMethodName("eMail",
FullyQualifiedJavaType.getStringInstance())); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("getFirstName",
JavaBeansUtil.getGetterMethodName("firstName",
FullyQualifiedJavaType.getStringInstance())); //$NON-NLS-1$ //$NON-NLS-2$
@@ -65,6 +61,7 @@
assertEquals("getAccountType",
JavaBeansUtil.getGetterMethodName("AccountType",
FullyQualifiedJavaType.getStringInstance())); //$NON-NLS-1$ //$NON-NLS-2$
}
+ @Test
public void testGetSetterMethodName() {
assertEquals("seteMail", JavaBeansUtil.getSetterMethodName("eMail"));
//$NON-NLS-1$ //$NON-NLS-2$
assertEquals("setFirstName",
JavaBeansUtil.getSetterMethodName("firstName")); //$NON-NLS-1$ //$NON-NLS-2$
