Merge pull request #67 from wmnsk/test-duration-ie

Add tests for methods that return time.Duration values (and fix some IEs)
wmnsk · Oct 28, 2020 · 887eb52 · 887eb52
2 parents 61d925d + c7db18a
commit 887eb52
Show file tree

Hide file tree

Showing 7 changed files with 444 additions and 29 deletions.
diff --git a/ie/average-packet-delay.go b/ie/average-packet-delay.go
@@ -43,7 +43,7 @@ func (i *IE) AveragePacketDelay() (time.Duration, error) {
 			return 0, err
 		}
 		for _, x := range ies {
-			if x.Type == QoSInformationInGTPUPathQoSReport {
+			if x.Type == AveragePacketDelay {
 				return x.AveragePacketDelay()
 			}
 		}

diff --git a/ie/dl-buffering-duration.go b/ie/dl-buffering-duration.go
@@ -60,26 +60,25 @@ func (i *IE) DLBufferingDuration() (time.Duration, error) {
 	switch i.Type {
 	case DLBufferingDuration:
 		var d time.Duration
-		switch i.Payload[0] | 0xe0 {
-		case 0xe0:
+		switch (i.Payload[0] & 0xe0) >> 5 {
+		case 0x07:
 			d = time.Duration(math.MaxInt64)
-		case 0x80:
-			d = time.Duration(i.Payload[0]|0x1f) * 10 * time.Hour
-		case 0x60:
-			d = time.Duration(i.Payload[0]|0x1f) * time.Hour
-		case 0x40:
-			d = time.Duration(i.Payload[0]|0x1f) * 10 * time.Minute
-		case 0x20:
-			d = time.Duration(i.Payload[0]|0x1f) * time.Minute
+		case 0x04:
+			d = time.Duration(i.Payload[0]&0x1f) * 10 * time.Hour
+		case 0x03:
+			d = time.Duration(i.Payload[0]&0x1f) * time.Hour
+		case 0x02:
+			d = time.Duration(i.Payload[0]&0x1f) * 10 * time.Minute
+		case 0x01:
+			d = time.Duration(i.Payload[0]&0x1f) * time.Minute
 		case 0x00:
-			d = time.Duration(i.Payload[0]|0x1f) * 2 * time.Second
+			d = time.Duration(i.Payload[0]&0x1f) * 2 * time.Second
 		default:
 			d = 0
 		}
-
 		return d, nil
 	case UpdateBARWithinSessionReportResponse:
-		ies, err := i.CreateBAR()
+		ies, err := i.UpdateBAR()
 		if err != nil {
 			return 0, err
 		}

diff --git a/ie/graceful-release-period.go b/ie/graceful-release-period.go
@@ -61,19 +61,19 @@ func (i *IE) GracefulReleasePeriod() (time.Duration, error) {
 	}
 
 	var d time.Duration
-	switch i.Payload[0] | 0xe0 {
-	case 0xe0:
+	switch (i.Payload[0] & 0xe0) >> 5 {
+	case 0x07:
 		d = time.Duration(math.MaxInt64)
-	case 0x80:
-		d = time.Duration(i.Payload[0]|0x1f) * 10 * time.Hour
-	case 0x60:
-		d = time.Duration(i.Payload[0]|0x1f) * time.Hour
-	case 0x40:
-		d = time.Duration(i.Payload[0]|0x1f) * 10 * time.Minute
-	case 0x20:
-		d = time.Duration(i.Payload[0]|0x1f) * time.Minute
+	case 0x04:
+		d = time.Duration(i.Payload[0]&0x1f) * 10 * time.Hour
+	case 0x03:
+		d = time.Duration(i.Payload[0]&0x1f) * time.Hour
+	case 0x02:
+		d = time.Duration(i.Payload[0]&0x1f) * 10 * time.Minute
+	case 0x01:
+		d = time.Duration(i.Payload[0]&0x1f) * time.Minute
 	case 0x00:
-		d = time.Duration(i.Payload[0]|0x1f) * 2 * time.Second
+		d = time.Duration(i.Payload[0]&0x1f) * 2 * time.Second
 	default:
 		d = 0
 	}