简柏林 / thingskit · Commits

Commit 1f6a5b7a2114b58492bcaeebe89160751939c8be

Authored by Igor Kulikov
1 parent dfcc5ec5

Fix timeseries tests

Inline Side-by-side
Showing 2 changed files with 18 additions and 15 deletions
@@ -24,7 +24,10 @@ import java.util.Arrays; @@ -24,7 +24,10 @@ import java.util.Arrays;
24 24
25 @RunWith(ClasspathSuite.class) 25 @RunWith(ClasspathSuite.class)
26 @ClassnameFilters({ 26 @ClassnameFilters({
27 - "org.thingsboard.server.dao.service.sql.*SqlTest" 27 + "org.thingsboard.server.dao.service.sql.*SqlTest",
  28 + "org.thingsboard.server.dao.service.attributes.sql.*SqlTest",
  29 + "org.thingsboard.server.dao.service.event.sql.*SqlTest",
  30 + "org.thingsboard.server.dao.service.timeseries.sql.*SqlTest"
28 }) 31 })
29 public class SqlDaoServiceTestSuite { 32 public class SqlDaoServiceTestSuite {
30 33
@@ -143,52 +143,52 @@ public abstract class BaseTimeseriesServiceTest extends AbstractServiceTest { @@ -143,52 +143,52 @@ public abstract class BaseTimeseriesServiceTest extends AbstractServiceTest {
143 public void testFindByQueryAscOrder() throws Exception { 143 public void testFindByQueryAscOrder() throws Exception {
144 DeviceId deviceId = new DeviceId(Uuids.timeBased()); 144 DeviceId deviceId = new DeviceId(Uuids.timeBased());
145 145
  146 + saveEntries(deviceId, TS - 3);
146 saveEntries(deviceId, TS - 2); 147 saveEntries(deviceId, TS - 2);
147 saveEntries(deviceId, TS - 1); 148 saveEntries(deviceId, TS - 1);
148 - saveEntries(deviceId, TS);  
149 149
150 List<ReadTsKvQuery> queries = new ArrayList<>(); 150 List<ReadTsKvQuery> queries = new ArrayList<>();
151 queries.add(new BaseReadTsKvQuery(STRING_KEY, TS - 3, TS, 0, 1000, Aggregation.NONE, "ASC")); 151 queries.add(new BaseReadTsKvQuery(STRING_KEY, TS - 3, TS, 0, 1000, Aggregation.NONE, "ASC"));
152 152
153 List<TsKvEntry> entries = tsService.findAll(tenantId, deviceId, queries).get(); 153 List<TsKvEntry> entries = tsService.findAll(tenantId, deviceId, queries).get();
154 Assert.assertEquals(3, entries.size()); 154 Assert.assertEquals(3, entries.size());
155 - Assert.assertEquals(toTsEntry(TS - 2, stringKvEntry), entries.get(0));  
156 - Assert.assertEquals(toTsEntry(TS - 1, stringKvEntry), entries.get(1));  
157 - Assert.assertEquals(toTsEntry(TS, stringKvEntry), entries.get(2)); 155 + Assert.assertEquals(toTsEntry(TS - 3, stringKvEntry), entries.get(0));
  156 + Assert.assertEquals(toTsEntry(TS - 2, stringKvEntry), entries.get(1));
  157 + Assert.assertEquals(toTsEntry(TS - 1, stringKvEntry), entries.get(2));
158 158
159 EntityView entityView = saveAndCreateEntityView(deviceId, Arrays.asList(STRING_KEY)); 159 EntityView entityView = saveAndCreateEntityView(deviceId, Arrays.asList(STRING_KEY));
160 160
161 entries = tsService.findAll(tenantId, entityView.getId(), queries).get(); 161 entries = tsService.findAll(tenantId, entityView.getId(), queries).get();
162 Assert.assertEquals(3, entries.size()); 162 Assert.assertEquals(3, entries.size());
163 - Assert.assertEquals(toTsEntry(TS - 2, stringKvEntry), entries.get(0));  
164 - Assert.assertEquals(toTsEntry(TS - 1, stringKvEntry), entries.get(1));  
165 - Assert.assertEquals(toTsEntry(TS, stringKvEntry), entries.get(2)); 163 + Assert.assertEquals(toTsEntry(TS - 3, stringKvEntry), entries.get(0));
  164 + Assert.assertEquals(toTsEntry(TS - 2, stringKvEntry), entries.get(1));
  165 + Assert.assertEquals(toTsEntry(TS - 1, stringKvEntry), entries.get(2));
166 } 166 }
167 167
168 @Test 168 @Test
169 public void testFindByQueryDescOrder() throws Exception { 169 public void testFindByQueryDescOrder() throws Exception {
170 DeviceId deviceId = new DeviceId(Uuids.timeBased()); 170 DeviceId deviceId = new DeviceId(Uuids.timeBased());
171 171
  172 + saveEntries(deviceId, TS - 3);
172 saveEntries(deviceId, TS - 2); 173 saveEntries(deviceId, TS - 2);
173 saveEntries(deviceId, TS - 1); 174 saveEntries(deviceId, TS - 1);
174 - saveEntries(deviceId, TS);  
175 175
176 List<ReadTsKvQuery> queries = new ArrayList<>(); 176 List<ReadTsKvQuery> queries = new ArrayList<>();
177 queries.add(new BaseReadTsKvQuery(STRING_KEY, TS - 3, TS, 0, 1000, Aggregation.NONE, "DESC")); 177 queries.add(new BaseReadTsKvQuery(STRING_KEY, TS - 3, TS, 0, 1000, Aggregation.NONE, "DESC"));
178 178
179 List<TsKvEntry> entries = tsService.findAll(tenantId, deviceId, queries).get(); 179 List<TsKvEntry> entries = tsService.findAll(tenantId, deviceId, queries).get();
180 Assert.assertEquals(3, entries.size()); 180 Assert.assertEquals(3, entries.size());
181 - Assert.assertEquals(toTsEntry(TS, stringKvEntry), entries.get(0));  
182 - Assert.assertEquals(toTsEntry(TS - 1, stringKvEntry), entries.get(1));  
183 - Assert.assertEquals(toTsEntry(TS - 2, stringKvEntry), entries.get(2)); 181 + Assert.assertEquals(toTsEntry(TS - 1, stringKvEntry), entries.get(0));
  182 + Assert.assertEquals(toTsEntry(TS - 2, stringKvEntry), entries.get(1));
  183 + Assert.assertEquals(toTsEntry(TS - 3, stringKvEntry), entries.get(2));
184 184
185 EntityView entityView = saveAndCreateEntityView(deviceId, Arrays.asList(STRING_KEY)); 185 EntityView entityView = saveAndCreateEntityView(deviceId, Arrays.asList(STRING_KEY));
186 186
187 entries = tsService.findAll(tenantId, entityView.getId(), queries).get(); 187 entries = tsService.findAll(tenantId, entityView.getId(), queries).get();
188 Assert.assertEquals(3, entries.size()); 188 Assert.assertEquals(3, entries.size());
189 - Assert.assertEquals(toTsEntry(TS, stringKvEntry), entries.get(0));  
190 - Assert.assertEquals(toTsEntry(TS - 1, stringKvEntry), entries.get(1));  
191 - Assert.assertEquals(toTsEntry(TS - 2, stringKvEntry), entries.get(2)); 189 + Assert.assertEquals(toTsEntry(TS - 1, stringKvEntry), entries.get(0));
  190 + Assert.assertEquals(toTsEntry(TS - 2, stringKvEntry), entries.get(1));
  191 + Assert.assertEquals(toTsEntry(TS - 3, stringKvEntry), entries.get(2));
192 } 192 }
193 193
194 @Test 194 @Test