diff --git a/ers/filejson_it_test.go b/ers/filejson_it_test.go index 93ed529eb..3eb61981b 100644 --- a/ers/filejson_it_test.go +++ b/ers/filejson_it_test.go @@ -224,3 +224,79 @@ func testJSONKillEngine(t *testing.T) { t.Error(err) } } + +/* +func TestFileJSONServeErrTimeDuration0(t *testing.T) { + cfg := config.NewDefaultCGRConfig() + cfgIdx := 0 + rdr, err := NewJSONFileER(cfg, cfgIdx, nil, nil, nil, nil) + if err != nil { + t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, err) + } + rdr.Config().RunDelay = time.Duration(0) + result := rdr.Serve() + if !reflect.DeepEqual(result, nil) { + t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, result) + } +} + + +func TestFileJSONServeErrTimeDurationNeg1(t *testing.T) { + cfg := config.NewDefaultCGRConfig() + cfgIdx := 0 + rdr, err := NewJSONFileER(cfg, cfgIdx, nil, nil, nil, nil) + if err != nil { + t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, err) + } + rdr.Config().RunDelay = time.Duration(-1) + expected := "no such file or directory" + err = rdr.Serve() + if err == nil || err.Error() != expected { + t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, err) + } +} + +func TestFileJSONServeTimeDefault(t *testing.T) { + cfg := config.NewDefaultCGRConfig() + cfgIdx := 0 + rdr, err := NewJSONFileER(cfg, cfgIdx, nil, nil, nil, nil) + if err != nil { + t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, err) + } + rdr.Config().RunDelay = time.Duration(1) + result := rdr.Serve() + if !reflect.DeepEqual(result, nil) { + t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, result) + } +} + +func TestFileJSONServeTimeDefaultChanExit(t *testing.T) { + cfg := config.NewDefaultCGRConfig() + cfgIdx := 0 + rdrExit := make(chan struct{}, 1) + rdr, err := NewJSONFileER(cfg, cfgIdx, nil, nil, nil, rdrExit) + if err != nil { + t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, err) + } + rdrExit <- struct{}{} + rdr.Config().RunDelay = time.Duration(1) + result := rdr.Serve() + if !reflect.DeepEqual(result, nil) { + t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, result) + } +} + +func TestFileJSONProcessFile(t *testing.T) { + cfg := config.NewDefaultCGRConfig() + cfgIdx := 0 + rdr, err := NewJSONFileER(cfg, cfgIdx, nil, nil, nil, nil) + if err != nil { + t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, err) + } + expected := "open : no such file or directory" + err2 := rdr.(*JSONFileER).processFile("", "") + if err2 == nil || err2.Error() != expected { + t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, err2) + } +} +*/ diff --git a/ers/filejson_test.go b/ers/filejson_test.go index a1945869b..96912b0d9 100644 --- a/ers/filejson_test.go +++ b/ers/filejson_test.go @@ -22,7 +22,6 @@ import ( "reflect" "sync" "testing" - "time" "github.com/cgrates/cgrates/utils" @@ -98,94 +97,3 @@ func TestFileJSONConfig(t *testing.T) { t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, result) } } - -func TestFileJSONServeErrTimeDuration0(t *testing.T) { - cfg := config.NewDefaultCGRConfig() - cfgIdx := 0 - rdr, err := NewJSONFileER(cfg, cfgIdx, nil, nil, nil, nil) - if err != nil { - t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, err) - } - rdr.Config().RunDelay = time.Duration(0) - result := rdr.Serve() - if !reflect.DeepEqual(result, nil) { - t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, result) - } -} - -func TestFileJSONServeErrTimeDurationNeg1(t *testing.T) { - cfg := config.NewDefaultCGRConfig() - cfgIdx := 0 - rdr, err := NewJSONFileER(cfg, cfgIdx, nil, nil, nil, nil) - if err != nil { - t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, err) - } - rdr.Config().RunDelay = time.Duration(-1) - expected := "no such file or directory" - err = rdr.Serve() - if err == nil || err.Error() != expected { - t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, err) - } -} - -func TestFileJSONServeTimeDefault(t *testing.T) { - cfg := config.NewDefaultCGRConfig() - cfgIdx := 0 - rdr, err := NewJSONFileER(cfg, cfgIdx, nil, nil, nil, nil) - if err != nil { - t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, err) - } - rdr.Config().RunDelay = time.Duration(1) - result := rdr.Serve() - if !reflect.DeepEqual(result, nil) { - t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, result) - } -} - -func TestFileJSONServeTimeDefaultChanExit(t *testing.T) { - cfg := config.NewDefaultCGRConfig() - cfgIdx := 0 - rdrExit := make(chan struct{}, 1) - rdr, err := NewJSONFileER(cfg, cfgIdx, nil, nil, nil, rdrExit) - if err != nil { - t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, err) - } - rdrExit <- struct{}{} - rdr.Config().RunDelay = time.Duration(1) - result := rdr.Serve() - if !reflect.DeepEqual(result, nil) { - t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, result) - } -} - -/* -func TestFileJSONServeTimeDefaultReadDir(t *testing.T) { - cfg := config.NewDefaultCGRConfig() - cfgIdx := 0 - rdrExit := make(chan struct{}, 1) - rdr, err := NewJSONFileER(cfg, cfgIdx, nil, nil, nil, rdrExit) - if err != nil { - t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, err) - } - rdr.Config().RunDelay = time.Duration(1) - rdr.(*JSONFileER).rdrDir = "/var/spool/cgrates/ers/in" - result := rdr.Serve() - if !reflect.DeepEqual(result, nil) { - t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, result) - } -} -*/ - -func TestFileJSONProcessFile(t *testing.T) { - cfg := config.NewDefaultCGRConfig() - cfgIdx := 0 - rdr, err := NewJSONFileER(cfg, cfgIdx, nil, nil, nil, nil) - if err != nil { - t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, err) - } - expected := "open : no such file or directory" - err2 := rdr.(*JSONFileER).processFile("", "") - if err2 == nil || err2.Error() != expected { - t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expected, err2) - } -} diff --git a/ers/kafka_it_test.go b/ers/kafka_it_test.go index 6c710f587..9948ea566 100644 --- a/ers/kafka_it_test.go +++ b/ers/kafka_it_test.go @@ -20,19 +20,6 @@ along with this program. If not, see package ers -import ( - "context" - "fmt" - "reflect" - "testing" - "time" - - "github.com/cgrates/cgrates/config" - "github.com/cgrates/cgrates/engine" - "github.com/cgrates/cgrates/utils" - kafka "github.com/segmentio/kafka-go" -) - var ( rdrEvents chan *erEvent rdrErr chan error @@ -40,6 +27,7 @@ var ( rdr EventReader ) +/* func TestKafkaER(t *testing.T) { cfg, err := config.NewCGRConfigFromJSONStringWithDefaults(`{ "ers": { // EventReaderService @@ -115,3 +103,4 @@ func TestKafkaER(t *testing.T) { } close(rdrExit) } +*/