Merge pull request #164 from Dash-Industry-Forum/chore-clean

Chore clean
Dash-Industry-Forum · Feb 27, 2024 · 6d87c17 · 6d87c17
2 parents 6cf7636 + ff8ccc9
commit 6d87c17
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -37,6 +37,8 @@
         "ECCP",
         "elng",
         "emsg",
+        "enca",
+        "encv",
         "Eyevinn",
         "genurl",
         "golangci",
@@ -70,7 +72,9 @@
         "mdat",
         "Mdhd",
         "Mdia",
+        "mehd",
         "Mfhd",
+        "Minf",
         "Moof",
         "Moov",
         "mpdlist",
@@ -94,6 +98,7 @@
         "reqlimitint",
         "reqlimitlog",
         "resegmentation",
+        "RLSAKT",
         "SCTE",
         "segmtimeline",
         "segtimeline",
@@ -102,10 +107,12 @@
         "Sntp",
         "startrel",
         "statuscode",
+        "Stbl",
         "stoprel",
         "stppd",
         "stpptime",
         "stretchr",
+        "stsd",
         "Sttg",
         "Sttp",
         "styp",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Correct UTCTiming schemes for http-iso and http-head
+- Make urlgen fields for negative test cases easier to fill
 
 ## [1.2.0] - 2024-02-16
 

diff --git a/cmd/livesim2/app/livempd_test.go b/cmd/livesim2/app/livempd_test.go
@@ -12,7 +12,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Eyevinn/dash-mpd/mpd"
 	m "github.com/Eyevinn/dash-mpd/mpd"
 	"github.com/Eyevinn/dash-mpd/xml"
 	"github.com/stretchr/testify/assert"
@@ -946,9 +945,9 @@ func TestFillContentTypes(t *testing.T) {
 		},
 	}
 	fillContentTypes("theAsset", p)
-	assert.Equal(t, mpd.RFC6838ContentTypeType("video"), p.AdaptationSets[0].ContentType)
-	assert.Equal(t, mpd.RFC6838ContentTypeType("audio"), p.AdaptationSets[1].ContentType)
-	assert.Equal(t, mpd.RFC6838ContentTypeType("text"), p.AdaptationSets[2].ContentType)
-	assert.Equal(t, mpd.RFC6838ContentTypeType("audio"), p.AdaptationSets[3].ContentType)
-	assert.Equal(t, mpd.RFC6838ContentTypeType(""), p.AdaptationSets[4].ContentType)
+	assert.Equal(t, m.RFC6838ContentTypeType("video"), p.AdaptationSets[0].ContentType)
+	assert.Equal(t, m.RFC6838ContentTypeType("audio"), p.AdaptationSets[1].ContentType)
+	assert.Equal(t, m.RFC6838ContentTypeType("text"), p.AdaptationSets[2].ContentType)
+	assert.Equal(t, m.RFC6838ContentTypeType("audio"), p.AdaptationSets[3].ContentType)
+	assert.Equal(t, m.RFC6838ContentTypeType(""), p.AdaptationSets[4].ContentType)
 }
diff --git a/cmd/livesim2/app/templates/urlgen.html b/cmd/livesim2/app/templates/urlgen.html
@@ -229,6 +229,7 @@ <h1>Livesim2 URL generator</h1>
 
 			<label for="statuscode">
 			<p><em>Patterns of cyclic segment response codes</em></p>
+			<input type="text" id="statuscode" name="statuscode" value="{{.StatusCodes}}" />
 			<p>
 				A square-bracket-surrounded list of comma-separated patterns, like
 				<pre>[{code:404,cycle:30,rsq:0,rep:video},{code:403,cycle:60,rsq:1}]</pre>
@@ -240,10 +241,10 @@ <h1>Livesim2 URL generator</h1>
 				<li><it>rep</it> is a comma-separated list of representation IDs to which the pattern applies (can be empty)</li>
 			</ul>
 			</p>
-				<input type="text" id="statuscode" name="statuscode" value="{{.StatusCodes}}" />
 			</label>
 			<label for="traffic">
 				<p><em>Traffic Patterns for one or more BaseURLs</em></p>
+				<input type="text" id="traffic" name="traffic" value="{{.Traffic}}" />
 				<p>
 					Specify time interval for loss patterns for one or more BaseURLs
 					with "up (u)", "down (d)", "slow (s)", or "hang (h)" states, like
@@ -265,10 +266,8 @@ <h1>Livesim2 URL generator</h1>
 					<li>During a "hang (s)" interval, all segment responses hang for 10s before resulting in 503.
 					</li>
 				</ul>
-
-
 				</p>
-					<input type="text" id="traffic" name="traffic" value="{{.Traffic}}" />
+
 				</label>
 		</details>