commit cc606191722306f1de0e0cb61d10bffb6dd0c162
author Nan Zhou <nanzhoumails@gmail.com> Tue Jun 21 17:47:19 2022 +0000
committer Ed Tanous <ed@tanous.net> Fri Jun 24 23:14:47 2022 +0000
tree c47af7c527cb7fa823dce35c6cea7d326fdf90e9
parent e52d156ca13d37b63841592b7180e459aae8d710

multipart_test: use ASSERT_EQ correctly

It makes sense to use ASSERT_EQ for the |parse| function, but not every
attribute for the parsed results.

Tested: unit test passes.

Reference:
https://testing.googleblog.com/2008/07/tott-expect-vs-assert.html

Signed-off-by: Nan Zhou <nanzhoumails@gmail.com>
Change-Id: I27629eb8d721d7e62c82fdb7afbf4698546f0bdb

include/ut/multipart_test.cpp

diff --git a/include/ut/multipart_test.cpp b/include/ut/multipart_test.cpp
index aa55d02..154f018 100644
--- a/include/ut/multipart_test.cpp
+++ b/include/ut/multipart_test.cpp
@@ -42,22 +42,22 @@
     ParserError rc = parser.parse(reqIn);
     ASSERT_EQ(rc, ParserError::PARSER_SUCCESS);
 
-    ASSERT_EQ(parser.boundary,
+    EXPECT_EQ(parser.boundary,
               "\r\n-----------------------------d74496d66958873e");
-    ASSERT_EQ(parser.mime_fields.size(), 3);
+    EXPECT_EQ(parser.mime_fields.size(), 3);
 
-    ASSERT_EQ(parser.mime_fields[0].fields.at("Content-Disposition"),
+    EXPECT_EQ(parser.mime_fields[0].fields.at("Content-Disposition"),
               "form-data; name=\"Test1\"");
-    ASSERT_EQ(parser.mime_fields[0].content,
+    EXPECT_EQ(parser.mime_fields[0].content,
               "111111111111111111111111112222222222222222222222222222222");
 
-    ASSERT_EQ(parser.mime_fields[1].fields.at("Content-Disposition"),
+    EXPECT_EQ(parser.mime_fields[1].fields.at("Content-Disposition"),
               "form-data; name=\"Test2\"");
-    ASSERT_EQ(parser.mime_fields[1].content,
+    EXPECT_EQ(parser.mime_fields[1].content,
               "{\r\n-----------------------------d74496d66958873e123456");
-    ASSERT_EQ(parser.mime_fields[2].fields.at("Content-Disposition"),
+    EXPECT_EQ(parser.mime_fields[2].fields.at("Content-Disposition"),
               "form-data; name=\"Test3\"");
-    ASSERT_EQ(parser.mime_fields[2].content, "{\r\n--------d74496d6695887}");
+    EXPECT_EQ(parser.mime_fields[2].content, "{\r\n--------d74496d6695887}");
 }
 
 TEST_F(MultipartTest, TestBadMultipartParser1)
@@ -75,9 +75,9 @@
     ParserError rc = parser.parse(reqIn);
     ASSERT_EQ(rc, ParserError::PARSER_SUCCESS);
 
-    ASSERT_EQ(parser.boundary,
+    EXPECT_EQ(parser.boundary,
               "\r\n-----------------------------d74496d66958873e");
-    ASSERT_EQ(parser.mime_fields.size(), 1);
+    EXPECT_EQ(parser.mime_fields.size(), 1);
 }
 
 TEST_F(MultipartTest, TestBadMultipartParser2)
@@ -95,9 +95,9 @@
     ParserError rc = parser.parse(reqIn);
     ASSERT_EQ(rc, ParserError::PARSER_SUCCESS);
 
-    ASSERT_EQ(parser.boundary,
+    EXPECT_EQ(parser.boundary,
               "\r\n-----------------------------d74496d66958873e");
-    ASSERT_EQ(parser.mime_fields.size(), 1);
+    EXPECT_EQ(parser.mime_fields.size(), 1);
 }
 
 TEST_F(MultipartTest, TestErrorBoundaryFormat)
@@ -115,7 +115,7 @@
                  "-----------------------------d74496d66958873e--\r\n";
 
     crow::Request reqIn(req, ec);
-    ASSERT_EQ(parser.parse(reqIn), ParserError::ERROR_BOUNDARY_FORMAT);
+    EXPECT_EQ(parser.parse(reqIn), ParserError::ERROR_BOUNDARY_FORMAT);
 }
 
 TEST_F(MultipartTest, TestErrorBoundaryCR)
@@ -133,7 +133,7 @@
                  "-----------------------------d74496d66958873e--\r\n";
 
     crow::Request reqIn(req, ec);
-    ASSERT_EQ(parser.parse(reqIn), ParserError::ERROR_BOUNDARY_CR);
+    EXPECT_EQ(parser.parse(reqIn), ParserError::ERROR_BOUNDARY_CR);
 }
 
 TEST_F(MultipartTest, TestErrorBoundaryLF)
@@ -151,7 +151,7 @@
                  "-----------------------------d74496d66958873e--\r\n";
 
     crow::Request reqIn(req, ec);
-    ASSERT_EQ(parser.parse(reqIn), ParserError::ERROR_BOUNDARY_LF);
+    EXPECT_EQ(parser.parse(reqIn), ParserError::ERROR_BOUNDARY_LF);
 }
 
 TEST_F(MultipartTest, TestErrorBoundaryData)
@@ -169,7 +169,7 @@
                  "-----------------------------d74496d66958873e--\r\n";
 
     crow::Request reqIn(req, ec);
-    ASSERT_EQ(parser.parse(reqIn), ParserError::ERROR_BOUNDARY_DATA);
+    EXPECT_EQ(parser.parse(reqIn), ParserError::ERROR_BOUNDARY_DATA);
 }
 
 TEST_F(MultipartTest, TestErrorEmptyHeader)
@@ -187,7 +187,7 @@
                  "-----------------------------d74496d66958873e--\r\n";
 
     crow::Request reqIn(req, ec);
-    ASSERT_EQ(parser.parse(reqIn), ParserError::ERROR_EMPTY_HEADER);
+    EXPECT_EQ(parser.parse(reqIn), ParserError::ERROR_EMPTY_HEADER);
 }
 
 TEST_F(MultipartTest, TestErrorHeaderName)
@@ -205,7 +205,7 @@
                  "-----------------------------d74496d66958873e--\r\n";
 
     crow::Request reqIn(req, ec);
-    ASSERT_EQ(parser.parse(reqIn), ParserError::ERROR_HEADER_NAME);
+    EXPECT_EQ(parser.parse(reqIn), ParserError::ERROR_HEADER_NAME);
 }
 
 TEST_F(MultipartTest, TestErrorHeaderValue)
@@ -223,7 +223,7 @@
                  "-----------------------------d74496d66958873e--\r\n";
 
     crow::Request reqIn(req, ec);
-    ASSERT_EQ(parser.parse(reqIn), ParserError::ERROR_HEADER_VALUE);
+    EXPECT_EQ(parser.parse(reqIn), ParserError::ERROR_HEADER_VALUE);
 }
 
 TEST_F(MultipartTest, TestErrorHeaderEnding)
@@ -241,6 +241,6 @@
                  "-----------------------------d74496d66958873e--\r\n";
 
     crow::Request reqIn(req, ec);
-    ASSERT_EQ(parser.parse(reqIn), ParserError::ERROR_HEADER_ENDING);
+    EXPECT_EQ(parser.parse(reqIn), ParserError::ERROR_HEADER_ENDING);
 }
 } // namespace
\ No newline at end of file