Fix setup and teardown example

Author: ianfixes

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - `arduino_library_location.rb` script to print Arduino library location to stdout
 - `arduino_ci_remote.rb` now supports `--skip-unittests` and `--skip-compilation`.  If you skip both, only the `autolocate!` of the Arduino binary will be performed.
 - `keepachangelog_manager` gem to begin streamlining the release process
+- `unittest_setup()` and `unittest_teardown()` macros, my thanks to @hlovdal for contributing this code
 - Added rspec sensitivity to the environment variable `$ARDUINO_CI_SKIP_SPLASH_SCREEN_RSPEC_TESTS` (for `arduino_ci` gem hackers)
 
 ### Changed

SampleProjects/TestSomething/test/setup_and_treardown.cpp renamed to SampleProjects/TestSomething/test/setup_and_teardown.cpp

@@ -8,50 +8,66 @@ class LcdInterface {
 
 class MockLcd : public LcdInterface {
   public:
-  void print(const char *) {}
+    String s;
+    void print(const char* c)
+    {
+      s = String(c);
+    }
 };
 
-LcdInterface *Lcd_p;
-
 class Calculator {
+  private:
+    LcdInterface *m_lcd;
+
   public:
-  int add(int a, int b) {
-    int result = a + b;
-    char buf[40];
-    sprintf(buf, "%d + %d = %d", a, b, result);
-    Lcd_p->print(buf);
-    return result;
+    Calculator(LcdInterface* lcd) {
+      m_lcd = lcd;
+    }
+
+    ~Calculator() {
+      m_lcd = 0;
+    }
+
+    int add(int a, int b)
+    {
+      int result = a + b;
+      char buf[40];
+      sprintf(buf, "%d + %d = %d", a, b, result);
+      m_lcd->print(buf);
+      return result;
   }
 };
 
+
+// This is a typical test where using setup (and teardown) would be useful
+// to set up the "external" lcd dependency that the calculator uses indirectly
+// but it is not something that is related to the functionality that is tested.
+
+MockLcd* lcd_p;
+Calculator* c;
+
 unittest_setup()
 {
-  Lcd_p = new MockLcd();
+  lcd_p = new MockLcd();
+  c = new Calculator(lcd_p);
 }
 
 unittest_teardown()
 {
-  delete Lcd_p;
+  delete c;
+  delete lcd_p;
 }
 
-// This is a typical test where using setup (and teardown) would be useful
-// to set up the "external" lcd dependency that the calculator uses indirectly
-// but it is not something that is related to the functionality that is tested.
 
 // When you want to test that the calculator actually prints the calculations,
 // then that should be done in the arrange part of the actual test (by setting
 // up an mock lcd class that keeps a list of all messages printed).
 
 unittest(add)
 {
-  // Arrange
-  Calculator c;
-
-  // Act
-  int result = c.add(11, 22);
-
-  // Assert
+  int result = c->add(11, 22);
   assertEqual(33, result);
+  assertEqual("11 + 22 = 33", lcd_p->s);
 }
 
 unittest_main()