Commit 94db1beb authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

meep-subscriptions unit tests

parent b0cd3673

go-packages/meep-subscriptions/go.mod

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ require ( 
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-metrics v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis v0.0.0

	github.com/gorilla/handlers v1.5.1 // indirect

	github.com/gorilla/mux v1.8.0 // indirect

	github.com/gorilla/websocket v1.4.2

	github.com/onsi/ginkgo v1.16.5 // indirect

	github.com/onsi/gomega v1.16.0 // indirect

go-packages/meep-subscriptions/go.sum

+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4s 
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=

github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=

github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=

github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ=

github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=

github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=

github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=

github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@@ -104,6 +106,8 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4 
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=

github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=

github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=

github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=

github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=

github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=

github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=

go-packages/meep-subscriptions/subscription-mgr.go

+3 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import ( 
type ExpiredSubscriptionCb func(*Subscription)

type PeriodicSubscriptionCb func(*Subscription)

type TestNotificationCb func(*Subscription) error

type NotificationRespCb func(*Subscription)

type NewWebsocketCb func(*Subscription) (string, error)



type SubscriptionMgrCfg struct {
@@ -42,7 +41,6 @@ type SubscriptionMgrCfg struct { 
	ExpiredSubCb   ExpiredSubscriptionCb

	PeriodicSubCb  PeriodicSubscriptionCb

	TestNotifCb    TestNotificationCb

	NotifRespCb    NotificationRespCb

	NewWsCb        NewWebsocketCb

}
@@ -271,6 +269,9 @@ func (sm *SubscriptionMgr) GenerateSubscriptionId() string { 
}



func (sm *SubscriptionMgr) ReadyToSend(sub *Subscription) bool {

	if sub == nil {

		return false

	}

	// Subscription state

	if sub.State != StateReady {

		return false

go-packages/meep-subscriptions/subscription-mgr_test.go

0 → 100644
+1137 −0

File added.

Preview size limit exceeded, changes collapsed.

go-packages/meep-subscriptions/subscription.go

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ func (sub *Subscription) updateSubscription() error { 
}



func (sub *Subscription) refreshState() error {

	log.Info("Previous mode: ", sub.Mode, " state: ", sub.State)



	// Give priority to Websocket if requested

	if sub.Cfg.RequestWebsocketUri {
@@ -164,6 +165,7 @@ func (sub *Subscription) refreshState() error { 
		}

	}



	log.Info("Current mode: ", sub.Mode, " state: ", sub.State)

	return nil

}