Tests

Author: topilski

Diff for: src/commands_info/movie_info.cpp

@@ -190,7 +190,7 @@ common::Error MovieInfo::SerializeFields(json_object* deserialized) const {
   ignore_result(SetInt64Field(deserialized, DURATION_FIELD, duration_));
 
   json_object* jurls = json_object_new_array();
-  for (auto url : urls_) {
+  for (const auto& url : urls_) {
     std::string url_str = url.spec();
     json_object* jurl = json_object_new_string(url_str.c_str());
     json_object_array_add(jurls, jurl);
@@ -226,47 +226,56 @@ common::Error MovieInfo::DoDeSerialize(json_object* serialized) {
 
   // optional
   std::string description;
-  if (GetStringField(serialized, DESCRIPTION_FIELD, &description)) {
+  err = GetStringField(serialized, DESCRIPTION_FIELD, &description);
+  if (!err) {
     res.SetDescription(description);
   }
 
   std::string preview_icon;
-  if (GetStringField(serialized, PREVIEW_ICON_FIELD, &preview_icon)) {
+  err = GetStringField(serialized, PREVIEW_ICON_FIELD, &preview_icon);
+  if (!err) {
     res.SetPreviewIcon(url_t(preview_icon));
   }
 
   std::string back_url;
-  if (GetStringField(serialized, BACKGROUND_URL_FIELD, &back_url)) {
+  err = GetStringField(serialized, BACKGROUND_URL_FIELD, &back_url);
+  if (!err) {
     res.SetBackgroundUrl(url_t(back_url));
   }
 
   std::string trailer_url;
-  if (GetStringField(serialized, TRAILER_URL_FIELD, &trailer_url)) {
+  err = GetStringField(serialized, TRAILER_URL_FIELD, &trailer_url);
+  if (!err) {
     res.SetTrailerUrl(url_t(trailer_url));
   }
 
   double user_score = 0;
-  if (GetDoubleField(serialized, USER_SCORE_FIELD, &user_score)) {
+  err = GetDoubleField(serialized, USER_SCORE_FIELD, &user_score);
+  if (!err) {
     res.SetUserScore(user_score);
   }
 
   timestamp_t prime_date = 0;
-  if (GetInt64Field(serialized, PRIME_DATE_FIELD, &prime_date)) {
+  err = GetInt64Field(serialized, PRIME_DATE_FIELD, &prime_date);
+  if (!err) {
     res.SetPrimeDate(prime_date);
   }
 
   std::string country;
-  if (GetStringField(serialized, COUNTRY_FIELD, &country)) {
+  err = GetStringField(serialized, COUNTRY_FIELD, &country);
+  if (!err) {
     res.SetCountry(country);
   }
 
   timestamp_t duration = 0;
-  if (GetInt64Field(serialized, DURATION_FIELD, &prime_date)) {
+  err = GetInt64Field(serialized, DURATION_FIELD, &prime_date);
+  if (!err) {
     res.SetDuration(duration);
   }
 
   Type type = VODS;
-  if (GetEnumField(serialized, TYPE_FIELD, &type)) {
+  err = GetEnumField(serialized, TYPE_FIELD, &type);
+  if (!err) {
     res.SetType(type);
   }
 

Diff for: tests/test_input_uri.cpp

@@ -35,8 +35,7 @@ TEST(InputUri, ConvertFromString) {
   ASSERT_EQ(invalid_uri.GetUrl(), common::uri::GURL());
   std::string conv;
   common::Error err = invalid_uri.SerializeToString(&conv);
-  ASSERT_FALSE(err);
-  ASSERT_EQ(conv, invalid_uri_json);
+  ASSERT_TRUE(err);
 
   const std::string uri_json = "{ \"id\": 1, \"uri\": \"" RTMP_INPUT "\"}";
   fastotv::InputUri uri;
@@ -61,7 +60,7 @@ TEST(InputUri, ConvertFromString) {
   common::uri::GURL dev_ro(DEVICE_INPUT);
   ASSERT_EQ(dev_uri.GetUrl(), dev_ro);
   ASSERT_TRUE(dev_ro.SchemeIsDev());
-  ASSERT_EQ(dev_ro.PathForRequest(), DEVICE_VIDEO);
+  ASSERT_EQ(dev_ro.PathForRequest(), DEVICE_VIDEO "?" QUERY);
   ASSERT_EQ(dev_ro.query(), QUERY);
   ASSERT_EQ(dev_uri.GetUserAgent(), fastotv::InputUri::WINK);
 }

Diff for: tests/test_output_uri.cpp

@@ -25,15 +25,15 @@ TEST(OutputUri, ConvertFromString) {
   fastotv::OutputUri invalid_uri;
   ASSERT_EQ(invalid_uri.GetID(), 0);
   ASSERT_EQ(invalid_uri.GetUrl(), common::uri::GURL());
-  ASSERT_EQ(invalid_uri.GetHttpRoot(), common::file_system::ascii_file_string_path());
+  ASSERT_EQ(invalid_uri.GetHttpRoot(), fastotv::OutputUri::http_root_t());
   std::string conv;
-  ignore_result(invalid_uri.SerializeToString(&conv));
-  ASSERT_EQ(conv, invalid_uri_json);
+  common::Error err = invalid_uri.SerializeToString(&conv);
+  ASSERT_TRUE(err);
 
   const std::string uri_json = "{ \"id\": 1, \"uri\": \"" RTMP_OUTPUT "\", \"http_root\": \"" HTTP_OUTPUT
                                "\", \"size\": \"0x0\", \"video_bitrate\": 0, \"audio_bitrate\": 0 }";
   fastotv::OutputUri uri;
-  common::Error err = uri.DeSerializeFromString(uri_json);
+  err = uri.DeSerializeFromString(uri_json);
   ASSERT_FALSE(err);
   ASSERT_EQ(uri.GetID(), 1);
   common::uri::GURL ro(RTMP_OUTPUT);