Skip to content

Commit 4723766

Browse files
author
dave
committed
tests moved to IoAbstraction SimpleTest
1 parent adc4f6d commit 4723766

6 files changed

Lines changed: 132 additions & 203 deletions

File tree

‎tests/collectionTests/CircularBufferTest.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11

2-
#include <SimpleCollections.h>
32
#include <SCCircularBuffer.h>
4-
#include <AUnit.h>
3+
#include <testing/SimpleTest.h>
54
#include <IoLogging.h>
65

6+
using namespace SimpleTest;
7+
78
void putIntoBuffer(SCCircularBuffer& buffer, const char* data) {
89
while(*data) {
910
buffer.put(*data);

‎tests/collectionTests/SimpleCollectionsTest.cpp‎

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#include <SimpleCollections.h>
2-
#include <AUnit.h>
2+
#include <testing/SimpleTest.h>
33
#include <IoLogging.h>
44

5+
using namespace SimpleTest;
6+
57
class TestStorage {
68
private:
79
int testItem;
@@ -61,13 +63,13 @@ TestStorage storage10(10, 109);
6163

6264
test(testNearestLocationEdgeCases) {
6365
BtreeList<int, TestStorage> btreeList(5, GROW_NEVER);
64-
assertEqual((bsize_t)0, btreeList.nearestLocation(1));
66+
assertEquals((bsize_t)0, btreeList.nearestLocation(1));
6567

6668
assertTrue(btreeList.add(storage4));
6769
printArray(btreeList.items(), btreeList.count());
6870

69-
assertEqual((bsize_t)0, btreeList.nearestLocation(1));
70-
assertEqual((bsize_t)1, btreeList.nearestLocation(5));
71+
assertEquals((bsize_t)0, btreeList.nearestLocation(1));
72+
assertEquals((bsize_t)1, btreeList.nearestLocation(5));
7173
}
7274

7375
test(testAddingWithoutSortOrResize) {
@@ -88,11 +90,11 @@ test(testAddingWithoutSortOrResize) {
8890
assertTrue(btreeList.getByKey(5) != nullptr);
8991
assertTrue(btreeList.getByKey(6) == nullptr);
9092

91-
assertEqual(btreeList.getByKey(1)->getItem(), 100);
92-
assertEqual(btreeList.getByKey(2)->getItem(), 101);
93-
assertEqual(btreeList.getByKey(3)->getItem(), 102);
94-
assertEqual(btreeList.getByKey(4)->getItem(), 103);
95-
assertEqual(btreeList.getByKey(5)->getItem(), 104);
93+
assertEquals(btreeList.getByKey(1)->getItem(), 100);
94+
assertEquals(btreeList.getByKey(2)->getItem(), 101);
95+
assertEquals(btreeList.getByKey(3)->getItem(), 102);
96+
assertEquals(btreeList.getByKey(4)->getItem(), 103);
97+
assertEquals(btreeList.getByKey(5)->getItem(), 104);
9698
}
9799

98100
test(testAddingWithSortNoResize) {
@@ -114,20 +116,20 @@ test(testAddingWithSortNoResize) {
114116
assertTrue(btreeList.getByKey(6) == nullptr);
115117

116118
const TestStorage* allItems = btreeList.items();
117-
assertEqual(allItems[0].getKey(), 1);
118-
assertEqual(allItems[1].getKey(), 2);
119-
assertEqual(allItems[2].getKey(), 3);
120-
assertEqual(allItems[3].getKey(), 4);
121-
assertEqual(allItems[4].getKey(), 5);
122-
123-
assertEqual(allItems[0].getKey(), btreeList.itemAtIndex(0)->getKey());
124-
assertEqual(allItems[1].getKey(), btreeList.itemAtIndex(1)->getKey());
125-
126-
assertEqual(btreeList.getByKey(1)->getItem(), 100);
127-
assertEqual(btreeList.getByKey(2)->getItem(), 101);
128-
assertEqual(btreeList.getByKey(3)->getItem(), 102);
129-
assertEqual(btreeList.getByKey(4)->getItem(), 103);
130-
assertEqual(btreeList.getByKey(5)->getItem(), 104);
119+
assertEquals(allItems[0].getKey(), 1);
120+
assertEquals(allItems[1].getKey(), 2);
121+
assertEquals(allItems[2].getKey(), 3);
122+
assertEquals(allItems[3].getKey(), 4);
123+
assertEquals(allItems[4].getKey(), 5);
124+
125+
assertEquals(allItems[0].getKey(), btreeList.itemAtIndex(0)->getKey());
126+
assertEquals(allItems[1].getKey(), btreeList.itemAtIndex(1)->getKey());
127+
128+
assertEquals(btreeList.getByKey(1)->getItem(), 100);
129+
assertEquals(btreeList.getByKey(2)->getItem(), 101);
130+
assertEquals(btreeList.getByKey(3)->getItem(), 102);
131+
assertEquals(btreeList.getByKey(4)->getItem(), 103);
132+
assertEquals(btreeList.getByKey(5)->getItem(), 104);
131133
}
132134

133135
test(testAddingWithSortAndResizeBy5) {
@@ -139,13 +141,13 @@ test(testAddingWithSortAndResizeBy5) {
139141
assertTrue(btreeList.add(storage4));
140142
assertTrue(btreeList.add(storage3));
141143

142-
assertEqual((bsize_t)5, btreeList.capacity());
144+
assertEquals((bsize_t)5, btreeList.capacity());
143145
assertTrue(btreeList.add(storage6));
144146
assertTrue(btreeList.add(storage7));
145147
assertTrue(btreeList.add(storage2));
146148
assertTrue(btreeList.add(storage1));
147149
assertTrue(btreeList.add(storage10));
148-
assertEqual((bsize_t)10, btreeList.capacity());
150+
assertEquals((bsize_t)10, btreeList.capacity());
149151
printArray(btreeList.items(), btreeList.count());
150152

151153
assertTrue(btreeList.getByKey(1) != nullptr);
@@ -159,26 +161,26 @@ test(testAddingWithSortAndResizeBy5) {
159161
assertTrue(btreeList.getByKey(9) != nullptr);
160162
assertTrue(btreeList.getByKey(10) != nullptr);
161163

162-
assertEqual(btreeList.getByKey(1)->getItem(), 100);
163-
assertEqual(btreeList.getByKey(2)->getItem(), 101);
164-
assertEqual(btreeList.getByKey(3)->getItem(), 102);
165-
assertEqual(btreeList.getByKey(4)->getItem(), 103);
166-
assertEqual(btreeList.getByKey(5)->getItem(), 104);
167-
assertEqual(btreeList.getByKey(6)->getItem(), 105);
168-
assertEqual(btreeList.getByKey(7)->getItem(), 106);
169-
assertEqual(btreeList.getByKey(8)->getItem(), 107);
170-
assertEqual(btreeList.getByKey(9)->getItem(), 108);
171-
assertEqual(btreeList.getByKey(10)->getItem(), 109);
164+
assertEquals(btreeList.getByKey(1)->getItem(), 100);
165+
assertEquals(btreeList.getByKey(2)->getItem(), 101);
166+
assertEquals(btreeList.getByKey(3)->getItem(), 102);
167+
assertEquals(btreeList.getByKey(4)->getItem(), 103);
168+
assertEquals(btreeList.getByKey(5)->getItem(), 104);
169+
assertEquals(btreeList.getByKey(6)->getItem(), 105);
170+
assertEquals(btreeList.getByKey(7)->getItem(), 106);
171+
assertEquals(btreeList.getByKey(8)->getItem(), 107);
172+
assertEquals(btreeList.getByKey(9)->getItem(), 108);
173+
assertEquals(btreeList.getByKey(10)->getItem(), 109);
172174

173175
// clear the tree and ensure it clears
174176
btreeList.clear();
175-
assertEqual((bsize_t)10, btreeList.capacity());
176-
assertEqual((bsize_t)0, btreeList.count());
177+
assertEquals((bsize_t)10, btreeList.capacity());
178+
assertEquals((bsize_t)0, btreeList.count());
177179

178180
// now add an item back and make sure we find it.
179181
assertTrue(btreeList.add(storage9));
180182
assertTrue(btreeList.getByKey(9) != nullptr);
181-
assertEqual(btreeList.getByKey(9)->getItem(), 108);
183+
assertEquals(btreeList.getByKey(9)->getItem(), 108);
182184

183185
}
184186

@@ -215,7 +217,7 @@ test(testAddingThenRemovingThenAddingItems) {
215217
}
216218

217219
// should have 20 items now
218-
assertEqual(myList.count(), bsize_t(20));
220+
assertEquals(myList.count(), bsize_t(20));
219221

220222
// remove key 102
221223
assertTrue(myList.removeByKey(102));
@@ -224,7 +226,7 @@ test(testAddingThenRemovingThenAddingItems) {
224226
printArray(myList.items(), myList.count());
225227

226228
// should have 19 items
227-
assertEqual(myList.count(), bsize_t(19));
229+
assertEquals(myList.count(), bsize_t(19));
228230

229231
// ensure that only 102 was removed
230232
assertTrue(myList.getByKey(102) == nullptr);
@@ -238,15 +240,15 @@ test(testAddingThenRemovingThenAddingItems) {
238240

239241
for(int i=0;i<20;i++) {
240242
auto entry = myList.itemAtIndex(i);
241-
assertEqual(entry->getKey(), uint32_t(i + 100));
243+
assertEquals(entry->getKey(), uint32_t(i + 100));
242244
}
243245

244246
// now test removing the edge cases, IE head and tail of list
245247
myList.removeIndex(0);
246248
myList.removeIndex(19);
247249
printArray(myList.items(), myList.count());
248250

249-
assertEqual(myList.count(), bsize_t(18));
251+
assertEquals(myList.count(), bsize_t(18));
250252
assertTrue(myList.getByKey(100) == nullptr);
251253
assertTrue(myList.getByKey(119) == nullptr);
252254
}

‎tests/collectionTests/collectionTests.ino‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11

22
#include <Arduino.h>
3-
#include <AUnit.h>
3+
#include <testing/SimpleTest.h>
44
#include <Wire.h>
55

6-
using namespace aunit;
6+
using namespace SimpleTest;
77

88
void setup() {
99
Serial.begin(115200);
1010
while (!Serial);
11+
startTesting();
1112
}
1213

13-
void loop() {
14-
TestRunner::setTimeout(60);
15-
TestRunner::run();
16-
}
14+
DEFAULT_TEST_RUNLOOP

‎tests/stm32ThreadedTests/StmRTOSBufferTest.cpp‎

Lines changed: 0 additions & 123 deletions
This file was deleted.

0 commit comments

Comments
 (0)