P04 Modularisieren von C Code: update code to new Praktika description
This commit is contained in:
@@ -1,16 +0,0 @@
|
||||
/* ----------------------------------------------------------------------------
|
||||
* -- _____ ______ _____ -
|
||||
* -- |_ _| | ____|/ ____| -
|
||||
* -- | | _ __ | |__ | (___ Institute of Embedded Systems -
|
||||
* -- | | | '_ \| __| \___ \ Zuercher Hochschule Winterthur -
|
||||
* -- _| |_| | | | |____ ____) | (University of Applied Sciences) -
|
||||
* -- |_____|_| |_|______|_____/ 8401 Winterthur, Switzerland -
|
||||
* ----------------------------------------------------------------------------
|
||||
*/
|
||||
/**
|
||||
* @file
|
||||
* @brief Lab implementation
|
||||
*/
|
||||
// begin students to add code for task 4.2
|
||||
|
||||
// end students to add code
|
||||
@@ -15,7 +15,6 @@
|
||||
#include <stdlib.h>
|
||||
#include "read.h"
|
||||
#include "rectang.h"
|
||||
#include "trace.h"
|
||||
|
||||
/// max side length
|
||||
#define MAX_NUMBER 1000
|
||||
|
||||
@@ -135,36 +135,6 @@ static void test_not_right_angled(void)
|
||||
assert_lines(OUTFILE, out_txt, sizeof(out_txt)/sizeof(*out_txt));
|
||||
}
|
||||
|
||||
static void test_trace(void)
|
||||
{
|
||||
// arrange
|
||||
const char *err_txt[] = {
|
||||
"TRACE: main()\n",
|
||||
"TRACE: getInt(1000)\n",
|
||||
"TRACE: getInt(1000)\n",
|
||||
"TRACE: getInt(1000)\n",
|
||||
"TRACE: rectangular(3, 4, 6)\n",
|
||||
"TRACE: getInt(1000)\n",
|
||||
"TRACE: getInt(1000)\n",
|
||||
"TRACE: getInt(1000)\n",
|
||||
"TRACE: rectangular(5, 4, 4)\n",
|
||||
"TRACE: getInt(1000)\n",
|
||||
"TRACE: getInt(1000)\n",
|
||||
"TRACE: getInt(1000)\n",
|
||||
"TRACE: rectangular(3, 5, 5)\n",
|
||||
"TRACE: getInt(1000)\n",
|
||||
"TRACE: getInt(1000)\n",
|
||||
"TRACE: getInt(1000)\n",
|
||||
"TRACE: rectangular(33, 43, 55)\n",
|
||||
"TRACE: getInt(1000)\n",
|
||||
};
|
||||
// act
|
||||
int exit_code = system(XSTR(TARGET) " 1>" OUTFILE " 2>" ERRFILE " <" INFILE_NOT_RIGHT_ANGLED);
|
||||
// assert
|
||||
CU_ASSERT_EQUAL(exit_code, 0);
|
||||
assert_lines(ERRFILE, err_txt, sizeof(err_txt)/sizeof(*err_txt));
|
||||
}
|
||||
|
||||
static void test_error(void)
|
||||
{
|
||||
// arrange
|
||||
@@ -199,7 +169,6 @@ int main(void)
|
||||
TestMainBasic("Triangle", setup, teardown
|
||||
, test_right_angled
|
||||
, test_not_right_angled
|
||||
, test_trace
|
||||
, test_error
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user