From 91799b516837aae811ad663f68147afce63b9582 Mon Sep 17 00:00:00 2001
From: Mirco <mirco.nasuti@chuv.ch>
Date: Mon, 9 Oct 2017 22:47:03 +0200
Subject: [PATCH] fix tests
---
tests/test-run.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/test-run.sh b/tests/test-run.sh
index b14c8f91a..53a65866c 100755
--- a/tests/test-run.sh
+++ b/tests/test-run.sh
@@ -11,14 +11,14 @@ STATS_REF='{"users":1,"articles":0,"variables":3}'
VARIABLES_HIERARCHY_REF='{"code":"root","groups":[{"code":"tg1","label":"Test Group 1","groups":[{"code":"tg3","label":"Test Group 3","variables":[{"code":"tv1","label":"Test Variable 1","type":"text"}]}]},{"code":"tg2","label":"Test Group 2","groups":[{"code":"tg4","label":"Test Group 4","variables":[{"code":"tv2","label":"Test Variable 2","type":"integer"},{"code":"tv3","label":"Test Variable 3","type":"real"}]}]}]}'
-REQUEST_BODY='{"variables":[{"code":"tv1"}],"groupings":[],"coVariables":[{"code":"tv2"},{"code":"tv3"}],"filters":[]}'
-REQUEST_REF='{"code":"DS1476796378611","date":1.476796378611E12,"variable":["tv1"],"grouping":[],"header":["tv2","tv3"],"filter":[],"data":{"tv1":["val676 ","val677 ","val678 ","val679 ","val680 ","val681 ","val682 ","val683 ","val684 ","val685 ","val686 ","val687 ","val688 ","val689 ","val690 ","val691 ","val692 ","val693 ","val694 ","val695 ","val696 ","val697 ","val698 ","val699 ","val700 ","val701 ","val702 ","val784 ","val785 ","val786 ","val787 ","val788 ","val789 ","val790 ","val791 ","val792 ","val793 ","val794 ","val795 ","val796 ","val797 ","val798 ","val799 ","val800 ","val801 ","val802 ","val803 ","val804 ","val805 ","val806 ","val807 ","val808 ","val809 ","val810 ","val1081 ","val1082 ","val1083 ","val1084 ","val1085 ","val1086 ","val1087 ","val1088 ","val1089 ","val1090 ","val1091 ","val1092 ","val1093 ","val1094 ","val1095 ","val1096 ","val1097 ","val1098 ","val1099 ","val1100 ","val1101 ","val1102 ","val1103 ","val1104 ","val1105 ","val1106 ","val1107 ","val1162 ","val1163 ","val1164 ","val1165 ","val1166 ","val1167 ","val1168 ","val1169 ","val1170 ","val1171 ","val1172 ","val1173 ","val1174 ","val1175 ","val1176 ","val1177 ","val1178 ","val1179 ","val1180 ","val1181 ","val1182 ","val1183 ","val1184 ","val1185 ","val1186 ","val1187 ","val1188 ","val1189 ","val1190 ","val1191 ","val1192 ","val1193 ","val1194 ","val1195 ","val1196 ","val1197 ","val1198 ","val1199 ","val1200 ","val1201 ","val1202 ","val1203 ","val1204 ","val1205 ","val1206 ","val1207 ","val1208 ","val1209 ","val1210 ","val1211 ","val1212 ","val1213 ","val1214 ","val1215 ","val1567 ","val1568 ","val1569 ","val1570 ","val1571 ","val1572 ","val1573 ","val1574 ","val1575 ","val1576 ","val1577 ","val1578 ","val1579 ","val1580 ","val1581 ","val1582 ","val1583 ","val1584 ","val1585 ","val1586 ","val1587 ","val1588 ","val1589 ","val1590 ","val1591 ","val1592 ","val1593 ","val1702 ","val1703 ","val1704 ","val1705 ","val1706 ","val1707 ","val1708 ","val1709 ","val1710 ","val1711 ","val1712 ","val1713 ","val1714 ","val1715 ","val1716 ","val1717 ","val1718 ","val1719 ","val1720 ","val1721 ","val1722 ","val1723 ","val1724 ","val1725 ","val1726 ","val1727 ","val1728 ","val1837 ","val1838 ","val1839 ","val1840 ","val1841 ","val1842 ","val1843 ","val1844 ","val1845 ","val1846 ","val1847 ","val1848 ","val1849 ","val1850 ","val1851 ","val1852 ","val1853 ","val1854 ","val1855 ","val1856 ","val1857 ","val1858 ","val1859 ","val1860 ","val1861 ","val1862 ","val1863 "],"tv2":[676.0,677.0,678.0,679.0,680.0,681.0,682.0,683.0,684.0,685.0,686.0,687.0,688.0,689.0,690.0,691.0,692.0,693.0,694.0,695.0,696.0,697.0,698.0,699.0,700.0,701.0,702.0,784.0,785.0,786.0,787.0,788.0,789.0,790.0,791.0,792.0,793.0,794.0,795.0,796.0,797.0,798.0,799.0,800.0,801.0,802.0,803.0,804.0,805.0,806.0,807.0,808.0,809.0,810.0,1081.0,1082.0,1083.0,1084.0,1085.0,1086.0,1087.0,1088.0,1089.0,1090.0,1091.0,1092.0,1093.0,1094.0,1095.0,1096.0,1097.0,1098.0,1099.0,1100.0,1101.0,1102.0,1103.0,1104.0,1105.0,1106.0,1107.0,1162.0,1163.0,1164.0,1165.0,1166.0,1167.0,1168.0,1169.0,1170.0,1171.0,1172.0,1173.0,1174.0,1175.0,1176.0,1177.0,1178.0,1179.0,1180.0,1181.0,1182.0,1183.0,1184.0,1185.0,1186.0,1187.0,1188.0,1189.0,1190.0,1191.0,1192.0,1193.0,1194.0,1195.0,1196.0,1197.0,1198.0,1199.0,1200.0,1201.0,1202.0,1203.0,1204.0,1205.0,1206.0,1207.0,1208.0,1209.0,1210.0,1211.0,1212.0,1213.0,1214.0,1215.0,1567.0,1568.0,1569.0,1570.0,1571.0,1572.0,1573.0,1574.0,1575.0,1576.0,1577.0,1578.0,1579.0,1580.0,1581.0,1582.0,1583.0,1584.0,1585.0,1586.0,1587.0,1588.0,1589.0,1590.0,1591.0,1592.0,1593.0,1702.0,1703.0,1704.0,1705.0,1706.0,1707.0,1708.0,1709.0,1710.0,1711.0,1712.0,1713.0,1714.0,1715.0,1716.0,1717.0,1718.0,1719.0,1720.0,1721.0,1722.0,1723.0,1724.0,1725.0,1726.0,1727.0,1728.0,1837.0,1838.0,1839.0,1840.0,1841.0,1842.0,1843.0,1844.0,1845.0,1846.0,1847.0,1848.0,1849.0,1850.0,1851.0,1852.0,1853.0,1854.0,1855.0,1856.0,1857.0,1858.0,1859.0,1860.0,1861.0,1862.0,1863.0],"tv3":[67.6,67.7,67.8,67.9,68.0,68.1,68.2,68.3,68.4,68.5,68.6,68.7,68.8,68.9,69.0,69.1,69.2,69.3,69.4,69.5,69.6,69.7,69.8,69.9,70.0,70.1,70.2,78.4,78.5,78.6,78.7,78.8,78.9,79.0,79.1,79.2,79.3,79.4,79.5,79.6,79.7,79.8,79.9,80.0,80.1,80.2,80.3,80.4,80.5,80.6,80.7,80.8,80.9,81.0,108.1,108.2,108.3,108.4,108.5,108.6,108.7,108.8,108.9,109.0,109.1,109.2,109.3,109.4,109.5,109.6,109.7,109.8,109.9,110.0,110.1,110.2,110.3,110.4,110.5,110.6,110.7,116.2,116.3,116.4,116.5,116.6,116.7,116.8,116.9,117.0,117.1,117.2,117.3,117.4,117.5,117.6,117.7,117.8,117.9,118.0,118.1,118.2,118.3,118.4,118.5,118.6,118.7,118.8,118.9,119.0,119.1,119.2,119.3,119.4,119.5,119.6,119.7,119.8,119.9,120.0,120.1,120.2,120.3,120.4,120.5,120.6,120.7,120.8,120.9,121.0,121.1,121.2,121.3,121.4,121.5,156.7,156.8,156.9,157.0,157.1,157.2,157.3,157.4,157.5,157.6,157.7,157.8,157.9,158.0,158.1,158.2,158.3,158.4,158.5,158.6,158.7,158.8,158.9,159.0,159.1,159.2,159.3,170.2,170.3,170.4,170.5,170.6,170.7,170.8,170.9,171.0,171.1,171.2,171.3,171.4,171.5,171.6,171.7,171.8,171.9,172.0,172.1,172.2,172.3,172.4,172.5,172.6,172.7,172.8,183.7,183.8,183.9,184.0,184.1,184.2,184.3,184.4,184.5,184.6,184.7,184.8,184.9,185.0,185.1,185.2,185.3,185.4,185.5,185.6,185.7,185.8,185.9,186.0,186.1,186.2,186.3]}}'
+REQUEST_BODY='{"variables":[{"code":"tv1"}],"groupings":[],"coVariables":[{"code":"tv2"},{"code":"tv3"}],"filters":""}'
+REQUEST_REF='{"code":"DS1507582826852","date":1.507582826852E12,"variable":["tv1"],"grouping":[],"header":["tv2","tv3"],"data":{"tv1":["val1268","val459","val749","val1191","val394","val1980","val1446","val506","val1814","val358","val481","val1775","val621","val1610","val403","val1882","val379","val1979","val1521","val1894","val1053","val825","val14","val1395","val672","val952","val1508","val988","val237","val1950","val716","val1344","val418","val1916","val1367","val1381","val165","val871","val1488","val841","val142","val1725","val1604","val1013","val1796","val873","val1333","val126","val1185","val1254","val1074","val1747","val526","val533","val1436","val1400","val875","val1291","val974","val1398","val243","val869","val1540","val221","val1778","val1900","val442","val516","val532","val1252","val160","val1057","val1419","val1213","val1236","val301","val1260","val1189","val302","val1420","val1970","val831","val313","val1275","val648","val735","val901","val1823","val1082","val1996","val687","val1816","val556","val1345","val1693","val972","val1627","val141","val774","val1286","val806","val767","val772","val1837","val290","val1461","val860","val132","val872","val934","val576","val1411","val1302","val642","val350","val15","val1296","val1299","val1475","val1978","val1474","val1901","val554","val1182","val1025","val1779","val262","val916","val257","val566","val1477","val102","val1216","val426","val984","val1162","val315","val1547","val496","val22","val573","val130","val1437","val1479","val904","val815","val1056","val54","val1772","val925","val1466","val824","val1981","val1940","val487","val490","val1063","val1541","val417","val1415","val723","val1877","val1598","val623","val1875","val1472","val55","val1780","val1184","val1802","val663","val103","val228","val1822","val498","val557","val312","val1425","val1848","val1337","val1591","val1207","val330","val968","val1359","val1341","val36","val18","val1548","val80","val163","val1899","val27","val530","val1716","val398","val361","val253","val1821","val483"],"tv2":[1268.0,459.0,749.0,1191.0,394.0,1980.0,1446.0,506.0,1814.0,358.0,481.0,1775.0,621.0,1610.0,403.0,1882.0,379.0,1979.0,1521.0,1894.0,1053.0,825.0,14.0,1395.0,672.0,952.0,1508.0,988.0,237.0,1950.0,716.0,1344.0,418.0,1916.0,1367.0,1381.0,165.0,871.0,1488.0,841.0,142.0,1725.0,1604.0,1013.0,1796.0,873.0,1333.0,126.0,1185.0,1254.0,1074.0,1747.0,526.0,533.0,1436.0,1400.0,875.0,1291.0,974.0,1398.0,243.0,869.0,1540.0,221.0,1778.0,1900.0,442.0,516.0,532.0,1252.0,160.0,1057.0,1419.0,1213.0,1236.0,301.0,1260.0,1189.0,302.0,1420.0,1970.0,831.0,313.0,1275.0,648.0,735.0,901.0,1823.0,1082.0,1996.0,687.0,1816.0,556.0,1345.0,1693.0,972.0,1627.0,141.0,774.0,1286.0,806.0,767.0,772.0,1837.0,290.0,1461.0,860.0,132.0,872.0,934.0,576.0,1411.0,1302.0,642.0,350.0,15.0,1296.0,1299.0,1475.0,1978.0,1474.0,1901.0,554.0,1182.0,1025.0,1779.0,262.0,916.0,257.0,566.0,1477.0,102.0,1216.0,426.0,984.0,1162.0,315.0,1547.0,496.0,22.0,573.0,130.0,1437.0,1479.0,904.0,815.0,1056.0,54.0,1772.0,925.0,1466.0,824.0,1981.0,1940.0,487.0,490.0,1063.0,1541.0,417.0,1415.0,723.0,1877.0,1598.0,623.0,1875.0,1472.0,55.0,1780.0,1184.0,1802.0,663.0,103.0,228.0,1822.0,498.0,557.0,312.0,1425.0,1848.0,1337.0,1591.0,1207.0,330.0,968.0,1359.0,1341.0,36.0,18.0,1548.0,80.0,163.0,1899.0,27.0,530.0,1716.0,398.0,361.0,253.0,1821.0,483.0],"tv3":[126.8,45.9,74.9,119.1,39.4,198.0,144.6,50.6,181.4,35.8,48.1,177.5,62.1,161.0,40.3,188.2,37.9,197.9,152.1,189.4,105.3,82.5,1.4,139.5,67.2,95.2,150.8,98.8,23.7,195.0,71.6,134.4,41.8,191.6,136.7,138.1,16.5,87.1,148.8,84.1,14.2,172.5,160.4,101.3,179.6,87.3,133.3,12.6,118.5,125.4,107.4,174.7,52.6,53.3,143.6,140.0,87.5,129.1,97.4,139.8,24.3,86.9,154.0,22.1,177.8,190.0,44.2,51.6,53.2,125.2,16.0,105.7,141.9,121.3,123.6,30.1,126.0,118.9,30.2,142.0,197.0,83.1,31.3,127.5,64.8,73.5,90.1,182.3,108.2,199.6,68.7,181.6,55.6,134.5,169.3,97.2,162.7,14.1,77.4,128.6,80.6,76.7,77.2,183.7,29.0,146.1,86.0,13.2,87.2,93.4,57.6,141.1,130.2,64.2,35.0,1.5,129.6,129.9,147.5,197.8,147.4,190.1,55.4,118.2,102.5,177.9,26.2,91.6,25.7,56.6,147.7,10.2,121.6,42.6,98.4,116.2,31.5,154.7,49.6,2.2,57.3,13.0,143.7,147.9,90.4,81.5,105.6,5.4,177.2,92.5,146.6,82.4,198.1,194.0,48.7,49.0,106.3,154.1,41.7,141.5,72.3,187.7,159.8,62.3,187.5,147.2,5.5,178.0,118.4,180.2,66.3,10.3,22.8,182.2,49.8,55.7,31.2,142.5,184.8,133.7,159.1,120.7,33.0,96.8,135.9,134.1,3.6,1.8,154.8,8.0,16.3,189.9,2.7,53.0,171.6,39.8,36.1,25.3,182.1,48.3]}}'
ARTICLE_BODY='{"status":"closed","content":"test","title":"Test","abstract":"test"}'
ARTICLE_REF='[{"slug":"test","title":"Test","status":"closed","content":"test","createdAt":1474035349482,"createdBy":{"username":"anonymous","fullname":"anonymous","picture":"images/users/default_user.png","languages":[],"roles":[],"votedApps":[]},"tags":[],"abstract":"test"}]'
-MODEL_BODY='{"slug":"test","title":"Test","valid":false,"createdAt":1474362803284,"query":{"variables":[{"code":"tv1"}],"filters":[],"coVariables":[{"code":"tv2"},{"code":"tv3"}],"groupings":[]},"dataset":{"code":"XXXX","date":1234567,"header":["tv2","tv3"],"grouping":[],"variable":["tv1"]},"config":{"type":"line","height":480,"yAxisVariables":["tv2","tv3"],"xAxisVariable":null,"hasXAxis":true,"title":{"text":"Test"}},"createdBy":{"username":"anonymous","fullname":"anonymous","picture":"images/users/default_user.png","languages":[],"roles":[],"votedApps":[]}}'
-MODEL_REF='[{"slug":"test","title":"Test","valid":false,"createdAt":1476796709000,"query":{"variables":[{"code":"tv1"}],"coVariables":[{"code":"tv2"},{"code":"tv3"}],"groupings":[],"filter":[]},"dataset":{"code":"XXXX","date":1234000,"header":["tv2","tv3"],"grouping":[],"variable":["tv1"],"data":{"tv1":["val676 ","val677 ","val678 ","val679 ","val680 ","val681 ","val682 ","val683 ","val684 ","val685 ","val686 ","val687 ","val688 ","val689 ","val690 ","val691 ","val692 ","val693 ","val694 ","val695 ","val696 ","val697 ","val698 ","val699 ","val700 ","val701 ","val702 ","val784 ","val785 ","val786 ","val787 ","val788 ","val789 ","val790 ","val791 ","val792 ","val793 ","val794 ","val795 ","val796 ","val797 ","val798 ","val799 ","val800 ","val801 ","val802 ","val803 ","val804 ","val805 ","val806 ","val807 ","val808 ","val809 ","val810 ","val1081 ","val1082 ","val1083 ","val1084 ","val1085 ","val1086 ","val1087 ","val1088 ","val1089 ","val1090 ","val1091 ","val1092 ","val1093 ","val1094 ","val1095 ","val1096 ","val1097 ","val1098 ","val1099 ","val1100 ","val1101 ","val1102 ","val1103 ","val1104 ","val1105 ","val1106 ","val1107 ","val1162 ","val1163 ","val1164 ","val1165 ","val1166 ","val1167 ","val1168 ","val1169 ","val1170 ","val1171 ","val1172 ","val1173 ","val1174 ","val1175 ","val1176 ","val1177 ","val1178 ","val1179 ","val1180 ","val1181 ","val1182 ","val1183 ","val1184 ","val1185 ","val1186 ","val1187 ","val1188 ","val1189 ","val1190 ","val1191 ","val1192 ","val1193 ","val1194 ","val1195 ","val1196 ","val1197 ","val1198 ","val1199 ","val1200 ","val1201 ","val1202 ","val1203 ","val1204 ","val1205 ","val1206 ","val1207 ","val1208 ","val1209 ","val1210 ","val1211 ","val1212 ","val1213 ","val1214 ","val1215 ","val1567 ","val1568 ","val1569 ","val1570 ","val1571 ","val1572 ","val1573 ","val1574 ","val1575 ","val1576 ","val1577 ","val1578 ","val1579 ","val1580 ","val1581 ","val1582 ","val1583 ","val1584 ","val1585 ","val1586 ","val1587 ","val1588 ","val1589 ","val1590 ","val1591 ","val1592 ","val1593 ","val1702 ","val1703 ","val1704 ","val1705 ","val1706 ","val1707 ","val1708 ","val1709 ","val1710 ","val1711 ","val1712 ","val1713 ","val1714 ","val1715 ","val1716 ","val1717 ","val1718 ","val1719 ","val1720 ","val1721 ","val1722 ","val1723 ","val1724 ","val1725 ","val1726 ","val1727 ","val1728 ","val1837 ","val1838 ","val1839 ","val1840 ","val1841 ","val1842 ","val1843 ","val1844 ","val1845 ","val1846 ","val1847 ","val1848 ","val1849 ","val1850 ","val1851 ","val1852 ","val1853 ","val1854 ","val1855 ","val1856 ","val1857 ","val1858 ","val1859 ","val1860 ","val1861 ","val1862 ","val1863 "],"tv2":[676.0,677.0,678.0,679.0,680.0,681.0,682.0,683.0,684.0,685.0,686.0,687.0,688.0,689.0,690.0,691.0,692.0,693.0,694.0,695.0,696.0,697.0,698.0,699.0,700.0,701.0,702.0,784.0,785.0,786.0,787.0,788.0,789.0,790.0,791.0,792.0,793.0,794.0,795.0,796.0,797.0,798.0,799.0,800.0,801.0,802.0,803.0,804.0,805.0,806.0,807.0,808.0,809.0,810.0,1081.0,1082.0,1083.0,1084.0,1085.0,1086.0,1087.0,1088.0,1089.0,1090.0,1091.0,1092.0,1093.0,1094.0,1095.0,1096.0,1097.0,1098.0,1099.0,1100.0,1101.0,1102.0,1103.0,1104.0,1105.0,1106.0,1107.0,1162.0,1163.0,1164.0,1165.0,1166.0,1167.0,1168.0,1169.0,1170.0,1171.0,1172.0,1173.0,1174.0,1175.0,1176.0,1177.0,1178.0,1179.0,1180.0,1181.0,1182.0,1183.0,1184.0,1185.0,1186.0,1187.0,1188.0,1189.0,1190.0,1191.0,1192.0,1193.0,1194.0,1195.0,1196.0,1197.0,1198.0,1199.0,1200.0,1201.0,1202.0,1203.0,1204.0,1205.0,1206.0,1207.0,1208.0,1209.0,1210.0,1211.0,1212.0,1213.0,1214.0,1215.0,1567.0,1568.0,1569.0,1570.0,1571.0,1572.0,1573.0,1574.0,1575.0,1576.0,1577.0,1578.0,1579.0,1580.0,1581.0,1582.0,1583.0,1584.0,1585.0,1586.0,1587.0,1588.0,1589.0,1590.0,1591.0,1592.0,1593.0,1702.0,1703.0,1704.0,1705.0,1706.0,1707.0,1708.0,1709.0,1710.0,1711.0,1712.0,1713.0,1714.0,1715.0,1716.0,1717.0,1718.0,1719.0,1720.0,1721.0,1722.0,1723.0,1724.0,1725.0,1726.0,1727.0,1728.0,1837.0,1838.0,1839.0,1840.0,1841.0,1842.0,1843.0,1844.0,1845.0,1846.0,1847.0,1848.0,1849.0,1850.0,1851.0,1852.0,1853.0,1854.0,1855.0,1856.0,1857.0,1858.0,1859.0,1860.0,1861.0,1862.0,1863.0],"tv3":[67.6,67.7,67.8,67.9,68.0,68.1,68.2,68.3,68.4,68.5,68.6,68.7,68.8,68.9,69.0,69.1,69.2,69.3,69.4,69.5,69.6,69.7,69.8,69.9,70.0,70.1,70.2,78.4,78.5,78.6,78.7,78.8,78.9,79.0,79.1,79.2,79.3,79.4,79.5,79.6,79.7,79.8,79.9,80.0,80.1,80.2,80.3,80.4,80.5,80.6,80.7,80.8,80.9,81.0,108.1,108.2,108.3,108.4,108.5,108.6,108.7,108.8,108.9,109.0,109.1,109.2,109.3,109.4,109.5,109.6,109.7,109.8,109.9,110.0,110.1,110.2,110.3,110.4,110.5,110.6,110.7,116.2,116.3,116.4,116.5,116.6,116.7,116.8,116.9,117.0,117.1,117.2,117.3,117.4,117.5,117.6,117.7,117.8,117.9,118.0,118.1,118.2,118.3,118.4,118.5,118.6,118.7,118.8,118.9,119.0,119.1,119.2,119.3,119.4,119.5,119.6,119.7,119.8,119.9,120.0,120.1,120.2,120.3,120.4,120.5,120.6,120.7,120.8,120.9,121.0,121.1,121.2,121.3,121.4,121.5,156.7,156.8,156.9,157.0,157.1,157.2,157.3,157.4,157.5,157.6,157.7,157.8,157.9,158.0,158.1,158.2,158.3,158.4,158.5,158.6,158.7,158.8,158.9,159.0,159.1,159.2,159.3,170.2,170.3,170.4,170.5,170.6,170.7,170.8,170.9,171.0,171.1,171.2,171.3,171.4,171.5,171.6,171.7,171.8,171.9,172.0,172.1,172.2,172.3,172.4,172.5,172.6,172.7,172.8,183.7,183.8,183.9,184.0,184.1,184.2,184.3,184.4,184.5,184.6,184.7,184.8,184.9,185.0,185.1,185.2,185.3,185.4,185.5,185.6,185.7,185.8,185.9,186.0,186.1,186.2,186.3]}},"config":{"type":"line","height":480,"yAxisVariables":["tv2","tv3"],"xAxisVariable":null,"hasXAxis":true,"title":{"text":"Test"}},"createdBy":{"username":"anonymous","fullname":"anonymous","picture":"images/users/default_user.png","languages":[],"roles":[],"votedApps":[]}}]'
+MODEL_BODY='{"slug":"test","title":"Test","valid":false,"createdAt":1474362803284,"query":{"variables":[{"code":"tv1"}],"filters":"","coVariables":[{"code":"tv2"},{"code":"tv3"}],"groupings":[]},"dataset":{"code":"XXXX","date":1234567,"header":["tv2","tv3"],"grouping":[],"variable":["tv1"]},"config":{"type":"line","height":480,"yAxisVariables":["tv2","tv3"],"xAxisVariable":null,"hasXAxis":true,"title":{"text":"Test"}},"createdBy":{"username":"anonymous","fullname":"anonymous","picture":"images/users/default_user.png","languages":[],"roles":[],"votedApps":[]}}'
+MODEL_REF='[{"slug":"test","title":"Test","valid":false,"createdAt":1507583225000,"query":{"variables":[{"code":"tv1"}],"filters":"","coVariables":[{"code":"tv2"},{"code":"tv3"}],"groupings":[]},"dataset":{"code":"XXXX","date":1234000,"header":["tv2","tv3"],"grouping":[],"variable":["tv1"],"data":{"tv1":["val1268","val459","val749","val1191","val394","val1980","val1446","val506","val1814","val358","val481","val1775","val621","val1610","val403","val1882","val379","val1979","val1521","val1894","val1053","val825","val14","val1395","val672","val952","val1508","val988","val237","val1950","val716","val1344","val418","val1916","val1367","val1381","val165","val871","val1488","val841","val142","val1725","val1604","val1013","val1796","val873","val1333","val126","val1185","val1254","val1074","val1747","val526","val533","val1436","val1400","val875","val1291","val974","val1398","val243","val869","val1540","val221","val1778","val1900","val442","val516","val532","val1252","val160","val1057","val1419","val1213","val1236","val301","val1260","val1189","val302","val1420","val1970","val831","val313","val1275","val648","val735","val901","val1823","val1082","val1996","val687","val1816","val556","val1345","val1693","val972","val1627","val141","val774","val1286","val806","val767","val772","val1837","val290","val1461","val860","val132","val872","val934","val576","val1411","val1302","val642","val350","val15","val1296","val1299","val1475","val1978","val1474","val1901","val554","val1182","val1025","val1779","val262","val916","val257","val566","val1477","val102","val1216","val426","val984","val1162","val315","val1547","val496","val22","val573","val130","val1437","val1479","val904","val815","val1056","val54","val1772","val925","val1466","val824","val1981","val1940","val487","val490","val1063","val1541","val417","val1415","val723","val1877","val1598","val623","val1875","val1472","val55","val1780","val1184","val1802","val663","val103","val228","val1822","val498","val557","val312","val1425","val1848","val1337","val1591","val1207","val330","val968","val1359","val1341","val36","val18","val1548","val80","val163","val1899","val27","val530","val1716","val398","val361","val253","val1821","val483"],"tv2":[1268.0,459.0,749.0,1191.0,394.0,1980.0,1446.0,506.0,1814.0,358.0,481.0,1775.0,621.0,1610.0,403.0,1882.0,379.0,1979.0,1521.0,1894.0,1053.0,825.0,14.0,1395.0,672.0,952.0,1508.0,988.0,237.0,1950.0,716.0,1344.0,418.0,1916.0,1367.0,1381.0,165.0,871.0,1488.0,841.0,142.0,1725.0,1604.0,1013.0,1796.0,873.0,1333.0,126.0,1185.0,1254.0,1074.0,1747.0,526.0,533.0,1436.0,1400.0,875.0,1291.0,974.0,1398.0,243.0,869.0,1540.0,221.0,1778.0,1900.0,442.0,516.0,532.0,1252.0,160.0,1057.0,1419.0,1213.0,1236.0,301.0,1260.0,1189.0,302.0,1420.0,1970.0,831.0,313.0,1275.0,648.0,735.0,901.0,1823.0,1082.0,1996.0,687.0,1816.0,556.0,1345.0,1693.0,972.0,1627.0,141.0,774.0,1286.0,806.0,767.0,772.0,1837.0,290.0,1461.0,860.0,132.0,872.0,934.0,576.0,1411.0,1302.0,642.0,350.0,15.0,1296.0,1299.0,1475.0,1978.0,1474.0,1901.0,554.0,1182.0,1025.0,1779.0,262.0,916.0,257.0,566.0,1477.0,102.0,1216.0,426.0,984.0,1162.0,315.0,1547.0,496.0,22.0,573.0,130.0,1437.0,1479.0,904.0,815.0,1056.0,54.0,1772.0,925.0,1466.0,824.0,1981.0,1940.0,487.0,490.0,1063.0,1541.0,417.0,1415.0,723.0,1877.0,1598.0,623.0,1875.0,1472.0,55.0,1780.0,1184.0,1802.0,663.0,103.0,228.0,1822.0,498.0,557.0,312.0,1425.0,1848.0,1337.0,1591.0,1207.0,330.0,968.0,1359.0,1341.0,36.0,18.0,1548.0,80.0,163.0,1899.0,27.0,530.0,1716.0,398.0,361.0,253.0,1821.0,483.0],"tv3":[126.8,45.9,74.9,119.1,39.4,198.0,144.6,50.6,181.4,35.8,48.1,177.5,62.1,161.0,40.3,188.2,37.9,197.9,152.1,189.4,105.3,82.5,1.4,139.5,67.2,95.2,150.8,98.8,23.7,195.0,71.6,134.4,41.8,191.6,136.7,138.1,16.5,87.1,148.8,84.1,14.2,172.5,160.4,101.3,179.6,87.3,133.3,12.6,118.5,125.4,107.4,174.7,52.6,53.3,143.6,140.0,87.5,129.1,97.4,139.8,24.3,86.9,154.0,22.1,177.8,190.0,44.2,51.6,53.2,125.2,16.0,105.7,141.9,121.3,123.6,30.1,126.0,118.9,30.2,142.0,197.0,83.1,31.3,127.5,64.8,73.5,90.1,182.3,108.2,199.6,68.7,181.6,55.6,134.5,169.3,97.2,162.7,14.1,77.4,128.6,80.6,76.7,77.2,183.7,29.0,146.1,86.0,13.2,87.2,93.4,57.6,141.1,130.2,64.2,35.0,1.5,129.6,129.9,147.5,197.8,147.4,190.1,55.4,118.2,102.5,177.9,26.2,91.6,25.7,56.6,147.7,10.2,121.6,42.6,98.4,116.2,31.5,154.7,49.6,2.2,57.3,13.0,143.7,147.9,90.4,81.5,105.6,5.4,177.2,92.5,146.6,82.4,198.1,194.0,48.7,49.0,106.3,154.1,41.7,141.5,72.3,187.7,159.8,62.3,187.5,147.2,5.5,178.0,118.4,180.2,66.3,10.3,22.8,182.2,49.8,55.7,31.2,142.5,184.8,133.7,159.1,120.7,33.0,96.8,135.9,134.1,3.6,1.8,154.8,8.0,16.3,189.9,2.7,53.0,171.6,39.8,36.1,25.3,182.1,48.3]}},"config":{"type":"line","height":480,"yAxisVariables":["tv2","tv3"],"xAxisVariable":null,"hasXAxis":true,"title":{"text":"Test"}},"createdBy":{"username":"anonymous","fullname":"anonymous","picture":"images/users/default_user.png","languages":[],"roles":[],"votedApps":[]}}]'
# Get gateway IP
@@ -64,7 +64,7 @@ fi
# Test - POST requests
echo "Testing requests API..."
-response=$(curl -s -H "Content-Type: application/json" -X POST -d ${REQUEST_BODY} ${GATEWAY_IP}:65440/services/queries/requests)
+response=$(curl -s -H "Content-Type: application/json" -X POST -d ${REQUEST_BODY} ${GATEWAY_IP}:65440/services/queries/requests | sed "s/ \+//g")
if [ "${response:52}" != "${REQUEST_REF:52}" ]; then
echo "Tests failed - failed to post requests"
exit 1
@@ -87,7 +87,7 @@ fi
echo "Testing models API..."
curl -s -H "Content-Type: application/json" -X POST -d ${MODEL_BODY} ${GATEWAY_IP}:65440/services/models > /dev/null
-response=$(curl -s ${GATEWAY_IP}:65440/services/models | sed "s/\"createdAt\":[0-9]*,//g" | sed "s/\"date\":[0-9]*,//g")
+response=$(curl -s ${GATEWAY_IP}:65440/services/models | sed "s/\"createdAt\":[0-9]*,//g" | sed "s/\"date\":[0-9]*,//g" | sed "s/ \+//g")
response_ref=$(echo "${MODEL_REF}" | sed "s/\"createdAt\":[0-9]*,//g" | sed "s/\"date\":[0-9]*,//g")
if [ "${response}" != "${response_ref}" ]; then
echo "Tests failed - failed to save/load model"
--
GitLab