adjust the demo db and tests to current NB types and classes.conf

src/dcs_demo.db

@@ -22,25 +22,6 @@
 #
 # first match wins
 #
-# NOTE: At this point we need one entry for each type used in
-# dcs_type.c - other than unidentified
-#
-#	[NB_T_BOT] = "Bot",
-#	[NB_T_CAMERA] = "Camera",
-#	[NB_T_CE_DEVICE] = "CE-Device",
-#	[NB_T_COMPUTER] = "Computer",
-#	[NB_T_DESKTOP_BROWSER] = "Desktop-Browser",
-#	[NB_T_DEVTOOL] = "DevTool",
-#	[NB_T_EREADER] = "eReader",
-#	[NB_T_MEDIAPLAYER] = "MediaPlayer",
-#	[NB_T_MOBILECONSOLE] = "MobileConsole",
-#	[NB_T_MOBILE_BROWSER] = "Mobile-Browser",
-#	[NB_T_MOBILE_PHONE] = "Mobile Phone",
-#	[NB_T_OPERATINGSYSTEM] = "OperatingSystem",
-#	[NB_T_SETTOP_BOX_TV] = "Settop-Box, TV",
-#	[NB_T_TABLET] = "Tablet",
-#	[NB_T_UNIDENTIFIED] = "unidentified",
-#	[NB_T_WEARABLE_COMPUTER] = "wearable computer"
 ##
 #
 #
@@ -76,7 +57,7 @@
 #!substr*substr*substr	type
 #
 # the first two entries are for the vtc tests
-android*android*opera mini/	Mobile Phone
+android*me302c	Tablet
 motorokr z6/r60_g_80.xx.yyi mozilla/4.0 (compatible; msie 6.0 linux; motorokr z6;nnn) profile/midp-2.0 configuration/cldc-1.1 opera 8.50[yy] up.link/6.3.0.0.0 netbiscuits	Mobile Phone
 iPad	Tablet
 iPhone	Mobile Phone
@@ -138,10 +119,9 @@ Googlebot-Video/	Bot
 Googlebot/	Bot
 Meidapartners-Google	Bot
 Coolpix	Camera
-macintosh*intel*mac os	Computer
 kindle	eReader
-google-site-verification	Devtool
-ios 4.2	OperatingSystem
-windows*firefox	Desktop Browser
+google-site-verification	DevTool
+windows*firefox	Desktop-Browser
 googletv	Settop-Box, TV
 Android	Mobile Phone
+totallyobscureuseragent	unknown

src/tests/dcs01.vtc

@@ -57,7 +57,8 @@ client c1 {
 	rxresp
 	expect resp.status == 200
 	expect resp.http.xx-entry-key == "generic wap"
-	expect resp.http.xx-type-id == "11"
+	# cant test - can change easily
+	# expect resp.http.xx-type-id == "11"
 	expect resp.http.x-nb-classified == "Mobile Phone"
 	expect resp.http.X-DeviceClass == "smartphone"
 } -run
@@ -67,9 +68,10 @@ client c1 {
               -hdr "X-OperaMini-Phone-UA: Mozilla/5.0 (Linux; U; Android 4.3; de-de; ME302C Build/JSS15Q) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30"
 	rxresp
 	expect resp.status == 200
-	expect resp.http.xx-entry-key == "android*android*opera mini/"
-	expect resp.http.xx-type-id == "11"
-	expect resp.http.x-nb-classified == "Mobile Phone"
-	expect resp.http.X-DeviceClass == "smartphone"
+	expect resp.http.xx-entry-key == "android*me302c"
+	# cant test - can change easily
+	# expect resp.http.xx-type-id == "11"
+	expect resp.http.x-nb-classified == "Tablet"
+	expect resp.http.X-DeviceClass == "tablet"
 } -run
 

src/tests/dcs02_excessive_ua_length.vtc

@@ -47,7 +47,8 @@ client c1 {
 	rxresp
 	expect resp.status == 200
 	expect resp.http.xx-entry-key == "motorokr z6/r60_g_80.xx.yyi mozilla/4.0 (compatible; msie 6.0 linux; motorokr z6;nnn) profile/midp-2.0 configuration/cldc-1.1 opera 8.50[yy] up.link/6.3.0.0.0 netbiscuits"
-	expect resp.http.xx-type-id == "11"
+	# cant test
+	# expect resp.http.xx-type-id == "11"
 	expect resp.http.x-nb-classified == "Mobile Phone"
 	expect resp.http.X-DeviceClass == "smartphone"
 } -run