Commit 5ad82618 authored by Greg Williams's avatar Greg Williams
Browse files

Reformatted license block to make C auto-indent functionality in editors happy. 

Added tests for kinetic_logger and created/consolidated some custom test helper goodness into unity_helper.h
parent 090c862b

Rakefile

+8 −2
Original line number Diff line number Diff line
@@ -31,9 +31,15 @@ VENDOR_PATH = File.join(HERE, 'vendor') 
PROTOBUF_CORE = File.join(VENDOR_PATH, 'protobuf-2.5.0')

PROTOBUF_C = File.join(VENDOR_PATH, 'protobuf-c')

PROTO_IN = File.join(VENDOR_PATH, 'kinetic-protocol')

PROTO_OUT = File.join(HERE, 'build', 'temp', 'proto')

BUILD_ARTIFACTS = File.join(HERE, 'build', 'artifacts', 'release')

TEST_ARTIFACTS = File.join(HERE, 'build', 'artifacts', 'test')

PROTO_OUT = TEST_ARTIFACTS

TEST_TEMP = File.join(HERE, 'build', 'test', 'temp')



directory PROTO_OUT

CLOBBER.include PROTO_OUT

directory TEST_TEMP

CLOBBER.include TEST_TEMP



task :test => ['test:delta']
@@ -182,7 +188,7 @@ namespace :test_server do 


end



task 'test/integration/test_KineticSocket.c' => ['test_server:start']

task 'test/integration/test_kinetic_socket.c' => ['test_server:start']



task :default => [

  'test:all',

include/kinetic/kinetic.h

+4 −4
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ 
#ifndef KINETIC_C_CLIENT_KINETIC_H_

#define KINETIC_C_CLIENT_KINETIC_H_



#include "../../src/lib/KineticTypes.h"

#include "../../src/lib/KineticApi.h"

#include "../../src/lib/KineticProto.h"

#include "../../src/lib/KineticConnection.h"

#include "../../src/lib/kinetic_types.h"

#include "../../src/lib/kinetic_api.h"

#include "../../src/lib/kinetic_proto.h"

#include "../../src/lib/kinetic_connection.h"

#include <protobuf-c/protobuf-c.h>



#endif /* KINETIC_C_CLIENT_KINETIC_H_ */

project.yml

+3 −6
Original line number Diff line number Diff line 
---



# 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
@@ -25,7 +20,6 @@ 
  :test:

    - +:test/**

    - -:test/support

    - include/**

    - src/**

    - vendor/protobuf-c/*

  :support:
@@ -34,6 +28,8 @@ 
    - src/lib/*

    - src/utility/*

    - vendor/protobuf-c/protobuf-c/*

  :include:

    - include/**

  # Refactor release build once the Kinetic-C library is built, and link to it sepearately

  :release_toolchain_include:

    - include/**
@@ -55,6 +51,7 @@ 
  :mock_prefix: mock_

  :when_no_prototypes: :warn

  :enforce_strict_ordering: true

  :unity_helper: test/support/unity_helper.h

  :plugins:

    - :ignore

  :treat_as:

src/lib/kinetic_api.c

+18 −18
Original line number Diff line number Diff line 
/*

 * kinetic-c-client

* kinetic-c

* Copyright (C) 2014 Seagate Technology.

*

* This program is free software; you can redistribute it and/or

src/lib/kinetic_api.h

+18 −18
Original line number Diff line number Diff line 
/*

 * kinetic-c-client

* kinetic-c

* Copyright (C) 2014 Seagate Technology.

*

* This program is free software; you can redistribute it and/or