обновил ридмиху

Makefile

@@ -1,16 +1,16 @@
 CFLAGS=-Wall -I munit -ggdb
 unittest_obj=munit/munit.o
 
-all: aux_bin aux_test
+all: str_bin str_test
 
-aux_bin: aux_bin.o aux_lib.o
+str_test: $(unittest_obj) str_lib.o str_test.o
 	$(CC) $(CFLAGS) -o $@ $^
 
-aux_test: $(unittest_obj) aux_lib.o aux_test.o
+str_bin: str_lib.o str_bin.o
 	$(CC) $(CFLAGS) -o $@ $^
 
-test: ./aux_test
+test: ./str_test
-	./aux_test
+	./str_test
 
 clean:
-	rm *_bin *.o $(unittest_obj) aux_test
+	rm *_bin *.o $(unittest_obj) str_test

aux_bin.c

@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include "aux_lib.h"
-
-#define ARRSZ(arr) (sizeof(arr) / sizeof(arr[0]))
-
-int
-main(int argc, const char *argv[])
-{
-	int n = 5;
-	printf("fibonacci(%d) == %d\n", n, fibonacci(n));
-
-	int arr[] = {1,2,3,4,5};
-
-	bool res = sum_is_odd(arr, ARRSZ(arr));
-	printf("sum_is_odd() == %s\n", res ? "true" : "false");
-
-	return 0;
-}

aux_lib.c

@@ -1,43 +0,0 @@
-#include "aux_lib.h"
-#include <stddef.h>
-
-/*
- * Функция возвращает n-ный элемент последовательности фибоначи
- */
-int
-fibonacci(int nitem)
-{
-	if (nitem < 0)
-		return -1;
-
-	if (nitem == 0)
-		return 0;
-	if (nitem == 1)
-		return 1;
-
-	int a = 0, b = 1;
-	for (int i = 2; i <= nitem; i++) {
-		int next = a + b;
-		a = b;
-		b = next;
-	}
-
-	return b;
-}
-
-/*
- * Функция считает сумму элементов массива и возвращает информацию
- * является ли эта сумма нечётным числом.
- */
-bool
-sum_is_odd(int *arr, int arrsz)
-{
-	if (arr == NULL || arrsz <= 0)
-		return false;
-
-	long sum = 0;
-	for (int i = 0; i < arrsz; i++) {
-		sum += arr[i];
-	}
-	return (sum % 2 != 0);
-}

aux_lib.h

@@ -1,7 +0,0 @@
-#pragma once
-#include <stdbool.h>
-
-int fibonacci(int nitem);
-
-bool sum_is_odd(int *arr, int arrsz);
-

aux_test.c

@@ -1,103 +0,0 @@
-#include <stdio.h>
-#include "munit.h"
-#include "aux_lib.h"
-
-/****************** TEST fibonacci()*********************/
-static MunitResult
-test_fibonacci_basic(const MunitParameter params[], void *data)
-{
-    (void) params;
-    (void) data;
-
-    munit_assert_int(fibonacci(0), ==, 0);
-    munit_assert_int(fibonacci(1), ==, 1);
-    munit_assert_int(fibonacci(2), ==, 1);
-    munit_assert_int(fibonacci(3), ==, 2);
-    munit_assert_int(fibonacci(4), ==, 3);
-    munit_assert_int(fibonacci(5), ==, 5);
-    munit_assert_int(fibonacci(10), ==, 55);
-
-    return MUNIT_OK;
-}
-
-static MunitResult
-test_fibonacci_negative(const MunitParameter params[], void *data)
-{
-    (void) params;
-    (void) data;
-
-    munit_assert_int(fibonacci(-1), ==, -1);
-    munit_assert_int(fibonacci(-5), ==, -1);
-
-    return MUNIT_OK;
-}
-
-/************* TEST sum_is_odd() *************/
-
-static MunitResult
-test_sum_is_odd_basic(const MunitParameter params[], void *data)
-{
-    (void) params;
-    (void) data;
-
-    int a1[] = {1};
-    munit_assert_true(sum_is_odd(a1, 1) == true);
-
-    int a2[] = {2};
-    munit_assert_true(sum_is_odd(a2, 1) == false);
-
-    int a3[] = {1, 2, 3}; // сумма = 6
-    munit_assert_false(sum_is_odd(a3, 3));
-
-    int a4[] = {1, 2, 4}; // сумма = 7
-    munit_assert_true(sum_is_odd(a4, 3));
-
-    return MUNIT_OK;
-}
-
-static MunitResult
-test_sum_is_odd_edge_cases(const MunitParameter params[], void *data)
-{
-    (void) params;
-    (void) data;
-
-    munit_assert_false(sum_is_odd(NULL, 10));
-    munit_assert_false(sum_is_odd(NULL, -1));
-
-    int arr[] = {1};
-    munit_assert_false(sum_is_odd(arr, 0));
-
-    return MUNIT_OK;
-}
-
-/*************** suit ***************/
-
-#define TEST_ITEM(func) { #func, func, NULL, NULL, MUNIT_TEST_OPTION_NONE, NULL }
-
-static MunitTest test_suite_tests[] = {
-    TEST_ITEM(test_fibonacci_basic),
-    TEST_ITEM(test_fibonacci_negative),
-    TEST_ITEM(test_sum_is_odd_basic),
-    TEST_ITEM(test_sum_is_odd_edge_cases),
-
-    { NULL, NULL, NULL, NULL, MUNIT_TEST_OPTION_NONE, NULL }
-};
-
-static const MunitSuite test_suite = {
-    (char *) "",
-    test_suite_tests,
-    NULL,
-    1,
-    MUNIT_SUITE_OPTION_NONE
-};
-
-/********************** MAIN **********************/
-
-int
-main(int argc, const char *argv[])
-{
-    return munit_suite_main(&test_suite,
-                            (void *) "aux library test",
-                            argc,
-                            (char* const*) argv);
-}

