Skip to content

Commit 13862bc

Browse files
committed
me dumb and fixed wire tests, though there's an anomaly in compilation
1 parent 4989505 commit 13862bc

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

SampleProjects/TestSomething/test/wire.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include <vector>
44

55
#include <Wire.h>
6+
using namespace std;
67

78
unittest(beginAsMaster) {
89
Wire.begin();
@@ -27,19 +28,19 @@ unittest(getSlaveAddress) {
2728
unittest(begin_write_end) {
2829
Wire.begin();
2930
Wire.beginTransmission(14);
30-
assertEqual(14, txAddress);
31+
assertEqual(14, Wire.getAddress());
3132

32-
assertTrue(Wire.getTxBuffer().empty());
33+
assertTrue(Wire.isTxBufferEmpty());
3334

3435
Wire.write(0x07);
3536
Wire.write(0x0E);
36-
assertEqual(0x07, getTxBuffer().at(0));
37-
assertEqual(0x0E, getTxBuffer().at(1));
37+
assertEqual(0x07, Wire.getTxBufferElement(0));
38+
assertEqual(0x0E, Wire.getTxBufferElement(1));
3839

3940
Wire.endTransmission(true);
40-
assertTrue(txBuffer.empty());
41-
assertEqual(0x07, getWriteData.at(0));
42-
assertEqual(0x0E, getWriteData.at(1));
41+
assertTrue(Wire.isTxBufferEmpty());
42+
assertEqual(0x07, Wire.getWriteDataElement(0));
43+
assertEqual(0x0E, Wire.getWriteDataElement(1));
4344
}
4445

4546
// want to add read test, though it seems to depend on requestFrom

cpp/arduino/Wire.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <cassert>
77
#include "Stream.h"
88

9+
using std::vector;
910

1011
// Some inspiration taken from https://github.com/arduino/ArduinoCore-megaavr/blob/d2a81093ba66d22dbda14c30d146c231c5910734/libraries/Wire/src/Wire.cpp
1112
class TwoWire : public ObservableDataStream
@@ -161,8 +162,9 @@ class TwoWire : public ObservableDataStream
161162
// testing methods
162163
bool getIsMaster() { return isMaster; }
163164
int getAddress() { return txAddress; }
164-
vector<uint8_t> getTxBuffer() { return txBuffer; }
165-
vector<uint8_t> getWriteData() { return writeData; }
165+
bool isTxBufferEmpty() { return txBuffer.empty(); }
166+
uint8_t getTxBufferElement(int index) { return txBuffer.at(index); }
167+
uint8_t getWriteDataElement(int index) { return writeData.at(index); }
166168

167169
private:
168170
bool isMaster = false;

0 commit comments

Comments
 (0)