Merge pull request #954 from gedankenexperimenter/t/testing.nitpicks

Improve consistency and readability of code in testing/*

testing/SimHarness.cpp

@@ -66,11 +66,11 @@ void SimHarness::Release(uint8_t row, uint8_t col) {
 }
 
 void SimHarness::SetCycleTime(uint8_t millis) {
-  millis_per_cycle = millis;
+  millis_per_cycle_ = millis;
 }
 
-uint8_t SimHarness::CycleTime() {
-  return millis_per_cycle;
+uint8_t SimHarness::CycleTime() const {
+  return millis_per_cycle_;
 }
 
 

testing/SimHarness.h

@@ -35,9 +35,10 @@ class SimHarness {
   void Press(uint8_t row, uint8_t col);
   void Release(uint8_t row, uint8_t col);
   void SetCycleTime(uint8_t millis);
-  uint8_t CycleTime();
+  uint8_t CycleTime() const;
+
  private:
-  uint8_t millis_per_cycle = 1;
+  uint8_t millis_per_cycle_ = 1;
 };
 
 }  // namespace testing

testing/setup-googletest.h

@@ -30,12 +30,12 @@
 #include "testing/matchers.h"
 #include "testing/VirtualDeviceTest.h"
 
-#define SETUP_GOOGLETEST() \
-  void executeTestFunction() { \
-    setup(); /* setup Kaleidoscope */ \
-    /* Turn off virtual_io's input. */ \
-    Kaleidoscope.device().keyScanner().setEnableReadMatrix(false); \
-    testing::InitGoogleTest(); \
-    int result = RUN_ALL_TESTS();           \
-    exit(result); \
+#define SETUP_GOOGLETEST()                                              \
+  void executeTestFunction() {                                          \
+    setup(); /* setup Kaleidoscope */                                   \
+    /* Turn off virtual_io's input. */                                  \
+    Kaleidoscope.device().keyScanner().setEnableReadMatrix(false);      \
+    testing::InitGoogleTest();                                          \
+    int result = RUN_ALL_TESTS();                                       \
+    exit(result);                                                       \
   }