Implement testing for Multiclass_longdesc and Multiclass_shortdesc

include/playerclass/multiclass.h

@@ -1,3 +1,4 @@
+
 /*
  * Enables multiclass functionality
 */
@@ -47,4 +48,9 @@ class_t* multiclass(class_t* base_class, class_t* second_class, char* name);
  */
 int has_component_class(class_t* class, char* name);
 
+/* these are only here so it can be included in testing. They should be ignored
+   if you are viewing this module to learn about the code */
+char* multiclass_shortdesc(class_t* base_class, class_t* second_class, int *succ);
+char* multiclass_longdesc(class_t* base_class, class_t* second_class, int *succ);
+
 #endif /* MULTICLASS_H */

src/playerclass/src/multiclass.c

@@ -27,21 +27,77 @@
  * Returns:
  *  - a pointer to a string with the new shortdesc.
  */
-char* multiclass_shortdesc(class_t* base_class, class_t* second_class) {
+char* multiclass_shortdesc(class_t* base_class, class_t* second_class, int *succ) {
+
+    int num_multiclass = base_class->num_parent_class + second_class->num_parent_class;
+
     char* new_shortdesc = (char*) malloc(MAX_SHORT_DESC_LEN + 1);
-    strncat(new_shortdesc, "Multiclass of ", 15);
+    *succ = SUCCESS;
+    int len = 0;
+
+    if ((strstr(base_class->name, "Multiclass of ") == NULL)){
+      len += 14;
+    }
+    len += strlen(base_class->name);
+    if (num_multiclass == 2){
+        len += 2;
+    } else{
+        len += 5;
+    }
+    len += strlen(second_class->name);
+    for (int i = 0; i < base_class->num_parent_class; i++) {
+        if(i == base_class->num_parent_class - 1 && second_class->num_parent_class == 0){
+            len += 5;
+        } else{
+            len += 2;
+        }
+        len += strlen(base_class->parent_class_names[i]);
+    }
+    for (int i = 0; i < second_class->num_parent_class - 1; i++) {
+        if(i == second_class->num_parent_class - 1){
+            len += 5;
+        } else{
+            len += 2;
+        }
+        len += strlen(second_class->parent_class_names[i]);
+    }
+    len += 1;
+
+    if (len > MAX_SHORT_DESC_LEN + 1) {
+        fprintf(stderr, "multiclass_shortdesc: Shortdesc longer than max length, second shortdesc not appended");
+        *succ = FAILURE;
+        return base_class->shortdesc;
+    }
+
+    if ((strstr(base_class->name, "Multiclass of ") == NULL)){
+      strncat(new_shortdesc, "Multiclass of ", 15);
+    }
     strncat(new_shortdesc, base_class->name, strlen(base_class->name));
-    strncat(new_shortdesc, ", ", 3);
+    if (num_multiclass == 2){
+        strncat(new_shortdesc, ", ", 3);
+    } else{
+        strncat(new_shortdesc, " and ", 6);
+    }
     strncat(new_shortdesc, second_class->name, strlen(second_class->name));
     for (int i = 0; i < base_class->num_parent_class; i++) {
-        strncat(new_shortdesc, ", ", 3);
+        if(i == base_class->num_parent_class - 1 && second_class->num_parent_class == 0){
+            strncat(new_shortdesc, " and ", 6);
+        } else{
+            strncat(new_shortdesc, ", ", 3);
+        }
         strncat(new_shortdesc, base_class->parent_class_names[i], strlen(base_class->parent_class_names[i]));
     }
-    for (int i = 0; i < second_class->num_parent_class; i++) {
-        strncat(new_shortdesc, ", ", 3);
+    for (int i = 0; i < second_class->num_parent_class - 1; i++) {
+        if(i == second_class->num_parent_class - 1){
+            strncat(new_shortdesc, " and ", 6);
+        } else{
+            strncat(new_shortdesc, ", ", 3);
+        }
         strncat(new_shortdesc, second_class->parent_class_names[i], strlen(second_class->parent_class_names[i]));
     }
+
     strncat(new_shortdesc, ".", 2);
+
     return new_shortdesc;
 }
 
@@ -56,11 +112,21 @@ char* multiclass_shortdesc(class_t* base_class, class_t* second_class) {
  * Returns:
  *  - a pointer to a string with the new longdesc.
  */
-char* multiclass_longdesc(class_t* base_class, class_t* second_class) {
+char* multiclass_longdesc(class_t* base_class, class_t* second_class, int *succ) {
     char* new_longdesc = (char*) calloc(MAX_LONG_DESC_LEN + 1, sizeof(char));
+    *succ = SUCCESS;
+    int len = 0;
     strncat(new_longdesc, base_class->shortdesc, strlen(base_class->shortdesc));
     strncat(new_longdesc, "\n\n", 3);
     strncat(new_longdesc, second_class->shortdesc, strlen(second_class->shortdesc));
+    len += strlen(base_class->shortdesc) + 2 + strlen(second_class->shortdesc);
+
+    if (len > MAX_LONG_DESC_LEN + 1) {
+        fprintf(stderr, "multiclass_longdesc: Longdesc longer than max length, second longdesc not appended");
+        *succ = FAILURE;
+        return base_class->longdesc;
+    }
+
     return new_longdesc;
 }
 
@@ -187,6 +253,9 @@ skill_inventory_t* multiclass_inventory(skill_inventory_t* base_inventory, skill
     /* Calculate new inventory sizes */
     unsigned int max_active;
     unsigned int max_passive;
+    if (base_max_active == 0 && base_max_passive == 0) {
+        return base_inventory;
+    }
     if (base_max_active >= second_max_active) {
         max_active = base_max_active;
     }
@@ -244,8 +313,9 @@ obj_t* multiclass_attributes(obj_t* base_attributes, obj_t* second_attributes, c
 
 /* See multiclass.h */
 class_t* multiclass(class_t* base_class, class_t* second_class, char* name) {
-    char* new_shortdesc = multiclass_shortdesc(base_class, second_class);
-    char* new_longdesc = multiclass_longdesc(base_class, second_class);
+    int shortdesc_succ, longdesc_succ;
+    char* new_shortdesc = multiclass_shortdesc(base_class, second_class, &shortdesc_succ);
+    char* new_longdesc = multiclass_longdesc(base_class, second_class, &longdesc_succ);
     obj_t* combined_attr = multiclass_attributes(base_class->attributes, second_class->attributes, name);
     effects_hash_t* combined_effects = multiclass_effects(base_class->effects, second_class->effects);
 
@@ -287,4 +357,4 @@ int has_component_class(class_t* class, char* name) {
         }
     }
     return 0;
-}
+}

tests/playerclass/CMakeLists.txt

@@ -3,6 +3,7 @@ set(TEST_EXE test-playerclass)
 add_executable(${TEST_EXE}
         test_class.c
         test_class_item.c
+        test_multiclass.c
         test_class_prefabs.c
         main.c)
 

tests/playerclass/test_class_prefabs.c

@@ -45,7 +45,7 @@ chiventure_ctx_t* init_statless_context() {
 }
 
 /* Checks whether the class and its basic fields are not null */
-void check_field_presence(class_t* c) 
+void check_field_pressence(class_t* c) 
 {
     cr_assert_not_null(c, "failed to be initialized (NULL)");
     cr_assert_not_null(c->name, "failed to initialize name");
@@ -69,7 +69,7 @@ void check_field_presence(class_t* c)
 
 /* Checks whether skill fields are present, and whether the initialized skills 
  * match the expected list */
-void check_skill_presence(class_t* c, int num_skills, char** names) 
+void check_skill_pressence(class_t* c, int num_skills, char** names) 
 {
     cr_assert_not_null(c->skilltree, "failed to initialize skilltree");
     cr_assert_not_null(c->starting_skills, "failed to initialize skill inventory");
@@ -84,14 +84,14 @@ Test(class_prefabs, Bard) {
 
     /* Tests if we can find the name even if its case is wrong */
     class_t *c = class_prefab_new(ctx->game, "BARD");
-    check_field_presence(c);
+    check_field_pressence(c);
 
     cr_assert_eq(get_stat_current(c->base_stats, "max_health"), 15, "failed to initialize stat");
 
     class_prefab_add_skills(c);
 
     char* skill_list[] = {"Magic Word", "Poetic Line", "Enchanted Stanza"};
-    check_skill_presence(c, 3, skill_list);
+    check_skill_pressence(c, 3, skill_list);
 
     cr_assert_str_eq(c->starting_skills->active[0]->name, "Magic Word", "failed to initialize skill inventory");
 }
@@ -101,14 +101,14 @@ Test(class_prefabs, Monk) {
     chiventure_ctx_t* ctx = init_statless_context();
 
     class_t *c = class_prefab_new(ctx->game, "monk");
-    check_field_presence(c);
+    check_field_pressence(c);
 
     cr_assert_eq(get_stat_current(c->base_stats, "max_health"), 25, "failed to initialize stat");
 
     class_prefab_add_skills(c);
 
     char* skill_list[] = {"Acrobatic Powers", "Spirit of Strength", "Supernova Circle"};
-    check_skill_presence(c, 3, skill_list);
+    check_skill_pressence(c, 3, skill_list);
 
     cr_assert_str_eq(c->starting_skills->active[0]->name, "Acrobatic Powers", "failed to initialize skill inventory");
 }
@@ -118,14 +118,14 @@ Test(class_prefabs, Ranger) {
     chiventure_ctx_t* ctx = init_statless_context();
 
     class_t *c = class_prefab_new(ctx->game, "ranger");
-    check_field_presence(c);
+    check_field_pressence(c);
 
     cr_assert_eq(get_stat_current(c->base_stats, "max_health"), 10, "failed to initialize stat");
 
     class_prefab_add_skills(c);
 
     char* skill_list[] = {"Close Shot", "Mid-range Shot", "Long Shot"};
-    check_skill_presence(c, 3, skill_list);
+    check_skill_pressence(c, 3, skill_list);
 
     cr_assert_str_eq(c->starting_skills->active[0]->name, "Close Shot", "failed to initialize skill inventory");
 }
@@ -135,14 +135,14 @@ Test(class_prefabs, Rogue) {
     chiventure_ctx_t* ctx = init_statless_context();
 
     class_t *c = class_prefab_new(ctx->game, "rogue");
-    check_field_presence(c);
+    check_field_pressence(c);
 
     cr_assert_eq(get_stat_current(c->base_stats, "max_health"), 10, "failed to initialize stat");
 
     class_prefab_add_skills(c);
 
     char* skill_list[] = {"Quick Hit", "Backstab", "Leg Swipe"};
-    check_skill_presence(c, 3, skill_list);
+    check_skill_pressence(c, 3, skill_list);
 
     cr_assert_str_eq(c->starting_skills->active[0]->name, "Quick Hit", "failed to initialize skill inventory");
 }
@@ -156,15 +156,15 @@ Test(class_prefabs, Warrior) {
 
     /* Note that the name is always stored lowercase. */
     class_t *c = class_prefab_new(ctx->game, "Warrior");
-    check_field_presence(c);
+    check_field_pressence(c);
 
     cr_assert_eq(get_stat_current(c->base_stats, "max_health"), 20, "failed to initialize previously declared stat");
     cr_assert_eq(get_stat_current(c->base_stats, "speed"), 15, "failed to initialize new stat");
 
     class_prefab_add_skills(c);
 
     char* skill_list[] = {"Sword Slash", "Double Slash", "Triple Slash"};
-    check_skill_presence(c, 3, skill_list);
+    check_skill_pressence(c, 3, skill_list);
 
     cr_assert_str_eq(c->starting_skills->active[0]->name, "Sword Slash", "failed to initialize skill inventory");
 }
@@ -175,14 +175,14 @@ Test(class_prefabs, Wizard) {
     chiventure_ctx_t* ctx = init_statless_context();
 
     class_t *c = class_prefab_new(ctx->game, "WIZARD");
-    check_field_presence(c);
+    check_field_pressence(c);
 
     cr_assert_eq(get_stat_current(c->base_stats, "max_health"), 10, "failed to initialize stat");
 
     class_prefab_add_skills(c);
 
     char* skill_list[] = {"Blinding Charm", "Paralyze Spell", "Arcane Explosion"};
-    check_skill_presence(c, 3, skill_list);
+    check_skill_pressence(c, 3, skill_list);
 
     cr_assert_str_eq(c->starting_skills->active[0]->name, "Blinding Charm", "failed to initialize skill inventory");
 }
@@ -193,14 +193,14 @@ Test(class_prefabs, Druid) {
     chiventure_ctx_t* ctx = init_statless_context();
 
     class_t *c = class_prefab_new(ctx->game, "druid");
-    check_field_presence(c);
+    check_field_pressence(c);
 
     cr_assert_eq(get_stat_current(c->base_stats, "max_health"), 15, "failed to initialize stat");
 
     class_prefab_add_skills(c);
 
     char* skill_list[] = {"frostbite", "control flames", "flame blade"};
-    check_skill_presence(c, 3, skill_list);
+    check_skill_pressence(c, 3, skill_list);
 
     cr_assert_str_eq(c->starting_skills->active[0]->name, "frostbite", "failed to initialize skill inventory");
 }
@@ -210,14 +210,14 @@ Test(class_prefabs, Elementalist) {
     chiventure_ctx_t* ctx = init_statless_context();
 
     class_t *c = class_prefab_new(ctx->game, "elementalist");
-    check_field_presence(c);
+    check_field_pressence(c);
 
     cr_assert_eq(get_stat_current(c->base_stats, "max_health"), 20, "failed to initialize stat");
 
     class_prefab_add_skills(c);
 
     char* skill_list[] = {"stone shards", "arc lightning", "dragon's tooth"};
-    check_skill_presence(c, 3, skill_list);
+    check_skill_pressence(c, 3, skill_list);
 
     cr_assert_str_eq(c->starting_skills->active[0]->name, "stone shards", "failed to initialize skill inventory");
 }
@@ -228,14 +228,14 @@ Test(class_prefabs, Knight) {
     chiventure_ctx_t* ctx = init_statless_context();
 
     class_t *c = class_prefab_new(ctx->game, "knight");
-    check_field_presence(c);
+    check_field_pressence(c);
 
     cr_assert_eq(get_stat_current(c->base_stats, "max_health"), 40, "failed to initialize stat");
 
     class_prefab_add_skills(c);
 
     char* skill_list[] = {"holy strike", "shield strike", "shackle strike"};
-    check_skill_presence(c, 3, skill_list);
+    check_skill_pressence(c, 3, skill_list);
 
     cr_assert_str_eq(c->starting_skills->active[0]->name, "holy strike", "failed to initialize skill inventory");
 } 
@@ -245,14 +245,14 @@ Test(class_prefabs, Sorceror) {
     chiventure_ctx_t* ctx = init_statless_context();
 
     class_t *c = class_prefab_new(ctx->game, "sorceror");
-    check_field_presence(c);
+    check_field_pressence(c);
 
     cr_assert_eq(get_stat_current(c->base_stats, "max_health"), 15, "failed to initialize stat");
 
     class_prefab_add_skills(c);
 
     char* skill_list[] = {"dark magic", "moon storm", "gates of rashonmon"};
-    check_skill_presence(c, 3, skill_list);
+    check_skill_pressence(c, 3, skill_list);
 
     cr_assert_str_eq(c->starting_skills->active[0]->name, "dark magic", "failed to initialize skill inventory");
 }