str_bin.c

@@ -0,0 +1,21 @@
+#include <stdio.h>
+#include "str_lib.h"
+
+int
+main(int argc, const char *argv[])
+{
+	const char *s1 = "hello";
+	const char *s2 = "ello";
+
+	if (argc > 2) {
+		s1 = argv[1];
+		s2 = argv[2];
+	}
+
+	// binary for manual testing
+	printf("\033[1;30mUse str_test for actual testing\033[0m\n");
+
+	printf("mystrlen(\"%s\") == %d\n", s1, mystrlen(s1));
+	printf("str_idx(\"%s\", \"%s\") == %d\n", s1, s2, mystr_idx(s1, s2));
+	return 0;
+}

str_lib.c

@@ -0,0 +1,23 @@
+#include <string.h>
+
+/*
+ * Вернуть длину строки.
+ * Строки в C -- это массив символов, в конце которого находится нулевой символ ( '\0')
+ */
+int
+mystrlen(const char *s)
+{
+	// <YOURCODE>
+}
+
+/*
+ * Найти индекс, с которого строка s2 присутствует в строке s1
+ * или -1
+ */
+int
+mystr_idx(const char *s1, const char *s2)
+{
+	// <YOURCODE>
+	return -1;
+}
+

str_lib.h

@@ -0,0 +1,6 @@
+#pragma once
+
+int mystrlen(const char *s);
+
+int mystr_idx(const char *s1, const char *s2);
+

str_test.c

@@ -0,0 +1,67 @@
+#include <stdio.h>
+#include "munit.h"
+#include "str_lib.h"
+
+static MunitResult
+test_mystrlen(const MunitParameter params[], void * data)
+{
+	munit_assert_true(mystrlen("")  ==  0);
+	munit_assert_true(mystrlen("333")  ==  3);
+	munit_assert_true(mystrlen("helloworld")  ==  10);
+	return MUNIT_OK;
+}
+
+static MunitResult
+test_mystr_idx(const MunitParameter params[], void * data)
+{
+	munit_assert_true(mystr_idx("", "") == 0);
+	munit_assert_true(mystr_idx("h", "h") == 0);
+	munit_assert_true(mystr_idx("ah", "h") == 1);
+	munit_assert_true(mystr_idx("ah", "hh") == -1);
+	munit_assert_true(mystr_idx("ahh", "hh") == 1);
+	char  *cap = "London is the capital of Great Britan";
+	munit_assert_true(mystr_idx(cap, "python") == -1);
+	munit_assert_true(mystr_idx(cap, "London") == 0);
+	munit_assert_true(mystr_idx(cap, "o") == 1);
+	munit_assert_true(mystr_idx(cap, "is") == 7);
+	return MUNIT_OK;
+}
+
+static MunitResult
+test_mystr_idx_largestr(const MunitParameter params[], void * data)
+{
+	munit_assert_true(mystr_idx("", "LARGE STRING") == -1);
+	munit_assert_true(mystr_idx("ARGE_STRING", "LARGE STRING") == -1);
+	munit_assert_true(mystr_idx("ARGE STRING", "LARGE STRING") == -1);
+	munit_assert_true(mystr_idx("RGE STRING", "LARGE STRING") == -1);
+	return MUNIT_OK;
+}
+
+#define TEST_ITEM(func) {#func, func, NULL, NULL, MUNIT_TEST_OPTION_NONE }
+static MunitTest test_suite_tests[] = {
+	TEST_ITEM(test_mystrlen),
+
+	TEST_ITEM(test_mystr_idx),
+	TEST_ITEM(test_mystr_idx_largestr),
+	//TEST_ITEM(test_pvector_init),
+
+	{ NULL, NULL, NULL, NULL, MUNIT_TEST_OPTION_NONE, NULL }
+};
+
+
+static const MunitSuite test_suite = {
+	(char *) "",
+	test_suite_tests,
+	NULL,
+	1,
+	MUNIT_SUITE_OPTION_NONE
+};
+
+
+int
+main(int argc, const char *argv[])
+{
+	munit_suite_main(&test_suite, (void *) "string library test", argc, (char * const*) argv);
+	return 0;
+}
+