From 6b530e94b700962de7416473aa811a5e267eb893 Mon Sep 17 00:00:00 2001 From: gezimbll Date: Thu, 23 May 2024 05:26:28 -0400 Subject: [PATCH] revising integration tests --- agents/radagent_handlr_it_test.go | 7 ++----- .../gocs/dsp_site/DispatcherProfiles.csv | 4 ++-- general_tests/gocs_it_test.go | 18 ++---------------- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/agents/radagent_handlr_it_test.go b/agents/radagent_handlr_it_test.go index f48705432..e8f42badf 100644 --- a/agents/radagent_handlr_it_test.go +++ b/agents/radagent_handlr_it_test.go @@ -159,10 +159,8 @@ func testRAHitInitCfg(t *testing.T) { "reply_fields":[ {"tag": "Code", "path": "*rep.*radReplyCode", "filters": ["*notempty:~*cgrep.Error:"], "type": "*constant", "value": "AccessReject"}, - // {"tag": "ReplyMessage", "path": "*rep.Reply-Message","filters": ["*notempty:~*cgrep.Error:"], - // "type": "*composed", "value": "~*cgrep.Error"}, - {"tag": "ReplyMessage", "path": "*rep.Reply-Message", - "type": "*composed", "value": "~*cgrep.Attributes.RadReplyMessage"}, + {"tag": "ReplyMessage", "path": "*rep.Reply-Message","filters": ["*notempty:~*cgrep.Error:"], + "type": "*composed", "value": "~*cgrep.Error"}, ], }, ], @@ -263,7 +261,6 @@ func testRAHitTPFromFolder(t *testing.T) { if err := writeFile(utils.AttributesCsv, ` #Tenant,ID,Contexts,FilterIDs,ActivationInterval,AttributeFilterIDs,Path,Type,Value,Blocker,Weight cgrates.org,ATTR_RAD,*any,*string:~*req.RadUserName:10011;*prefix:~*req.RadPassword:CGRateSPassword3,,,,,,false,10 -#cgrates.org,ATTR_RAD,,,,,*req.RadReplyMessage,*constant,Access Accept,, `); err != nil { t.Fatal(err) } diff --git a/data/tariffplans/gocs/dsp_site/DispatcherProfiles.csv b/data/tariffplans/gocs/dsp_site/DispatcherProfiles.csv index da1647dee..5a9f574fc 100644 --- a/data/tariffplans/gocs/dsp_site/DispatcherProfiles.csv +++ b/data/tariffplans/gocs/dsp_site/DispatcherProfiles.csv @@ -1,4 +1,4 @@ #Tenant,ID,Subsystems,FilterIDs,ActivationInterval,Strategy,StrategyParameters,ConnID,ConnFilterIDs,ConnWeight,ConnBlocker,ConnParameters,Weight -cgrates.org,BROADCAST,*sessions,,,*broadcast,,AU_SITE,,20,false,,30 -cgrates.org,BROADCAST,,,,,,US_SITE,,20,,, +cgrates.org,BROADCAST,*sessions,,,*broadcast,,US_SITE,,20,false,,30 +#cgrates.org,BROADCAST,,,,,,US_SITE,,20,,, cgrates.org,SELF,*any,,,*weight,,SELF,,20,false,,10 \ No newline at end of file diff --git a/general_tests/gocs_it_test.go b/general_tests/gocs_it_test.go index b061f4f68..ac96a1601 100644 --- a/general_tests/gocs_it_test.go +++ b/general_tests/gocs_it_test.go @@ -288,17 +288,7 @@ func testGOCSInitSession(t *testing.T) { time.Sleep(10 * time.Millisecond) aSessions := make([]*sessions.ExternalSession, 0) - if err := auRPC.Call(utils.SessionSv1GetActiveSessions, new(utils.SessionFilter), &aSessions); err != nil { - t.Error(err) - } else if len(aSessions) != 1 { - t.Errorf("wrong active sessions: %s \n , and len(aSessions) %+v", utils.ToJSON(aSessions), len(aSessions)) - } else if aSessions[0].NodeID != "AU_SITE" { - t.Errorf("Expecting : %+v, received: %+v", "AU_SITE", aSessions[0].NodeID) - } else if aSessions[0].Usage != time.Duration(5*time.Minute) { - t.Errorf("Expecting : %+v, received: %+v", time.Duration(5*time.Minute), aSessions[0].MaxCostSoFar) - } - aSessions = make([]*sessions.ExternalSession, 0) if err := usRPC.Call(utils.SessionSv1GetActiveSessions, new(utils.SessionFilter), &aSessions); err != nil { t.Error(err) } else if len(aSessions) != 1 { @@ -367,7 +357,7 @@ func testGOCSUpdateSession(t *testing.T) { t.Errorf("wrong active sessions: %s", utils.ToJSON(aSessions)) } else if aSessions[0].NodeID != "AU_SITE" { t.Errorf("Expecting : %+v, received: %+v", "AU_SITE", aSessions[0].NodeID) - } else if aSessions[0].Usage != time.Duration(10*time.Minute) { + } else if aSessions[0].Usage != time.Duration(5*time.Minute) { t.Errorf("Expecting : %+v, received: %+v", time.Duration(5*time.Minute), aSessions[0].Usage) } @@ -445,7 +435,7 @@ func testGOCSUpdateSession2(t *testing.T) { t.Errorf("wrong active sessions: %s", utils.ToJSON(aSessions)) } else if aSessions[0].NodeID != "AU_SITE" { t.Errorf("Expecting : %+v, received: %+v", "AU_SITE", aSessions[0].NodeID) - } else if aSessions[0].Usage != time.Duration(15*time.Minute) { + } else if aSessions[0].Usage != time.Duration(5*time.Minute) { t.Errorf("Expecting : %+v, received: %+v", time.Duration(15*time.Minute), aSessions[0].Usage) } @@ -511,10 +501,6 @@ func testGOCSTerminateSession(t *testing.T) { t.Errorf("Unexpected reply: %s", rply) } aSessions := make([]*sessions.ExternalSession, 0) - if err := auRPC.Call(utils.SessionSv1GetActiveSessions, new(utils.SessionFilter), &aSessions); err == nil || - err.Error() != utils.ErrNotFound.Error() { - t.Errorf("Expected error %s received error %v and reply %s", utils.ErrNotFound, err, utils.ToJSON(aSessions)) - } if err := usRPC.Call(utils.SessionSv1GetActiveSessions, new(utils.SessionFilter), &aSessions); err == nil || err.Error() != utils.ErrNotFound.Error() { t.Errorf("Expected error %s received error %v and reply %s", utils.ErrNotFound, err, utils.ToJSON(aSessions))