clean up section and course tests

Author: SoggyRhino

parser/courseParser.go

@@ -12,8 +12,10 @@ import (
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
-var coursePrefixRexp *regexp.Regexp = utils.Regexpf(`^%s`, utils.R_SUBJ_COURSE_CAP)
-var contactRegexp *regexp.Regexp = regexp.MustCompile(`\(([0-9]+)-([0-9]+)\)\s+([SUFY]+)`)
+var (
+	coursePrefixRexp *regexp.Regexp = utils.Regexpf(`^%s`, utils.R_SUBJ_COURSE_CAP)
+	contactRegexp    *regexp.Regexp = regexp.MustCompile(`\(([0-9]+)-([0-9]+)\)\s+([SUFY]+)`)
+)
 
 func parseCourse(courseNum string, session schema.AcademicSession, rowInfo map[string]*goquery.Selection, classInfo map[string]string) *schema.Course {
 	// Courses are internally keyed by their internal course number and the catalog year they're part of
@@ -37,7 +39,7 @@ func parseCourse(courseNum string, session schema.AcademicSession, rowInfo map[s
 	return course
 }
 
-// getCourse builds and returns a new course from the provided arguments, no global state is changed
+// no global state is changed
 func getCourse(courseNum string, session schema.AcademicSession, rowInfo map[string]*goquery.Selection, classInfo map[string]string) *schema.Course {
 	CoursePrefix, CourseNumber := getPrefixAndNumber(classInfo)
 

parser/courseParser_test.go

@@ -87,6 +87,27 @@ func TestGetPrefixAndCourseNum(t *testing.T) {
 			prefix: "ENTP",
 			number: "3301",
 		},
+		"Case_003": {
+			classInfo: map[string]string{
+				"Class Section:": "Garbage In, Garbage out",
+			},
+			prefix: "",
+			number: "",
+		},
+		"Case_004": {
+			classInfo: map[string]string{
+				"Class Section:": "ENTP33S",
+			},
+			prefix: "",
+			number: "",
+		},
+		"Case_005": {
+			classInfo: map[string]string{
+				"Class Section:": "",
+			},
+			prefix: "",
+			number: "",
+		},
 	}
 
 	for name, testCase := range testCases {
@@ -100,6 +121,5 @@ func TestGetPrefixAndCourseNum(t *testing.T) {
 				t.Errorf("expected %s got %s", testCase.number, number)
 			}
 		})
-
 	}
 }

parser/sectionParser_test.go

@@ -11,14 +11,18 @@ func TestGetInternalClassAndCourseNum(t *testing.T) {
 
 	for name, testCase := range testDataCache {
 		t.Run(name, func(t *testing.T) {
-			classNum, _ := getInternalClassAndCourseNum(testCase.ClassInfo)
+			classNum, courseNum := getInternalClassAndCourseNum(testCase.ClassInfo)
 			expectedClassNum := testCase.Section.Internal_class_number
+			expectedCourseNumber := testCase.Course.Internal_course_number
 
-			diff := cmp.Diff(expectedClassNum, classNum)
+			if classNum != expectedClassNum {
+				t.Errorf("Class Number: expected %s got %s", expectedClassNum, classNum)
+			}
 
-			if diff != "" {
-				t.Errorf("Failed (-expected +got)\n %s", diff)
+			if courseNum != expectedCourseNumber {
+				t.Errorf("Class Number: expected %s got %s", expectedCourseNumber, courseNum)
 			}
+
 		})
 	}
 }
@@ -48,10 +52,8 @@ func TestGetSectionNumber(t *testing.T) {
 			output := getSectionNumber(testCase.ClassInfo)
 			expected := testCase.Section.Section_number
 
-			diff := cmp.Diff(expected, output)
-
-			if diff != "" {
-				t.Errorf("Failed (-expected +got)\n %s", diff)
+			if output != expected {
+				t.Errorf("expected %s got %s", expected, output)
 			}
 		})
 
@@ -66,20 +68,10 @@ func TestGetTeachingAssistants(t *testing.T) {
 			output := getTeachingAssistants(testCase.RowInfo)
 			expected := testCase.Section.Teaching_assistants
 
-			if len(output) != len(expected) {
-				t.Errorf("expected %d assistants got %d", len(expected), len(output))
-				return
-			}
-
-			for i, assistant := range output {
-				expectedAssistant := expected[i]
-
-				diff := cmp.Diff(expectedAssistant, assistant)
-
-				if diff != "" {
-					t.Errorf("Failed (-expected +got)\n %s", diff)
-				}
+			diff := cmp.Diff(expected, output)
 
+			if diff != "" {
+				t.Errorf("Failed (-expected +got)\n %s", diff)
 			}
 		})
 	}
@@ -93,10 +85,8 @@ func TestGetInstructionMode(t *testing.T) {
 			output := getInstructionMode(testCase.ClassInfo)
 			expected := testCase.Section.Instruction_mode
 
-			diff := cmp.Diff(expected, output)
-
-			if diff != "" {
-				t.Errorf("Failed (-expected +got)\n %s", diff)
+			if output != expected {
+				t.Errorf("expected %s got %s", expected, output)
 			}
 		})
 
@@ -111,19 +101,10 @@ func TestGetMeetings(t *testing.T) {
 			output := getMeetings(testCase.RowInfo)
 			expected := testCase.Section.Meetings
 
-			if len(output) != len(expected) {
-				t.Errorf("expected %d meetings got %d", len(expected), len(output))
-				return
-			}
-
-			for i, meeting := range output {
-				expectedMeeting := expected[i]
-
-				diff := cmp.Diff(meeting, expectedMeeting)
+			diff := cmp.Diff(expected, output)
 
-				if diff != "" {
-					t.Errorf("Failed (-expected +got)\n %s", diff)
-				}
+			if diff != "" {
+				t.Errorf("Failed (-expected +got)\n %s", diff)
 			}
 		})
 	}
@@ -154,10 +135,8 @@ func TestGetSyllabusUri(t *testing.T) {
 			output := getSyllabusUri(testCase.RowInfo)
 			expected := testCase.Section.Syllabus_uri
 
-			diff := cmp.Diff(expected, output)
-
-			if diff != "" {
-				t.Errorf("Failed (-expected +got)\n %s", diff)
+			if output != expected {
+				t.Errorf("expected %s got %s", expected, output)
 			}
 		})