Skip to content

Commit ed8b1ba

Browse files
author
Anner J. Bonilla
committed
missed formatting
1 parent 9d79652 commit ed8b1ba

File tree

2 files changed

+32
-34
lines changed

2 files changed

+32
-34
lines changed

include/arduino-mock/SPI.h

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,34 @@
66
#include <gmock/gmock.h>
77
#include <stdint.h>
88

9-
class SPISettings
10-
{
11-
uint32_t _a;
12-
uint8_t _b;
13-
uint8_t _c;
14-
public:
15-
SPISettings(uint32_t a, uint8_t b, uint8_t c):_a(a),_b(b),_c(c){}
16-
SPISettings();
17-
bool operator==(const SPISettings& rhs)const
18-
{
19-
return _a == rhs._a && _b == rhs._b && _c == rhs._c;
20-
}
9+
class SPISettings {
10+
uint32_t _a;
11+
uint8_t _b;
12+
uint8_t _c;
13+
public:
14+
SPISettings(uint32_t a, uint8_t b, uint8_t c): _a(a), _b(b), _c(c) {}
15+
SPISettings();
16+
bool operator==(const SPISettings& rhs)const {
17+
return _a == rhs._a && _b == rhs._b && _c == rhs._c;
18+
}
2119
};
2220

2321
class SPI_ {
2422
public:
2523
void begin();
26-
void usingInterrupt(uint8_t );
27-
void notUsingInterrupt(uint8_t );
28-
void beginTransaction(SPISettings );
29-
uint8_t transfer(uint8_t );
30-
uint16_t transfer16(uint16_t );
31-
void transfer(void *, size_t );
32-
void endTransaction(void);
33-
void end();
34-
void setBitOrder(uint8_t);
35-
void setDataMode(uint8_t );
36-
void setClockDivider(uint8_t clockDiv);
37-
void attachInterrupt();
38-
void detachInterrupt();
24+
void usingInterrupt(uint8_t );
25+
void notUsingInterrupt(uint8_t );
26+
void beginTransaction(SPISettings );
27+
uint8_t transfer(uint8_t );
28+
uint16_t transfer16(uint16_t );
29+
void transfer(void *, size_t );
30+
void endTransaction(void);
31+
void end();
32+
void setBitOrder(uint8_t);
33+
void setDataMode(uint8_t );
34+
void setClockDivider(uint8_t clockDiv);
35+
void attachInterrupt();
36+
void detachInterrupt();
3937
};
4038

4139
extern SPI_ SPI;
@@ -47,7 +45,7 @@ class SPIMock {
4745
MOCK_METHOD1(notUsingInterrupt, void(uint8_t));
4846
MOCK_METHOD1(beginTransaction, void(SPISettings));
4947
MOCK_METHOD1(transfer, uint8_t(uint8_t));
50-
MOCK_METHOD1(transfer16, uint16_t(uint16_t));
48+
MOCK_METHOD1(transfer16, uint16_t(uint16_t));
5149
MOCK_METHOD2(transfer, void(void *, size_t));
5250
MOCK_METHOD0(endTransaction, void());
5351
MOCK_METHOD0(end, void());

test/SPI_unittest.cc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,40 @@ TEST(SPITest, access) {
1111
char text[] = "Mock test";
1212
uint8_t* callback_func = NULL;
1313
void* voidTest = NULL;
14-
15-
SPISettings settings(1,2,3);
14+
15+
SPISettings settings(1, 2, 3);
1616
SPIMock* mock = SPIMockInstance();
17-
17+
1818
EXPECT_CALL(*mock, begin());
1919
EXPECT_CALL(*mock, usingInterrupt(value1));
2020
EXPECT_CALL(*mock, notUsingInterrupt(value1));
2121
EXPECT_CALL(*mock, beginTransaction(settings));
2222
EXPECT_CALL(*mock, transfer(value1));
2323
EXPECT_CALL(*mock, transfer16(value));
24-
EXPECT_CALL(*mock, transfer(voidTest,value1));
24+
EXPECT_CALL(*mock, transfer(voidTest, value1));
2525
EXPECT_CALL(*mock, endTransaction());
2626
EXPECT_CALL(*mock, end());
2727
EXPECT_CALL(*mock, setBitOrder(value1));
2828
EXPECT_CALL(*mock, setDataMode(value1));
2929
EXPECT_CALL(*mock, setClockDivider(value1));
3030
EXPECT_CALL(*mock, attachInterrupt());
3131
EXPECT_CALL(*mock, detachInterrupt());
32-
33-
32+
33+
3434
SPI.begin();
3535
SPI.usingInterrupt(value1);
3636
SPI.notUsingInterrupt(value1);
3737
SPI.beginTransaction(settings);
3838
SPI.transfer(value1);
3939
SPI.transfer16(value);
40-
SPI.transfer(voidTest,value1);
40+
SPI.transfer(voidTest, value1);
4141
SPI.endTransaction();
4242
SPI.end();
4343
SPI.setBitOrder(value1);
4444
SPI.setDataMode(value1);
4545
SPI.setClockDivider(value1);
4646
SPI.attachInterrupt();
4747
SPI.detachInterrupt();
48-
48+
4949
releaseSPIMock();
5050
}

0 commit comments

Comments
 (0)