VPLAY-11225 [Tech Debt] mediafailed event enhancements ( minor code etc )

Reason for change: Added minor code for MediaFailedEvent
Risks: Low
Test Procedure: Refer jira ticket
Priority: P1

Signed-off-by: lashmintha <[email protected]>

Author: lashmintha

AampEvent.cpp

@@ -50,7 +50,7 @@ AAMPEventType AAMPEventObject::getType() const
  * @brief MediaErrorEvent Constructor
  */
 MediaErrorEvent::MediaErrorEvent(AAMPTuneFailure failure, int code, int minorCode, const std::string &desc, bool shouldRetry, int classCode, int reason, int businessStatus, const std::string &responseData, std::string sid):
-		AAMPEventObject(AAMP_EVENT_TUNE_FAILED, std::move(sid)), mFailure(failure), mCode(code), mMinorCode(minorCode),
+		AAMPEventObject(AAMP_EVENT_TUNE_FAILED, std::move(sid)), mFailure(failure), mMajorCode(code), mMinorCode(minorCode),
 		mDescription(desc), mShouldRetry(shouldRetry), mSecManagerClass(classCode), mSecManagerReasonCode(reason), mBusinessStatus(businessStatus), mResponseData(responseData)
 {
 
@@ -71,9 +71,9 @@ AAMPTuneFailure MediaErrorEvent::getFailure() const
  *
  * @return Major code
  */
-int MediaErrorEvent::getCode() const
+int MediaErrorEvent::getMajorCode() const
 {
-	return mCode;
+	return mMajorCode;
 }
 /**
  * @brief Get Minor Code

AampEvent.h

@@ -643,7 +643,7 @@ class AAMPEventObject
 class MediaErrorEvent: public AAMPEventObject
 {
 	AAMPTuneFailure mFailure;	/**< Error Type */
-	int mCode;			/**< Error code */
+	int mMajorCode;			/**< Error code */
 	int mMinorCode;
 	std::string mDescription;	/**< Error description */
 	std::string mResponseData;	/**< Response Data */
@@ -686,7 +686,7 @@ class MediaErrorEvent: public AAMPEventObject
 	/**
 	 * @fn getCode
 	 */
-	int getCode() const;
+	int getMajorCode() const;
 	/**
 	 * @fn getDescription
 	 */

AampEventListener.cpp

@@ -41,7 +41,7 @@ static void GenerateLegacyAAMPEvent(const AAMPEventPtr &e, AAMPEvent &event)
 		{
 			MediaErrorEventPtr ev = std::dynamic_pointer_cast<MediaErrorEvent>(e);
 			event.data.mediaError.failure = ev->getFailure();
-			event.data.mediaError.code = ev->getCode();
+			event.data.mediaError.code = ev->getMajorCode();
 			event.data.mediaError.minorCode = ev->getMinorCode();
 			event.data.mediaError.description = ev->getDescription().c_str();
 			event.data.mediaError.shouldRetry = ev->shouldRetry();

jsbindings/jsbindings.cpp

@@ -928,16 +928,15 @@ class AAMP_JSListener_TuneFailed : public AAMP_JSListener
 	void setEventProperties(const AAMPEventPtr& e, JSContextRef context, JSObjectRef eventObj)
 	{
 		MediaErrorEventPtr evt = std::dynamic_pointer_cast<MediaErrorEvent>(e);
-		
-		int code = evt->getCode();
+		int code = evt->getMajorCode();
 		int minorCode = evt->getMinorCode();
 		const char* description = evt->getDescription().c_str();
 
 		JSStringRef name = JSStringCreateWithUTF8CString("code");
 		JSObjectSetProperty(context, eventObj, name, JSValueMakeNumber(context, code), kJSPropertyAttributeReadOnly, NULL);
 		JSStringRelease(name);
 
-		name = JSStringCreateWithUTF8CString("minorcode");
+		name = JSStringCreateWithUTF8CString("minorCode");
 		JSObjectSetProperty(context, eventObj, name, JSValueMakeNumber(context, minorCode), kJSPropertyAttributeReadOnly, NULL);
 		JSStringRelease(name);
 

jsbindings/jseventlistener.cpp

@@ -258,10 +258,10 @@ class AAMP_Listener_PlaybackFailed : public AAMP_JSEventListener
 		JSStringRef prop;
 
 		prop = JSStringCreateWithUTF8CString("code");
-		JSObjectSetProperty(p_obj->_ctx, jsEventObj, prop, JSValueMakeNumber(p_obj->_ctx, evt->getCode()), kJSPropertyAttributeReadOnly, NULL);
+		JSObjectSetProperty(p_obj->_ctx, jsEventObj, prop, JSValueMakeNumber(p_obj->_ctx, evt->getMajorCode()), kJSPropertyAttributeReadOnly, NULL);
 		JSStringRelease(prop);
 
-		prop = JSStringCreateWithUTF8CString("minorcode");
+		prop = JSStringCreateWithUTF8CString("minorCode");
 		JSObjectSetProperty(p_obj->_ctx, jsEventObj, prop, JSValueMakeNumber(p_obj->_ctx, evt->getMinorCode()), kJSPropertyAttributeReadOnly, NULL);
 		JSStringRelease(prop);
 

test/utests/fakes/FakeAampEvent.cpp

@@ -335,7 +335,7 @@ MediaErrorEvent::MediaErrorEvent(AAMPTuneFailure failure, int code, int minorCod
 bool MediaErrorEvent::shouldRetry(void) const { return false; }
 int32_t MediaErrorEvent::getBusinessStatus(void) const { return 0; }
 int32_t MediaErrorEvent::getClass(void) const { return 0; }
-int MediaErrorEvent::getCode(void) const { return 0; }
+int MediaErrorEvent::getMajorCode(void) const { return 0; }
 int MediaErrorEvent::getMinorCode(void) const { return 0; }
 
 BitrateChangeEvent::BitrateChangeEvent(int time, BitsPerSecond bitrate, const std::string &desc, int width, int height, double frameRate, double position, bool cappedProfile, int displayWidth, int displayHeight, VideoScanType videoScanType, int aspectRatioWidth, int aspectRatioHeight, std::string sid):

test/utests/tests/AampEventTests/AampEventTests.cpp

@@ -107,7 +107,7 @@ TEST_F(MediaErrorEventTest, MediaErrorEventMethodsTest) {
     );
 
     EXPECT_EQ(errorEvent.getFailure(), AAMPTuneFailure::AAMP_TUNE_INIT_FAILED);
-    EXPECT_EQ(errorEvent.getCode(), 10);
+    EXPECT_EQ(errorEvent.getMajorCode(), 10);
     EXPECT_EQ(errorEvent.getMinorCode(), 1001);
     EXPECT_EQ(errorEvent.getDescription(), "Tune failure due to initialization error");
     EXPECT_EQ(errorEvent.getResponseData(), "response data");
@@ -121,7 +121,7 @@ TEST_F(MediaErrorEventTest, MediaErrorEventMethodsTest) {
 TEST_F(MediaErrorEventTest, MediaErrorEventMethodsanotherTest) {
 
     EXPECT_EQ(errorEvent->getFailure(), AAMPTuneFailure::AAMP_TUNE_FAILURE_UNKNOWN);
-    EXPECT_EQ(errorEvent->getCode(), 100);
+    EXPECT_EQ(errorEvent->getMajorCode(), 100);
     EXPECT_EQ(errorEvent->getMinorCode(), 1);
     EXPECT_EQ(errorEvent->getDescription(), "Test");
     EXPECT_EQ(errorEvent->getResponseData(), "");
@@ -132,7 +132,7 @@ TEST_F(MediaErrorEventTest, MediaErrorEventMethodsanotherTest) {
     EXPECT_EQ(errorEvent->GetSessionId(), session_id);
 }
 
-// Structure to hold test parameters for MediaErrorEvent
+// Unified structure to hold test parameters for all MediaErrorEvent scenarios
 struct MediaErrorEventParams {
     AAMPTuneFailure failure;
     int code;
@@ -145,12 +145,12 @@ struct MediaErrorEventParams {
     std::string responseData;
 };
 
-// Parameterized test fixture for MediaErrorEvent
+// Unified parameterized test fixture for MediaErrorEvent
 class MediaErrorEventParameterizedTest : public testing::TestWithParam<MediaErrorEventParams> {
 };
 
-// L1 Test: MediaErrorEvent with all AAMPTuneFailure enum values
-TEST_P(MediaErrorEventParameterizedTest, MediaErrorEventAllFailureTypesTest) {
+// L1 Test: MediaErrorEvent with all error scenarios (Failure Types, Tune failure, DRM failure, and Manifest failures)
+TEST_P(MediaErrorEventParameterizedTest, MediaErrorEventAllScenariosTest) {
     MediaErrorEventParams params = GetParam();
 
     MediaErrorEvent event(
@@ -166,8 +166,9 @@ TEST_P(MediaErrorEventParameterizedTest, MediaErrorEventAllFailureTypesTest) {
         session_id
     );
 
+    // Verify all fields
     EXPECT_EQ(event.getFailure(), params.failure);
-    EXPECT_EQ(event.getCode(), params.code);
+    EXPECT_EQ(event.getMajorCode(), params.code);
     EXPECT_EQ(event.getMinorCode(), params.minorCode);
     EXPECT_EQ(event.getDescription(), params.description);
     EXPECT_EQ(event.shouldRetry(), params.shouldRetry);
@@ -177,114 +178,26 @@ TEST_P(MediaErrorEventParameterizedTest, MediaErrorEventAllFailureTypesTest) {
     EXPECT_EQ(event.getResponseData(), params.responseData);
 }
 
-// Instantiate the parameterized test with different AAMPTuneFailure values
+// Instantiate the unified parameterized test with all error scenarios
 INSTANTIATE_TEST_SUITE_P(
     MediaErrorEventTest,
     MediaErrorEventParameterizedTest,
     testing::Values(
+        // General AAMPTuneFailure error scenarios
         MediaErrorEventParams{AAMPTuneFailure::AAMP_TUNE_INIT_FAILED, 10, 1001, "Init failed error", false, 101, 201, 301, "Init failed response"},
         MediaErrorEventParams{AAMPTuneFailure::AAMP_TUNE_MANIFEST_REQ_FAILED, 30, 3001, "Manifest request failed", true, 102, 202, 302, "Manifest failed response"},
         MediaErrorEventParams{AAMPTuneFailure::AAMP_TUNE_AUTHORIZATION_FAILURE, 40, 4001, "Authorization failed", false, 103, 203, 303, "Auth failed response"},
-        MediaErrorEventParams{AAMPTuneFailure::AAMP_TUNE_UNTRACKED_DRM_ERROR, 50, 5001, "DRM error occurred", true, 104, 204, 304, "DRM error response"}
-    )
-);
-
-// Structure to hold test parameters for DRM error scenarios
-struct DRMErrorEventParams {
-    AAMPTuneFailure failure;
-    int code;
-    int minorCode;
-    std::string description;
-    bool shouldRetry;
-    int classCode;
-    int reasonCode;
-    int businessStatus;
-    std::string responseData;
-};
-
-// Parameterized test fixture for DRM error scenarios
-class MediaErrorEventDRMParameterizedTest : public testing::TestWithParam<DRMErrorEventParams> {
-};
-
-// L1 Test: MediaErrorEvent with DRM-specific error scenarios
-TEST_P(MediaErrorEventDRMParameterizedTest, MediaErrorEventDRMErrorScenariosTest) {
-    DRMErrorEventParams params = GetParam();
-    
-    MediaErrorEvent event(
-        params.failure,
-        params.code,
-        params.minorCode,
-        params.description,
-        params.shouldRetry,
-        params.classCode,
-        params.reasonCode,
-        params.businessStatus,
-        params.responseData,
-        session_id
-    );
-    
-    EXPECT_EQ(event.getCode(), params.code);
-    EXPECT_EQ(event.getMinorCode(), params.minorCode);
-    EXPECT_EQ(event.getFailure(), params.failure);
-    EXPECT_EQ(event.getClass(), params.classCode);
-    EXPECT_EQ(event.getReason(), params.reasonCode);
-    EXPECT_EQ(event.getBusinessStatus(), params.businessStatus);
-}
-
-// Instantiate the parameterized test with DRM error scenarios
-INSTANTIATE_TEST_SUITE_P(
-    MediaErrorEventTest,
-    MediaErrorEventDRMParameterizedTest,
-    testing::Values(
-        DRMErrorEventParams{AAMPTuneFailure::AAMP_TUNE_FAILED_TO_GET_KEYID, 50, 5009, "DRM license acquisition failed", false, 200, 1, -1, "{\"errorCode\":\"3307\",\"message\":\"License request failed\"}"},
-        DRMErrorEventParams{AAMPTuneFailure::AAMP_TUNE_UNTRACKED_DRM_ERROR, 50, 5001, "DRM key system not supported", false, 300, 2, -1, "{\"errorCode\":\"3321\",\"message\":\"Unsupported key system\"}"},
-        DRMErrorEventParams{AAMPTuneFailure::AAMP_TUNE_DRM_INIT_FAILED, 50, 5002, "DRM session creation failed", false, 400, 3, -1, "{\"errorCode\":\"3304\",\"message\":\"Failed to create DRM session\"}"}
-    )
-);
-
-// Structure to hold test parameters for manifest parsing error scenarios
-struct ManifestParsingErrorParams {
-    AAMPTuneFailure failure;
-    int code;
-    int minorCode;
-    std::string description;
-    bool shouldRetry;
-    std::string responseData;
-};
-
-// Parameterized test fixture for manifest parsing errors
-class MediaErrorEventManifestParameterizedTest : public testing::TestWithParam<ManifestParsingErrorParams> {
-};
-
-// L1 Test: MediaErrorEvent with manifest parsing error scenarios
-TEST_P(MediaErrorEventManifestParameterizedTest, MediaErrorEventManifestParsingErrorsTest) {
-    ManifestParsingErrorParams params = GetParam();
-    
-    MediaErrorEvent event(
-        params.failure,
-        params.code,
-        params.minorCode,
-        params.description,
-        params.shouldRetry,
-        0, 0, 0,
-        params.responseData,
-        session_id
-    );
-    
-    EXPECT_EQ(event.getCode(), params.code);
-    EXPECT_EQ(event.getMinorCode(), params.minorCode);
-    EXPECT_EQ(event.getFailure(), params.failure);
-    EXPECT_EQ(event.shouldRetry(), params.shouldRetry);
-}
-
-// Instantiate the parameterized test with manifest parsing error scenarios
-INSTANTIATE_TEST_SUITE_P(
-    MediaErrorEventTest,
-    MediaErrorEventManifestParameterizedTest,
-    testing::Values(
-        ManifestParsingErrorParams{AAMPTuneFailure::AAMP_TUNE_INIT_FAILED_MANIFEST_PARSE_ERROR, 10, 1004, "Invalid manifest format", false, "XML parse error at line 5"},
-        ManifestParsingErrorParams{AAMPTuneFailure::AAMP_TUNE_INIT_FAILED_MANIFEST_CONTENT_ERROR, 10, 1003, "Missing required manifest elements", false, "Missing Period element in MPD"},
-        ManifestParsingErrorParams{AAMPTuneFailure::AAMP_TUNE_INVALID_MANIFEST_FAILURE, 30, 3004, "Unsupported manifest version", false, "MPD version 2.0 not supported"}
+        MediaErrorEventParams{AAMPTuneFailure::AAMP_TUNE_UNTRACKED_DRM_ERROR, 50, 5001, "DRM error occurred", true, 104, 204, 304, "DRM error response"},
+        
+        // DRM-specific error scenarios
+        MediaErrorEventParams{AAMPTuneFailure::AAMP_TUNE_FAILED_TO_GET_KEYID, 50, 5009, "DRM license acquisition failed", false, 200, 1, -1, "{\"errorCode\":\"3307\",\"message\":\"License request failed\"}"},
+        MediaErrorEventParams{AAMPTuneFailure::AAMP_TUNE_UNTRACKED_DRM_ERROR, 50, 5001, "DRM key system not supported", false, 300, 2, -1, "{\"errorCode\":\"3321\",\"message\":\"Unsupported key system\"}"},
+        MediaErrorEventParams{AAMPTuneFailure::AAMP_TUNE_DRM_INIT_FAILED, 50, 5002, "DRM session creation failed", false, 400, 3, -1, "{\"errorCode\":\"3304\",\"message\":\"Failed to create DRM session\"}"},
+        
+        // Manifest parsing error scenarios
+        MediaErrorEventParams{AAMPTuneFailure::AAMP_TUNE_INIT_FAILED_MANIFEST_PARSE_ERROR, 10, 1004, "Invalid manifest format", false, 0, 0, 0, "XML parse error at line 5"},
+        MediaErrorEventParams{AAMPTuneFailure::AAMP_TUNE_INIT_FAILED_MANIFEST_CONTENT_ERROR, 10, 1003, "Missing required manifest elements", false, 0, 0, 0, "Missing Period element in MPD"},
+        MediaErrorEventParams{AAMPTuneFailure::AAMP_TUNE_INVALID_MANIFEST_FAILURE, 30, 3004, "Unsupported manifest version", false, 0, 0, 0, "MPD version 2.0 not supported"}
     )
 );
 // Test fixture for SpeedChangedEvent