Add beginning of testing harness

Added the beginnings of a testing harness for Liszt. See the
'tests' directory for me. Needs a lot of work.

Author: scamacho23

CMakeLists.txt

@@ -1,5 +1,7 @@
 set(CMAKE_CXX_COMPILER "clang")
 
+set(CMAKE_BUILD_TYPE Debug)
+
 cmake_minimum_required(VERSION 3.10)
 
 project(lizst VERSION 1.1.8)

src/install.c

@@ -28,14 +28,14 @@ int makeFiles() {
 	// Make data_file.json
 	char dataFilePath[MAX_LENGTH];
 	strcpy(dataFilePath, tilde);
-	strcat(dataFilePath, "/.liszt/background/data_file.json");
+	strcat(dataFilePath, "/.liszt/background/data_file");
 	toCreate = fopen(dataFilePath, "w");
 	fclose(toCreate);
 	if (stat(dataFilePath, &st) == -1) {
 		printf("\033[1mLiszt\033[0m installation unsuccessful. Failed to install '%s'\n", dataFilePath);
 		printf("Please try again later.\n");
 		return -1;	
-	} else printf("Created ~/.liszt/background/data_file.json file\n");
+	} else printf("Created ~/.liszt/background/data_file file\n");
 
 	// Make default file
 	char defaultFilePath[MAX_LENGTH];

src/memory.c

