ceedling 0.12.2 → 0.13.0.rc1

data/examples/temp_sensor/project.yml

@@ -1,74 +1,71 @@
----
-
-:project:
-  :use_exceptions: FALSE
-  :use_test_preprocessor: TRUE
-  :use_auxiliary_dependencies: TRUE
-  :build_root: build
-#  :release_build: TRUE
-  :test_file_prefix: test_
-
-#:release_build:
-#  :output: TempSensor.out
-#  :use_assembly: FALSE
-
-:environment:
-
-#:extension:
-#  :executable: .out
-
-:paths:
-  :test:
-    - test/*
-    - test/support/*
-  :source:
-    - src/*
-  :support:
-    - test/support
-
-:defines:
-  # in order to add common defines:
-  #  1) remove the trailing [] from the :common: section
-  #  2) add entries to the :common: section (e.g. :test: has TEST defined)
-  :common: &common_defines []
-  :test:
-    - TEST
-    - *common_defines
-  :release:
-    *common_defines
-
-:cmock:
-  :mock_prefix: Mock
-  :when_no_prototypes: :warn
-  :enforce_strict_ordering: TRUE
-  :includes:
-    - Types.h
-  :plugins:
-    - :ignore
-  :treat_as:
-    U8:   UINT
-    U16:  UINT
-    U32:  UINT
-    S8:   HEX8
-    U8*:  HEX32
-    U16*: HEX32
-    C8*:  STRING
-
-:module_generator:
-  :project_root: ./
-  :source_root: src/
-  :test_root: test/
-  :header_includes:
-    - Types.h
-  :test_includes:
-    - Types.h
-    - UnityHelper.h
-
-:plugins:
-  :load_paths:
-    - vendor/ceedling/plugins
-  :enabled:
-    - stdout_pretty_tests_report
-    - module_generator
-
-...
+---
+
+# Notes:
+# Sample project C code is not presently written to produce a release artifact.
+# As such, release build options are disabled.
+# This sample, therefore, only demonstrates running a collection of unit tests.
+
+:project:
+  :use_exceptions: FALSE
+  :use_test_preprocessor: TRUE
+  :use_auxiliary_dependencies: TRUE
+  :build_root: build
+  # :release_build: TRUE
+  :test_file_prefix: Test
+
+#:release_build:
+#  :output: TempSensor.out
+#  :use_assembly: FALSE
+
+:environment: []
+
+:extension:
+  :executable: .out
+
+:paths:
+  :test:
+    - +:test/**
+    - -:test/support
+  :source:
+    - src/**
+  :support:
+    - test/support
+
+:defines:
+  :common: &common_defines []
+  :test:
+    - *common_defines
+    - TEST
+  :test_preprocess:
+    - *common_defines
+    - TEST
+
+:cmock:
+  :when_no_prototypes: :warn
+  :enforce_strict_ordering: TRUE
+  :plugins:
+    - :ignore
+  :treat_as:
+    uint8:    HEX8
+    uint16:   HEX16
+    uint32:   UINT32
+    int8:     INT8
+    bool:     UINT8
+
+#:tools:
+# Ceedling defaults to using gcc for compiling, linking, etc.
+# As [:tools] is blank, gcc will be used (so long as it's in your system path)
+# See documentation to configure a given toolchain for use
+
+# some platforms need the default test_linker to explicitly link the math lib (uncomment if this is you)
+# :tools_test_linker:
+#   :arguments:
+#     - -lm
+
+:plugins:
+  :load_paths:
+    - vendor/ceedling/plugins
+  :enabled:
+    - stdout_pretty_tests_report
+    #- stdout_ide_tests_report
+...

data/examples/temp_sensor/rakefile.rb

@@ -1,6 +1,4 @@
-PROJECT_ROOT  = File.expand_path(File.dirname(__FILE__))
-PROJECT_TOOLS = 'vendor'
+PROJECT_CEEDLING_ROOT = "vendor/ceedling"
+load "#{PROJECT_CEEDLING_ROOT}/lib/rakefile.rb"
 
-load 'vendor/ceedling/lib/rakefile.rb'
-
-task :default => ['test:all']
+task :default => %w[ test:all release ]

data/examples/temp_sensor/src/AdcConductor.h

@@ -1,6 +1,8 @@
 #ifndef _ADCCONDUCTOR_H
 #define _ADCCONDUCTOR_H
 
+#include "Types.h"
+
 void AdcConductor_Init(void);
 void AdcConductor_Run(void);
 

data/examples/temp_sensor/src/TemperatureCalculator.h

@@ -1,6 +1,8 @@
 #ifndef _TEMPERATURECALCULATOR_H
 #define _TEMPERATURECALCULATOR_H
 
+#include "Types.h"
+
 float TemperatureCalculator_Calculate(uint16 millivolts);
 
 #endif // _TEMPERATURECALCULATOR_H

data/examples/temp_sensor/src/Types.h

@@ -1,21 +1,8 @@
 #ifndef _MYTYPES_H_
 #define _MYTYPES_H_
 
-#include "AT91SAM7X256.h"
 #include <math.h>
 
-#ifndef __monitor
-#define __monitor
-#endif
-
-// Peripheral Helper Definitions
-#define USART0_CLOCK_ENABLE (AT91C_ID_US0)
-#define USART0_TX_PIN       (AT91C_PA1_TXD0)
-#define TIMER0_CLOCK_ENABLE (((uint32)0x1) << AT91C_ID_TC0)
-#define PIOA_CLOCK_ENABLE   (((uint32)0x1) << AT91C_ID_PIOA)
-#define PIOB_CLOCK_ENABLE   (((uint32)0x1) << AT91C_ID_PIOB)
-#define TIOA0_PIN_MASK      (((uint32)0x1) << 23) // Timer/Counter Output Pin
-
 // Application Type Definitions
 typedef unsigned int uint32;
 typedef int int32;

data/examples/temp_sensor/src/UsartBaudRateRegisterCalculator.h

@@ -1,6 +1,8 @@
 #ifndef _USARTBAUDRATEREGISTERCALCULATOR_H
 #define _USARTBAUDRATEREGISTERCALCULATOR_H
 
+#include "Types.h"
+
 uint8 UsartModel_CalculateBaudRateRegisterSetting(uint32 masterClock, uint32 baudRate);
 
 #endif // _USARTBAUDRATEREGISTERCALCULATOR_H

data/examples/temp_sensor/src/UsartHardware.c

@@ -2,7 +2,6 @@
 #include "UsartHardware.h"
 #include "UsartConfigurator.h"
 #include "UsartPutChar.h"
-#include "UsartGetChar.h"
 
 void UsartHardware_Init(uint8 baudRateRegisterSetting)
 {
@@ -21,14 +20,3 @@ void UsartHardware_TransmitString(char* data)
     Usart_PutChar(*data++);
   }
 }
-
-void UsartHardware_ReceiveString(char* data, uint16 maxLen)
-{
-  *data = UsartHardware_GetChar();
-
-  while (*data != NULL)
-  {
-    *data++;
-    *data = UsartHardware_GetChar();
-  }
-}

data/examples/temp_sensor/src/UsartHardware.h

@@ -5,6 +5,5 @@
 
 void UsartHardware_Init(uint8 baudRateRegisterSetting);
 void UsartHardware_TransmitString(char* data);
-void UsartHardware_ReceiveString(char* data, uint16 maxLen);
 
 #endif // _USARTHARDWARE_H

data/examples/temp_sensor/test/{test_TemperatureFilter.c → TestTemperatureFilter.c}

@@ -50,8 +50,6 @@ void testShouldWeightEachSubsequentValueBy25PercentAfterInitialValue(void)
   setValueAndVerifyResponse(0.0f, 75.0f);
   setValueAndVerifyResponse(0.0f, 56.25f);
   setValueAndVerifyResponse(0.0f, 42.1875f);
-
-  printf("Hello world!\n");
 }
 
 void setInvalidTemperatureAndVerifyReinitialized(float invalidTemperature)

data/examples/temp_sensor/test/{test_UsartHardware.c → TestUsartHardware.c}

@@ -1,10 +1,8 @@
 #include "unity.h"
 #include "Types.h"
 #include "UsartHardware.h"
-#include "AT91SAM7X256.h"
 #include "MockUsartConfigurator.h"
 #include "MockUsartPutChar.h"
-#include "MockUsartGetChar.h"
 
 void setUp(void)
 {
@@ -36,21 +34,3 @@ void testTransmitStringShouldSendDesiredStringOutUsingUsart(void)
   
   UsartHardware_TransmitString("hello");
 }
-
-void testUsartHardwareReceiveStringShouldReceiveUntilNullTerminatorIsReached(void) //reqs: 
-{
-    char message[16] = "";
-
-    UsartHardware_GetChar_ExpectAndReturn('W');
-    UsartHardware_GetChar_ExpectAndReturn('a');
-    UsartHardware_GetChar_ExpectAndReturn('s');
-    UsartHardware_GetChar_ExpectAndReturn('s');
-    UsartHardware_GetChar_ExpectAndReturn('u');
-    UsartHardware_GetChar_ExpectAndReturn('p');
-    UsartHardware_GetChar_ExpectAndReturn('!');
-    UsartHardware_GetChar_ExpectAndReturn(NULL);
-
-    UsartHardware_ReceiveString(message, sizeof(message));
-
-    TEST_ASSERT_EQUAL_STRING("Wassup!", message);
-}

data/examples/temp_sensor/test/support/UnityHelper.c

@@ -1,10 +1,12 @@
 #include "unity.h"
+#include "unity_internals.h"
 #include "UnityHelper.h"
-#include <stdio.h>
-#include <string.h>
 
-void AssertEqualExampleStruct(const EXAMPLE_STRUCT_T expected, const EXAMPLE_STRUCT_T actual, const unsigned short line)
+#if 0
+void AssertEqualMyDataType(const MyDataType_T expected, const MyDataType_T actual, const unsigned short line)
 {
-    UNITY_TEST_ASSERT_EQUAL_INT(expected.x, actual.x, line, "Example Struct Failed For Field x");
-    UNITY_TEST_ASSERT_EQUAL_INT(expected.y, actual.y, line, "Example Struct Failed For Field y");
+  UNITY_TEST_ASSERT_EQUAL_INT(expected.length, actual.length, line, "MyDataType_T.length check failed");
+  UNITY_TEST_ASSERT_EQUAL_MEMORY(expected.buffer, actual.buffer, expected.length, line, "MyDataType_T.buffer check failed");
 }
+#endif
+

data/examples/temp_sensor/test/support/UnityHelper.h

@@ -1,12 +1,12 @@
 #ifndef _TESTHELPER_H
 #define _TESTHELPER_H
 
-#include "Types.h"
+// #include "MyTypes.h"
 
-void AssertEqualExampleStruct(const EXAMPLE_STRUCT_T expected, const EXAMPLE_STRUCT_T actual, const unsigned short line);
+#if 0
+void AssertEqualMyDataType(const MyDataType_T expected, const MyDataType_T actual, const unsigned short line);
 
-#define UNITY_TEST_ASSERT_EQUAL_EXAMPLE_STRUCT_T(expected, actual, line, message) AssertEqualExampleStruct(expected, actual, line);
-
-#define TEST_ASSERT_EQUAL_EXAMPLE_STRUCT_T(expected, actual) UNITY_TEST_ASSERT_EQUAL_EXAMPLE_STRUCT_T(expected, actual, __LINE__, NULL);
+#define UNITY_TEST_ASSERT_EQUAL_MyDataType_T(expected, actual, line, message) {AssertEqualMyDataType(expected, actual, line);}
+#endif
 
 #endif // _TESTHELPER_H

data/lib/ceedling.rb

@@ -1,6 +1,18 @@
-require "ceedling/version"
+require 'rake'
 
-# @private
-module Ceedling
-  NEW_PROJECT_DIR = "new_project_template"
+def ceedling_dir
+  File.join(
+    File.dirname(__FILE__),
+    '..')
 end
+
+def builtin_ceedling_plugins_path
+  File.join(
+    ceedling_dir,
+    'plugins')
+end
+
+load File.join(
+  ceedling_dir,
+  'lib',
+  'rakefile.rb')

data/lib/ceedling/version.rb

@@ -2,15 +2,15 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.12.2"
+    GEM = "0.13.0.rc1"
 
     # @private
     CEEDLING = "0.10.226"
     # @private
-    CEXCEPTION = "1.2.20"
+    CEXCEPTION = "1.2.17"
     # @private
-    CMOCK = "2.0.217"
+    CMOCK = "2.0.215"
     # @private
-    UNITY = "2.0.137"
+    UNITY = "2.0.136"
   end
 end

data/lib/ceedling/version.rb.erb

@@ -2,7 +2,7 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.12.2"
+    GEM = "0.11.2"
 
     # @private
     CEEDLING = "<%= versions["CEEDLING"] %>"

data/{new_project_template/vendor/ceedling/lib → lib}/defaults.rb

@@ -217,6 +217,8 @@ DEFAULT_CEEDLING_CONFIG = {
       # :build_root must be set by user
       :use_exceptions => true,
       :use_mocks => true,
+      :compile_threads => 1,
+      :test_threads => 1,
       :use_test_preprocessor => false,
       :use_deep_dependencies => false,
       :test_file_prefix => 'test_',