Preinstanciate object in source file

Author: ikeyasu

include/arduino-mock/EEPROM.h

@@ -13,7 +13,7 @@ class EEPROM_ {
     uint8_t read(int a);
     void write(int a,  uint8_t b);
 };
-
+extern EEPROM_ EEPROM;
 
 class EEPROMMock {
   public:

include/arduino-mock/Serial.h

@@ -94,6 +94,7 @@ class Serial_ {
     static size_t println(const Printable&);
     */
 };
+extern Serial_ Serial;
 
 SerialMock* serialMockInstance();
 void releaseSerialMock();

include/arduino-mock/Spark.h

@@ -48,6 +48,7 @@ class Spark_ {
     void sleep(uint16_t wakeUpPin, uint16_t edgeTriggerMode, int seconds);
     void syncTime(); // Synchronize time with the Spark Cloud
 };
+extern Spark_ Spark;
 
 SparkMock* sparkMockInstance();
 void releaseSparkMock();

include/arduino-mock/WiFi.h

@@ -29,6 +29,7 @@ class WiFi_ {
     char* subnetMask(); // Return Subnet mask of the network
     char* gatewayIP();  // Return the gateway IP address
 };
+extern WiFi_ WiFi;
 
 class WiFiMock {
   public:

include/arduino-mock/Wire.h

@@ -39,6 +39,7 @@ class Wire_ {
       return write((uint8_t)n);
     }
 };
+extern Wire_ Wire;
 
 class WireMock {
   public:

src/EEPROM.cc

@@ -24,3 +24,6 @@ uint8_t EEPROM_::read(int a) {
 void EEPROM_::write(int a, uint8_t b) {
   p_EEPROMMock->write(a, b);
 }
+
+// Preinstantiate Objects
+EEPROM_ EEPROM;

src/Serial.cc

@@ -112,3 +112,6 @@ uint8_t Serial_::available() {
 uint8_t Serial_::read() {
   return gSerialMock->read();
 }
+
+// Preinstantiate Objects
+Serial_ Serial;

src/Spark.cc

@@ -72,3 +72,6 @@ void Spark_::sleep(uint16_t wakeUpPin, uint16_t edgeTriggerMode, int seconds) {
 void Spark_::syncTime() {
   gSparkMock->syncTime();
 }
+
+// Preinstantiate Objects
+Spark_ Spark;

src/WiFi.cc

@@ -90,3 +90,6 @@ char* WiFi_::subnetMask() {
 char* WiFi_::gatewayIP() {
   return p_WiFiMock->gatewayIP();
 }
+
+// Preinstantiate Objects
+WiFi_ WiFi;

src/Wire.cc

@@ -75,3 +75,6 @@ uint8_t Wire_::requestFrom(uint8_t a, uint8_t b) {
 uint8_t Wire_::requestFrom(uint8_t a, uint8_t b, uint8_t c) {
   return p_WireMock->requestFrom(a, b, c);
 }
+
+// Preinstantiate Objects
+Wire_ Wire;

test/EEPROM_unittest.cc

@@ -1,16 +1,15 @@
 #include "gtest/gtest.h"
 #include "arduino-mock/EEPROM.h"
 #include "arduino-mock/Arduino.h"
-EEPROM_ eeprom;
 using ::testing::Return;
 
-TEST(eeprom, access) {
+TEST(EEPROM, access) {
   EEPROMMock* mock = EEPROMMockInstance();
   int expected_address = 5;
   int expected_value = 6;
   EXPECT_CALL(*mock, read(expected_value));
   EXPECT_CALL(*mock, write(expected_address, expected_value));
-  eeprom.read(expected_value);
-  eeprom.write(expected_address, expected_value);
+  EEPROM.read(expected_value);
+  EEPROM.write(expected_address, expected_value);
   releaseEEPROMMock();
 }

test/Serial_unittest.cc

@@ -5,7 +5,6 @@
 #include "arduino-mock/Arduino.h"
 #include "arduino-mock/Serial.h"
 #include "arduino-mock/serialHelper.h"
-Serial_ Serial;
 
 using ::testing::_;
 using ::testing::Return;

test/Spark_unittest.cc

@@ -8,7 +8,6 @@
 #include "arduino-mock/Arduino.h"
 
 #include "arduino-mock/Spark.h"
-Spark_ Spark;
 
 using ::testing::StrCaseEq;
 

test/Wire_unittest.cc

@@ -1,10 +1,9 @@
 #include "gtest/gtest.h"
 #include "arduino-mock/Wire.h"
 #include "arduino-mock/Arduino.h"
-Wire_ wire;
 
 using ::testing::Return;
-TEST(wire, access) {
+TEST(Wire, access) {
   uint8_t value1 = 10;
   uint8_t value2 = 12;
   char text[] = "Mock test";
@@ -19,14 +18,14 @@ TEST(wire, access) {
   EXPECT_CALL(*mock, read());
   EXPECT_CALL(*mock, onReceive(callback_func));
   EXPECT_CALL(*mock, onRequest(callback_func));
-  wire.begin();
-  wire.beginTransmission(value1);
-  wire.endTransmission(value1);
-  wire.requestFrom(value1, value2);
-  wire.write(text);
-  wire.available();
-  wire.read();
-  wire.onReceive(callback_func);
-  wire.onRequest(callback_func);
+  Wire.begin();
+  Wire.beginTransmission(value1);
+  Wire.endTransmission(value1);
+  Wire.requestFrom(value1, value2);
+  Wire.write(text);
+  Wire.available();
+  Wire.read();
+  Wire.onReceive(callback_func);
+  Wire.onRequest(callback_func);
   releaseWireMock();
 }

test/serialHelper_unittest.cc

@@ -4,8 +4,6 @@
 
 #include "arduino-mock/serialHelper.h"
 
-Serial_ Serial;
-
 using ::testing::_;
 using ::testing::Return;
 using ::testing::Matcher;