Merge pull request #985 from hazendaz/master

[tests] Make sure to assert / fail try catch statements

Author: hazendaz

src/test/java/org/apache/ibatis/builder/ParameterExpressionTest.java

@@ -128,17 +128,19 @@ public void shouldIgnoreLeadingAndTrailingSpaces() {
   public void invalidOldJdbcTypeFormat() {
     try {
       new ParameterExpression("id:");
+      Assert.fail();
     } catch (BuilderException e) {
-      e.getMessage().contains("Parsing error in {id:} in position 3");
+      Assert.assertTrue(e.getMessage().contains("Parsing error in {id:} in position 3"));
     }
   }
 
   @Test
   public void invalidJdbcTypeOptUsingExpression() {
     try {
       new ParameterExpression("(expression)+");
+      Assert.fail();
     } catch (BuilderException e) {
-      e.getMessage().contains("Parsing error in {(expression)+} in position 12");
+      Assert.assertTrue(e.getMessage().contains("Parsing error in {(expression)+} in position 12"));
     }
   }
 

src/test/java/org/apache/ibatis/submitted/lazy_deserialize/LazyDeserializeTest.java

@@ -33,6 +33,7 @@
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -110,8 +111,9 @@ public void testLoadLazyDeserializeWithoutConfigurationFactory() throws Exceptio
       final LazyObjectFoo deserializedFoo = this.deserializeFoo(serializedFoo);
       try {
         deserializedFoo.getLazyObjectBar();
+        fail();
       } catch (ExecutorException e) {
-        e.getMessage().contains("Cannot get Configuration as configuration factory was not set.");
+        assertTrue(e.getMessage().contains("Cannot get Configuration as configuration factory was not set."));
       }
     } finally {
       session.close();

src/test/java/org/apache/ibatis/submitted/sqlprovider/SqlProviderTest.java

@@ -18,6 +18,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.Reader;
 import java.sql.Connection;
@@ -273,8 +275,9 @@ public void methodNotFound() throws NoSuchMethodException {
     try {
       new ProviderSqlSource(new Configuration(),
             ErrorMapper.class.getMethod("methodNotFound").getAnnotation(SelectProvider.class));
+      fail();
     } catch (BuilderException e) {
-      e.getMessage().contains("Error creating SqlSource for SqlProvider. Method 'methodNotFound' not found in SqlProvider 'org.apache.ibatis.submitted.sqlprovider.SqlProviderTest$ErrorSqlBuilder'.");
+      assertTrue(e.getMessage().contains("Error creating SqlSource for SqlProvider. Method 'methodNotFound' not found in SqlProvider 'org.apache.ibatis.submitted.sqlprovider.SqlProviderTest$ErrorSqlBuilder'."));
     }
   }
 
@@ -283,17 +286,19 @@ public void methodOverload() throws NoSuchMethodException {
     try {
       new ProviderSqlSource(new Configuration(),
               ErrorMapper.class.getMethod("methodOverload", String.class).getAnnotation(SelectProvider.class));
+      fail();
     } catch (BuilderException e) {
-      e.getMessage().contains("Error creating SqlSource for SqlProvider. Method 'overload' is found multiple in SqlProvider 'org.apache.ibatis.submitted.sqlprovider.SqlProviderTest$ErrorSqlBuilder'. Sql provider method can not overload.");
+      assertTrue(e.getMessage().contains("Error creating SqlSource for SqlProvider. Method 'overload' is found multiple in SqlProvider 'org.apache.ibatis.submitted.sqlprovider.SqlProviderTest$ErrorSqlBuilder'. Sql provider method can not overload."));
     }
   }
 
   @Test
   public void notSqlProvider() throws NoSuchMethodException {
     try {
       new ProviderSqlSource(new Configuration(), new Object());
+      fail();
     } catch (BuilderException e) {
-      e.getMessage().contains("Error creating SqlSource for SqlProvider.  Cause: java.lang.NoSuchMethodException: java.lang.Object.type()");
+      assertTrue(e.getMessage().contains("Error creating SqlSource for SqlProvider.  Cause: java.lang.NoSuchMethodException: java.lang.Object.type()"));
     }
   }
 
@@ -303,8 +308,9 @@ public void notSupportParameterObjectOnMultipleArguments() throws NoSuchMethodEx
       new ProviderSqlSource(new Configuration(),
             Mapper.class.getMethod("getUsersByName", String.class, String.class).getAnnotation(SelectProvider.class))
               .getBoundSql(new Object());
+      fail();
     } catch (BuilderException e) {
-      e.getMessage().contains("Error invoking SqlProvider method (org.apache.ibatis.submitted.sqlprovider.OurSqlBuilder.buildGetUsersByNameQuery). Cannot invoke a method that holds multiple arguments using a specifying parameterObject. In this case, please specify a 'java.util.Map' object.");
+      assertTrue(e.getMessage().contains("Error invoking SqlProvider method (org.apache.ibatis.submitted.sqlprovider.OurSqlBuilder.buildGetUsersByNameQuery). Cannot invoke a method that holds multiple arguments using a specifying parameterObject. In this case, please specify a 'java.util.Map' object."));
     }
   }
 
@@ -314,8 +320,9 @@ public void notSupportParameterObjectOnNamedArgument() throws NoSuchMethodExcept
       new ProviderSqlSource(new Configuration(),
             Mapper.class.getMethod("getUsersByNameWithParamName", String.class).getAnnotation(SelectProvider.class))
               .getBoundSql(new Object());
+      fail();
     } catch (BuilderException e) {
-      e.getMessage().contains("Error invoking SqlProvider method (org.apache.ibatis.submitted.sqlprovider.OurSqlBuilder.buildGetUsersByNameWithParamNameQuery). Cannot invoke a method that holds named argument(@Param) using a specifying parameterObject. In this case, please specify a 'java.util.Map' object.");
+      assertTrue(e.getMessage().contains("Error invoking SqlProvider method (org.apache.ibatis.submitted.sqlprovider.OurSqlBuilder.buildGetUsersByNameWithParamNameQuery). Cannot invoke a method that holds named argument(@Param) using a specifying parameterObject. In this case, please specify a 'java.util.Map' object."));
     }
   }
 
@@ -325,8 +332,9 @@ public void invokeError() throws NoSuchMethodException {
       new ProviderSqlSource(new Configuration(),
             ErrorMapper.class.getMethod("invokeError").getAnnotation(SelectProvider.class))
               .getBoundSql(new Object());
+      fail();
     } catch (BuilderException e) {
-      e.getMessage().contains("Error invoking SqlProvider method (org.apache.ibatis.submitted.sqlprovider.SqlProviderTest$ErrorSqlBuilder.invokeError).  Cause: java.lang.reflect.InvocationTargetException");
+      assertTrue(e.getMessage().contains("Error invoking SqlProvider method (org.apache.ibatis.submitted.sqlprovider.SqlProviderTest$ErrorSqlBuilder.invokeError).  Cause: java.lang.reflect.InvocationTargetException"));
     }
   }