LPS-47199 Sort

xieh · Jul 27, 2015 · b5e5807 · b5e5807
1 parent a747968
commit b5e5807
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/.ivy/cache/--default.xml b/.ivy/cache/--default.xml
@@ -7,7 +7,7 @@
 		revision="working@bchan-yosemite-1"
 		conf="default"
 		confs="default"
-		date="20150722161509"/>
+		date="20150727135629"/>
 	<dependencies>
 		<module organisation="com.liferay" name="com.liferay.arquillian.extension">
 			<revision name="1.0.0-SNAPSHOT" status="integration" pubdate="20150130073350" resolver="liferay-public" artresolver="default" homepage="" downloaded="false" searched="false" default="false" conf="system, default, optional, compile, *, provided, runtime, javadoc, sources, master" position="20">

diff --git a/util-java/test/unit/com/liferay/util/dao/orm/CustomSQLTest.java b/util-java/test/unit/com/liferay/util/dao/orm/CustomSQLTest.java
@@ -152,7 +152,6 @@ public static void tearDownClass() throws Exception {
 
 	@Before
 	public void setUp() throws Exception {
-		_queryDefinition = new QueryDefinition<>();
 		_customSQL = new TestCustomSQL();
 	}
 
@@ -165,18 +164,18 @@ public void testGetAnyStatus() {
 
 	@Test
 	public void testGetAnyStatusIncludeOwner() {
-		_queryDefinition.setStatus(WorkflowConstants.STATUS_ANY);
-		_queryDefinition.setOwnerUserId(_USER_ID);
 		_queryDefinition.setIncludeOwner(true);
+		_queryDefinition.setOwnerUserId(_USER_ID);
+		_queryDefinition.setStatus(WorkflowConstants.STATUS_ANY);
 
 		testSQL("((userId = ? AND status != ?)  OR  -1 = ?) ");
 	}
 
 	@Test
 	public void testGetAnyStatusNotIncludeOwner() {
-		_queryDefinition.setStatus(WorkflowConstants.STATUS_ANY);
-		_queryDefinition.setOwnerUserId(_USER_ID);
 		_queryDefinition.setIncludeOwner(false);
+		_queryDefinition.setOwnerUserId(_USER_ID);
+		_queryDefinition.setStatus(WorkflowConstants.STATUS_ANY);
 
 		testSQL("(userId = ?  AND  -1 = ?) ");
 	}
@@ -190,26 +189,26 @@ public void testGetExcludeStatus() {
 
 	@Test
 	public void testGetExcludeStatusIncludeOwner() {
-		_queryDefinition.setStatus(WorkflowConstants.STATUS_IN_TRASH, true);
-		_queryDefinition.setOwnerUserId(_USER_ID);
 		_queryDefinition.setIncludeOwner(true);
+		_queryDefinition.setOwnerUserId(_USER_ID);
+		_queryDefinition.setStatus(WorkflowConstants.STATUS_IN_TRASH, true);
 
 		testSQL("((userId = ? AND status != ?)  OR  status != ?) ");
 	}
 
 	@Test
 	public void testGetExcludeStatusNotIncludeOwner() {
-		_queryDefinition.setStatus(WorkflowConstants.STATUS_IN_TRASH, true);
-		_queryDefinition.setOwnerUserId(_USER_ID);
 		_queryDefinition.setIncludeOwner(false);
+		_queryDefinition.setOwnerUserId(_USER_ID);
+		_queryDefinition.setStatus(WorkflowConstants.STATUS_IN_TRASH, true);
 
 		testSQL("(userId = ?  AND  status != ?) ");
 	}
 
 	@Test
 	public void testGetIncludeOwner() {
-		_queryDefinition.setOwnerUserId(_USER_ID);
 		_queryDefinition.setIncludeOwner(true);
+		_queryDefinition.setOwnerUserId(_USER_ID);
 
 		testSQL("((userId = ? AND status != ?)  OR  -1 = ?) ");
 	}
@@ -223,35 +222,35 @@ public void testGetIncludeStatus() {
 
 	@Test
 	public void testGetIncludeStatusIncludeOwner() {
-		_queryDefinition.setStatus(WorkflowConstants.STATUS_APPROVED);
-		_queryDefinition.setOwnerUserId(_USER_ID);
 		_queryDefinition.setIncludeOwner(true);
+		_queryDefinition.setOwnerUserId(_USER_ID);
+		_queryDefinition.setStatus(WorkflowConstants.STATUS_APPROVED);
 
 		testSQL("((userId = ? AND status != ?)  OR  status = ?) ");
 	}
 
 	@Test
 	public void testGetIncludeStatusNotIncludeOwner() {
-		_queryDefinition.setStatus(WorkflowConstants.STATUS_APPROVED);
-		_queryDefinition.setOwnerUserId(_USER_ID);
 		_queryDefinition.setIncludeOwner(false);
+		_queryDefinition.setOwnerUserId(_USER_ID);
+		_queryDefinition.setStatus(WorkflowConstants.STATUS_APPROVED);
 
 		testSQL("(userId = ?  AND  status = ?) ");
 	}
 
 	@Test
 	public void testGetNotIncludeOwner() {
-		_queryDefinition.setOwnerUserId(_USER_ID);
 		_queryDefinition.setIncludeOwner(false);
+		_queryDefinition.setOwnerUserId(_USER_ID);
 
 		testSQL("(userId = ?  AND  -1 = ?) ");
 	}
 
 	@Test
 	public void testGetTableName() {
-		_queryDefinition.setStatus(WorkflowConstants.STATUS_APPROVED);
-		_queryDefinition.setOwnerUserId(_USER_ID);
 		_queryDefinition.setIncludeOwner(true);
+		_queryDefinition.setOwnerUserId(_USER_ID);
+		_queryDefinition.setStatus(WorkflowConstants.STATUS_APPROVED);
 
 		String expected =
 			"((TestModel.userId = ? AND TestModel.status != ?)  OR  " +
@@ -282,7 +281,7 @@ protected void testSQL(String expected) {
 	private static Props _props;
 
 	private CustomSQL _customSQL;
-	private QueryDefinition<Object> _queryDefinition;
+	private QueryDefinition<Object> _queryDefinition = new QueryDefinition<>();
 
 	private class TestCustomSQL extends CustomSQL {