inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build fix: Relax tests now that Integer.MAX_VALUE is allowed for the row limit

Browse Source 
- ALF-7167 (RINF 11) - CQ


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28750 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-07-01 10:51:36 +00:00
parent f18746b781
commit f54c5e8bf5
3 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/domain/query/CannedQueryDAO.java
View File

@@ -72,7 +72,8 @@ public interface CannedQueryDAO
* @param queryName the name of the query e.g. <b>select_userCount</b> * @param queryName the name of the query e.g. <b>select_userCount</b>
* @param parameterObj the values to drive the selection (may be <tt>null</tt> if not required) * @param parameterObj the values to drive the selection (may be <tt>null</tt> if not required)
* @param offset the number of results to skip * @param offset the number of results to skip
* @param limit the maximum number of results to retrieve * @param limit the maximum number of results to retrieve or <code>Integer.MAX_VALUE</code>
* for no limit
* @return the list of results * @return the list of results
*/ */
<R> List<R> executeQuery( <R> List<R> executeQuery(
@@ -87,7 +88,8 @@ public interface CannedQueryDAO
* @param queryName the name of the query e.g. <b>select_userCount</b> * @param queryName the name of the query e.g. <b>select_userCount</b>
* @param parameterObj the values to drive the selection (may be <tt>null</tt> if not required) * @param parameterObj the values to drive the selection (may be <tt>null</tt> if not required)
* @param offset the number of results to skip * @param offset the number of results to skip
* @param limit the maximum number of results to retrieve * @param limit the maximum number of results to retrieve or <code>Integer.MAX_VALUE</code>
* for no limit
* @return the list of results * @return the list of results
*/ */
<R> void executeQuery( <R> void executeQuery(

19
source/java/org/alfresco/repo/domain/query/CannedQueryDAOTest.java
View File

@@ -233,15 +233,16 @@ public class CannedQueryDAOTest extends TestCase
{ {
// Expected // Expected
} }
try // TODO MyBatis workaround - temporarily support unlimited for nested result maps (see also below)
{ // try
cannedQueryDAO.executeQuery(QUERY_NS, QUERY_SELECT_MIMETYPES, null, 0, Integer.MAX_VALUE); // {
fail("Illegal parameter not detected"); // cannedQueryDAO.executeQuery(QUERY_NS, QUERY_SELECT_MIMETYPES, null, 0, Integer.MAX_VALUE);
} // fail("Illegal parameter not detected");
catch (IllegalArgumentException e) // }
{ // catch (IllegalArgumentException e)
// Expected // {
} // // Expected
// }
} }
public void testExecute_ListMimetypes() throws Throwable public void testExecute_ListMimetypes() throws Throwable

18
source/java/org/alfresco/repo/domain/query/ibatis/CannedQueryDAOImpl.java
View File

@@ -131,21 +131,16 @@ public class CannedQueryDAOImpl extends AbstractCannedQueryDAOImpl
throw new IllegalArgumentException("Query result offset must be zero or greater."); throw new IllegalArgumentException("Query result offset must be zero or greater.");
} }
// TODO MyBatis workaround - temporarily support unlimited for nested result maps (see also below) if (limit <= 0)
/*
if (limit <= 0 || limit == Integer.MAX_VALUE)
{ {
throw new IllegalArgumentException("Query results must be constrained by a limit."); throw new IllegalArgumentException("Query results limit must be greater than zero.");
} }
*/
String query = makeQueryName(sqlNamespace, queryName); String query = makeQueryName(sqlNamespace, queryName);
try try
{ {
if ((offset == 0) && (limit == Integer.MAX_VALUE)) if ((offset == 0) && (limit == Integer.MAX_VALUE))
{ {
// TODO MyBatis workaround - temporarily support unlimited for nested result maps (see also above)
// http://code.google.com/p/mybatis/issues/detail?id=129
return (List<R>) template.selectList(query, parameterObj); return (List<R>) template.selectList(query, parameterObj);
} }
else else
@@ -182,13 +177,10 @@ public class CannedQueryDAOImpl extends AbstractCannedQueryDAOImpl
throw new IllegalArgumentException("Query result offset must be zero or greater."); throw new IllegalArgumentException("Query result offset must be zero or greater.");
} }
// TODO MyBatis workaround - temporarily support unlimited for nested result maps (see also below) if (limit <= 0)
/*
if (limit <= 0 || limit == Integer.MAX_VALUE)
{ {
throw new IllegalArgumentException("Query results must be constrained by a limit."); throw new IllegalArgumentException("Query results limit must be greater than zero.");
} }
*/
String query = makeQueryName(sqlNamespace, queryName); String query = makeQueryName(sqlNamespace, queryName);
ResultHandlerTranslator<R> resultHandler = new ResultHandlerTranslator<R>(handler); ResultHandlerTranslator<R> resultHandler = new ResultHandlerTranslator<R>(handler);
@@ -200,8 +192,6 @@ public class CannedQueryDAOImpl extends AbstractCannedQueryDAOImpl
if ((offset == 0) && (limit == Integer.MAX_VALUE)) if ((offset == 0) && (limit == Integer.MAX_VALUE))
{ {
// TODO MyBatis workaround - temporarily support unlimited for nested result maps (see also above)
// http://code.google.com/p/mybatis/issues/detail?id=129
template.select(query, parameterObj, resultHandler); template.select(query, parameterObj, resultHandler);
} }
else else