@@ -156,20 +156,20 @@ void clearMemories() {
 	char prompt[] = "Are you sure you want to clear your memories on your current note? \033[1mThere is no going back (y/n): \033[0m";
 	char decision[50];
 	requestUserPermission(prompt, decision);
-	if (strcmp(decision, "y") == 0) {
+	if (!strcmp(decision, "y")) {
 		fclose(fopen(current_note_path, "w"));
 		printf("Memories cleared\n");
 	} else printf("Memory clearing aborted\n");	
+	free(note);
+	free(current_note_path);
 }
 
 
 void addMemory(char* args[], int numArgs) {
-	char* current_note_path;
-	char *note = getCurrentNote(&current_note_path);
-
+	char* current_note_path = getCurrentNotePath();
 	char *sans_first_word = parseUnaryArgs(args, numArgs);
 	if (sans_first_word == NULL) {
-		appendMemory(args[1], note);
+		appendMemory(args[1], current_note_path);
 		printf("Remembered '%s'\n", args[1]);
 	} else {
 		char memory[MAX_LENGTH];
@@ -179,10 +179,11 @@ void addMemory(char* args[], int numArgs) {
 		strcat(memory, " ");
 		strcat(memory, sans_first_word);
 
-		appendMemory(memory, note);
+		appendMemory(memory, current_note_path);
 		printf("Remembered '%s'\n", memory);
 	}
 	free(sans_first_word);
+	free(current_note_path);
 }
 
 
@@ -198,6 +199,8 @@ void listMemories() {
 	int numLines = getFileSize(note_path);
 	if (numLines == 0) {
 		printf("You have no memories on this note\n");
+		free(note_path);
+		free(note_name);
 		return;
 	}
 	printf("\033[1m\033[3mFound %d memories on '%s'\033[0m\n", numLines, note_name);
@@ -213,5 +216,7 @@ void listMemories() {
 	}	
 
 	fclose(toRead);
+	free(note_path);
+	free(note_name);
 }
 

src/note.c

@@ -283,10 +283,13 @@ void addNote(char* args[], int numArgs) {
 
 	result = makeNote(note_path);
 	if (result == -1) {
+		free(note);
+		free(note_path);
 		return;	
 	}
 	result = changeNoteHelper(note); 
 	printf("Added new note '%s'\n", note);
+	free(note);
 	free(note_path);
 }
 
@@ -459,11 +462,19 @@ int changeNoteHelper(char* note) {
 	// stop if the note to be changed to is the current note	
 	if (!strcmp(current_note_name, note)) {
 		printf("The note you are trying to change to is already the current note.\n");
+		free(current_note_path);
+		free(current_note_name);
+		free(data_file);
 		return -1;
 	}
 	// stop if the note to be changed to is 'default'
 	int result = checkDefault(note);
-	if (result == -1) return -1;
+	if (result == -1) {
+		free(current_note_path);
+		free(current_note_name);
+		free(data_file);
+		return -1;
+	}
 
 	struct stat st = {0};
 
@@ -472,10 +483,14 @@ int changeNoteHelper(char* note) {
 
 	if (stat(note_path, &st) == -1) {
 		printf("Hmmm. The note you entered doesn't seem to exist. Please try again.\n");
+		free(current_note_path);
+		free(current_note_name);
+		free(data_file);
+		free(note_path);
 		return -1;
 	}	
 
-	if (strcmp(current_note_name, "default") == 0) {
+	if (!strcmp(current_note_name, "default")) {
 		int numMemories = getFileSize(current_note_path);
 		if (numMemories > 0) {
 			char new_note[MAX_LENGTH];
@@ -487,7 +502,14 @@ int changeNoteHelper(char* note) {
 				char *new_note_path = getNotePath(dirName, new_note);
 
 				result = makeNote(new_note_path);
-				if (result == -1) return -1;
+				if (result == -1) { 
+					free(current_note_path);
+					free(current_note_name);
+					free(data_file);
+					free(note_path);
+					free(new_note_path);
+					return -1;
+				}
 				copyFile(current_note_path, new_note_path);
 				// the following is for clearing 'default'
 				FILE* toClear = fopen(current_note_path, "w");
@@ -500,6 +522,7 @@ int changeNoteHelper(char* note) {
 	free(note_path);
 	free(current_note_path);
 	free(current_note_name);
+	free(data_file);
 	return 0;
 }
 

src/util.c

@@ -52,27 +52,32 @@ char *getCurrentNote(char **current_note_path) {
 	return current_note_name;
 }	
 
+
 char *getCurrentNotePath() {
 	char *data_file = getDataFile();
 
-	FILE *toRead;
-	toRead = fopen(data_file, "r");
-	char line[MAX_LENGTH];
-	char dataStream[MAX_LENGTH];
+	FILE *to_read;
+	to_read = fopen(data_file, "r");
+	//char dataStream[MAX_LENGTH];
 
-	fgets(line, sizeof(line), toRead);
-	strcpy(dataStream, line);
-	while (fgets(line, sizeof(line), toRead)) {
+	//fgets(line, sizeof(line), toRead);
+	//strcpy(dataStream, line);
+	char line[MAX_LENGTH];
+	char *current_note_path = strdup(fgets(line, MAX_LENGTH * sizeof(char), to_read));
+	/*
+	while (fgets(line, MAX_LENGTH * sizeof(char), toRead)) {
 		strcat(dataStream, line);
 	}	
 	fclose(toRead);
 
 	cJSON *data = cJSON_Parse(dataStream);
 	cJSON *currentNote = cJSON_GetObjectItem(data, "current_note");
 	char *current_note_path = cJSON_PrintUnformatted(currentNote);
-	current_note_path[strlen(current_note_path) + 1] = '\0';
-	cJSON_Delete(data);
+	*/
+	current_note_path[strlen(current_note_path)] = '\0'; // to get rid of the newline
+	//cJSON_Delete(data);
 	free(data_file);
+	fclose(to_read);
 	return current_note_path;
 }
 
@@ -104,7 +109,7 @@ void setToDefault() {
 
 
 char *getDataFile() {
-	return getNotePath("background", "data_file.json");
+	return getNotePath("background", "data_file");
 }
 
 
@@ -201,26 +206,27 @@ long checkRow(char *filename, char *char_row) {
  	return row;
 }
 
-
+// the following this screwed up (intentionally)
+// needs to be fixed for the purpose of adding collections
 void overwriteFilenameToDataFile(char *filename, char *dirname) {
 	// get path to data_file.json
 	char *data_file = getDataFile();
 
-	cJSON *data = cJSON_CreateObject();
-	cJSON *note = cJSON_CreateString(filename);
-	cJSON_AddItemToObject(data, "current_note", note);
+	//cJSON *data = cJSON_CreateObject();
+	//cJSON *note = cJSON_CreateString(filename);
+	//cJSON_AddItemToObject(data, "current_note", note);
 
-	cJSON *collection = cJSON_CreateString(dirname);
-	cJSON_AddItemToObject(data, "current_collection", collection);
+	//cJSON *collection = cJSON_CreateString(dirname);
+	//cJSON_AddItemToObject(data, "current_collection", collection);
 
-	char *stringJSON = cJSON_Print(data);
+	//char *stringJSON = cJSON_Print(data);
 
 	FILE *toWrite;
 	toWrite = fopen(data_file, "w");
-	fprintf(toWrite, "%s", stringJSON);
+	fprintf(toWrite, "%s", filename);
 	fclose(toWrite);
 
-	cJSON_Delete(data);
+	//cJSON_Delete(data);
 	free(data_file);
 
 }
@@ -232,6 +238,7 @@ void writeFilenameToDataFile(char *filename) {
 
 	// open data_file and read contents into dataStream
 	// should be decomposed
+/*
 	FILE *toRead;
 	toRead = fopen(data_file, "r");
 	char line[MAX_LENGTH];
@@ -252,13 +259,14 @@ void writeFilenameToDataFile(char *filename) {
 	cJSON_ReplaceItemInObjectCaseSensitive(data, "current_note", file);
 
 	char *newStream = cJSON_Print(data);
+*/
 
 	FILE *toWrite;
 	toWrite = fopen(data_file, "w");
-	fprintf(toWrite, "%s", newStream);
+	fprintf(toWrite, "%s", filename);
 	fclose(toWrite);
 
-	cJSON_Delete(data);
+//	cJSON_Delete(data);
 	free(data_file);
 }
 
@@ -355,8 +363,7 @@ int makeNote(char *filePath) {
 		printf("A note with this name already exists. Please choose a different name, delete the other note, or rename the other note.\n");
 		return -1;
 	}
-	FILE *toCreate;
-	toCreate = fopen(filePath, "w");
+	FILE *toCreate = fopen(filePath, "w");
 	fclose(toCreate);
 	return 0;
 }

src/util.h

@@ -1,9 +1,9 @@
-#ifndef HELPER_FUNC_H
-#define HELPER_FUNC_H
+#ifndef UTIL_H
+#define UTIL_H
 /*
  * This file contains function declarations 
  * for helper functions for the Liszt project.
- * See helper_func.c for the definitions.
+ * See util.c for the definitions.
  */
 
 

tests/note_tests.c

@@ -0,0 +1,81 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "note_tests.h"
+#include "test_counter.h"
+
+void test_add_note(test_counter_t *count) {
+	char *expected = "Added new note 'random'\n";
+	system("../lst -a random > test");
+
+	FILE *fp = fopen("test", "r");
+	char line[MAX_LINE_LEN];
+	fgets(line, MAX_LINE_LEN * sizeof(char), fp);
+
+	if (strcmp(expected, line)) {
+		printf("%s%sERROR%s: %s\n", BOLD, RED, RESET, line);	
+		printf("%sEXPECTED:%s %s\n", BOLD, RESET, expected);
+	} else {
+		printf("%s%sPASS%s: %s", BOLD, BLUE, RESET, expected);
+		(count->num_tests_passed)++;
+	}
+	fclose(fp);
+	(count->total_tests)++;
+}
+
+void test_listing_notes(test_counter_t *count) {
+/*
+	char expected[MAX_LINE_LEN];
+
+	scandir
+
+	fclose(fp);
+	strcpy(expected, BOLD);
+	strcat(expected, ITALICS);
+	strcat(expected, "Found 1 memories on '");
+	strcat(expected, line);
+	strcat(expected, "'");
+	strcat(expected, RESET);
+	strcat(expected, "\n");
+	strcat(expected, BOLD);
+	strcat(expected, "1.");
+	strcat(expected, RESET);
+	strcat(expected, " trying to add a sentence with multiple words\n");
+	system("../lst -l > test");
+	fp = fopen("test", "r");
+	char multi_lines[MAX_LINE_LEN * 2];
+	strcpy(multi_lines, fgets(line, MAX_LINE_LEN * sizeof(char), fp));
+	strcat(multi_lines, fgets(line, MAX_LINE_LEN * sizeof(char), fp));
+	if (strcmp(expected, multi_lines)) {
+		printf("%s%sERROR%s: %s\n", BOLD, RED, RESET, multi_lines);	
+		printf("%sEXPECTED:%s %s\n", BOLD, RESET, expected);
+	} else {
+		printf("%s%sPASS%s: %s", BOLD, BLUE, RESET, expected);
+		(count->num_tests_passed)++;
+	}
+	(count->total_tests)++;
+	fclose(fp);
+*/
+}
+
+
+/*
+void test_removing_thoughts(test_counter_t *count) {
+	char *expected = "Removed memory 'trying to add a sentence with multiple words'\n";
+	char line[MAX_LINE_LEN];
+	system("../lst -r 1 > test");
+
+	FILE *fp = fopen("test", "r");
+	fgets(line, MAX_LINE_LEN * sizeof(char), fp);
+
+	if (strcmp(expected, line)) {
+		printf("%s%sERROR%s: %s\n", BOLD, RED, RESET, line);	
+		printf("%sEXPECTED:%s %s\n", BOLD, RESET, expected);
+	} else {
+		printf("%s%sPASS%s: %s", BOLD, BLUE, RESET, expected);
+		(count->num_tests_passed)++;
+	}
+	fclose(fp);
+	(count->total_tests)++;
+}
+*/