From 9d1a469ae5f0a3751b64d66582fbcc2180a9c97c Mon Sep 17 00:00:00 2001
From: ramamurtis <ramamurti.subramanian@citrix.com>
Date: Wed, 4 Nov 2015 10:31:02 +0530
Subject: [PATCH] CLOUDSTACK-9006 - ListTemplates API returns result in
 inconsistent order when called concurrently

Adding filter test to verify addOrderBy method.
---
 .../test/com/cloud/utils/db/FilterTest.java   | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 framework/db/test/com/cloud/utils/db/FilterTest.java

diff --git a/framework/db/test/com/cloud/utils/db/FilterTest.java b/framework/db/test/com/cloud/utils/db/FilterTest.java
new file mode 100644
index 00000000000..079611ab69f
--- /dev/null
+++ b/framework/db/test/com/cloud/utils/db/FilterTest.java
@@ -0,0 +1,44 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// the License.  You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.utils.db;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class FilterTest {
+
+    @Test
+    /*
+    *  This test verifies that the Order By clause generated by the filter is correct and it separates each
+    *  order by field with a comma. Using DbTestVO to assert it
+    */
+    public void testAddOrderBy() {
+        Filter filter = new Filter(DbTestVO.class, "fieldString", true, 1L, 1L);
+
+        Assert.assertTrue(filter.getOrderBy().trim().toLowerCase().equals("order by test.fld_string asc"));
+
+        filter.addOrderBy(DbTestVO.class, "fieldLong", true);
+
+        Assert.assertTrue(filter.getOrderBy().contains(","));
+        Assert.assertTrue(filter.getOrderBy().split(",")[1].trim().toLowerCase().equals("test.fld_long asc"));
+
+        filter.addOrderBy(DbTestVO.class, "fieldInt", true);
+
+        Assert.assertTrue(filter.getOrderBy().split(",").length == 3);
+        Assert.assertTrue(filter.getOrderBy().split(",")[2].trim().toLowerCase().equals("test.fld_int asc"));
+    }
+}