From 601342b333c4da7706b5fe7252a7b87a956c2212 Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Fri, 18 Sep 2020 10:40:02 +0800
Subject: [PATCH] [TD-1245]<test> add test case for interval

---
 tests/pytest/fulltest.sh            |  3 ++-
 tests/pytest/query/queryInterval.py | 19 +++++++++++++++----
 tests/pytest/util/sql.py            |  4 ++--
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh
index c74fb33c3b..b92a7319de 100755
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
@@ -187,7 +187,8 @@ python3 ./test.py -f functions/function_top.py
 #python3 ./test.py -f functions/function_twa.py
 python3 queryCount.py
 python3 ./test.py -f query/queryGroupbyWithInterval.py
-python3 client/twoClients.py 
+python3 client/twoClients.python3
+python3 test.py -f query/queryInterval.py
 
 # tools
 python3 test.py -f tools/taosdemo.py
diff --git a/tests/pytest/query/queryInterval.py b/tests/pytest/query/queryInterval.py
index 45f6988bbe..db2c3fdeec 100644
--- a/tests/pytest/query/queryInterval.py
+++ b/tests/pytest/query/queryInterval.py
@@ -29,18 +29,29 @@ class TDTestCase:
         tdSql.prepare()
 
         tdSql.execute("create table st (ts timestamp, voltage int) tags (loc nchar(30))")
-        tdSql.execute("insert into t0 using st tags('beijing') values(now, 220) (now - 15d, 221) (now - 30d, 225) (now - 35d, 228) (now - 45d, 222)" )
+        tdSql.execute("insert into t0 using st tags('beijing') values(now, 220) (now - 15d, 221) (now - 30d, 225) (now - 35d, 228) (now - 45d, 222)")
+        tdSql.execute("insert into t1 using st tags('shanghai') values(now, 220) (now - 60d, 221) (now - 50d, 225) (now - 40d, 228) (now - 20d, 222)")
 
         tdSql.query("select avg(voltage) from st interval(1n)")
-        tdSql.checkRows(2)
-        tdSql.checkData(0, 1, 225.0)
-        tdSql.checkData(1, 1, 220.5)
+        tdSql.checkRows(3)
+        tdSql.checkData(0, 1, 223.0)
+        tdSql.checkData(1, 1, 225.0)
+        tdSql.checkData(2, 1, 220.333333)
         
         tdSql.query("select avg(voltage) from st interval(1n, 15d)")
         tdSql.checkRows(3)
+        tdSql.checkData(0, 1, 224.8)
+        tdSql.checkData(1, 1, 222.666666)
+        tdSql.checkData(2, 1, 220.0)
+
+        tdSql.query("select avg(voltage) from st interval(1n, 15d) group by loc")
+        tdSql.checkRows(6)
         tdSql.checkData(0, 1, 225.0)
         tdSql.checkData(1, 1, 223.0)
         tdSql.checkData(2, 1, 220.0)
+        tdSql.checkData(3, 1, 224.666666)
+        tdSql.checkData(4, 1, 222.0)
+        tdSql.checkData(5, 1, 220.0)
 
     def stop(self):
         tdSql.close()
diff --git a/tests/pytest/util/sql.py b/tests/pytest/util/sql.py
index 7de8efdfe9..9abec354c6 100644
--- a/tests/pytest/util/sql.py
+++ b/tests/pytest/util/sql.py
@@ -123,8 +123,8 @@ class TDSql:
 
     def checkData(self, row, col, data):
         self.checkRowCol(row, col) 
-        if self.queryResult[row][col] != data:
-            if str(self.queryResult[row][col]) != str(data):
+        if self.queryResult[row][col] != data:            
+            if str(self.queryResult[row][col]) == str(data):
                 tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" %
                             (self.sql, row, col, self.queryResult[row][col], data)) 
                 return
-- 
GitLab