File operations finished

Author: MathRPG

src/article.c

@@ -81,16 +81,28 @@ bool articles_are_equal(const Article_t* const a, const Article_t* const b)
 
 void display_article(const Article_t* article, FILE* out)
 {
-	fprintf(out, "O email de %s eh %s\n", article->doi, article->title);
+	fprintf(out,
+			"\tDOI: %s\n"
+			"\tTitle: %s\n"
+			"\tAuthor: %s\n"
+			"\tYear: %u\n",
+			article->doi, article->title, article->author, article->year);
+}
+
+void read_line_to(FILE* in, char* const target)
+{
+	fscanf(in, "%[^\n]s", target);
+	fgetc(in);
 }
 
 Article_t* article_from_file(FILE* in)
 {
-	Article_t * empty_article = make_article("", "", "", 0);
+	Article_t* empty_article = make_article("", "", "", 0);
+
+	read_line_to(in, empty_article->doi);
+	read_line_to(in, empty_article->title);
+	read_line_to(in, empty_article->author);
 
-	fscanf(in, "%s\n", empty_article->doi);
-	fscanf(in, "%s\n", empty_article->title);
-	fscanf(in, "%s\n", empty_article->author);
 	fscanf(in, "%u\n", &empty_article->year);
 
 	return empty_article;

src/main.c

@@ -218,13 +218,13 @@ void test_hash_table_file_operations_empty_table()
 	HashTable_t* ht = ht_new();
 
 	// Dumping empty hash table
-	FILE* fp = fopen("hash.bin", "wb");
+	FILE* fp = fopen("hash.bin", "w");
 	ht_dump(ht, fp);
 
 	ht_delete(ht);
 
 	// Reading ht from same file
-	freopen("hash.bin", "rb+", fp);
+	freopen("hash.bin", "r", fp);
 	ht = ht_from_file(fp);
 
 	// Make sure it's an empty hash table
@@ -240,12 +240,12 @@ void test_hash_table_file_operations_resized_table()
 {// Can dump/read resized ht
 	HashTable_t* ht = ht_new();
 	unsigned long resized_capacity = ht_capacity(ht) + 1;
-	FILE* fp = fopen("hash.bin", "wb");
+	FILE* fp = fopen("hash.bin", "w");
 
 	ht_resize(ht, resized_capacity);
 	ht_dump(ht, fp);
 
-	freopen("hash.bin", "rb", fp);
+	freopen("hash.bin", "r", fp);
 	ht_delete(ht);
 	ht = ht_from_file(fp);
 
@@ -261,12 +261,12 @@ void test_hash_table_file_operations_one_article()
 	HashTable_t* ht = ht_new();
 	const char* const a_key = "DOI";
 	Article_t* const a = make_article(a_key, "Title", "Author", 2000);
-	FILE* fp = fopen("hash.bin", "wb");
+	FILE* fp = fopen("hash.bin", "w");
 
 	ht_insert(ht, a);
 	ht_dump(ht, fp);
 
-	freopen("hash.bin", "rb+", fp);
+	freopen("hash.bin", "r", fp);
 	ht_delete(ht);
 	ht = ht_from_file(fp);
 
@@ -282,37 +282,51 @@ void test_hash_table_file_operations_one_article()
 	ht_delete(ht);
 }
 
-void test_hash_table_file_operations()
+void test_hash_table_file_operations_two_articles()
 {
-	test_hash_table_file_operations_empty_table();
-	test_hash_table_file_operations_resized_table();
-	test_hash_table_file_operations_one_article();
-
 	HashTable_t* ht = ht_new();
-	const char* const a_key = "DOI";
-	const char* const b_key = "Other_DOI";
-	Article_t* const a = make_article(a_key, "Title", "Author", 2000);
-	Article_t* const b = make_article(b_key, "Title", "Author", 2000);
-	FILE* fp = fopen("hash.bin", "wb");
+	const char* const a_key = "DOI_without_spaces";
+	const char* const b_key = "DOI with spaces";
+	Article_t* const a = make_article(a_key, "Title with spaces", "Author", 2000);
+	Article_t* const b = make_article(b_key, "Title_without_spaces", "Author with spaces", 2000);
+	FILE* fp = fopen("hash.bin", "w");
 
 	ht_insert(ht, a);
 	ht_insert(ht, b);
 	ht_dump(ht, fp);
 	ht_delete(ht);
 
-	freopen("hash.bin", "rb", fp);
+	freopen("hash.bin", "r", fp);
 	ht = ht_from_file(fp);
 
 	assert(ht_is_empty(ht) == false);
 	assert(ht_count(ht) == 2);
 
+	assert(ht_contains(ht, a_key) == true);
+	const Article_t* fetched = ht_fetch(ht, a_key);
+	assert(fetched != NULL);
+	assert(articles_are_equal(a, fetched));
+
+	assert(ht_contains(ht, b_key) == true);
+	fetched = ht_fetch(ht, b_key);
+	assert(fetched != NULL);
+	assert(articles_are_equal(b, fetched));
+
 	debug("Can dump ht with two articles");
 
 	delete_article(a);
 	delete_article(b);
 	ht_delete(ht);
 }
 
+void test_hash_table_file_operations()
+{
+	test_hash_table_file_operations_empty_table();
+	test_hash_table_file_operations_resized_table();
+	test_hash_table_file_operations_one_article();
+	test_hash_table_file_operations_two_articles();
+}
+
 void print_test_status()
 {
 	if (global_failure)