From 66c5bdbeac48748d2edd956e320d956045907b5a Mon Sep 17 00:00:00 2001
From: Vern Paxson <vern@corelight.com>
Date: Sun, 4 Dec 2022 17:56:30 -0800
Subject: [PATCH] update test suite to avoid GH-2385 problems, including
 incorrect typing

---
 testing/btest/Baseline/bifs.table_values/out       | 10 ++++++++--
 testing/btest/Baseline/language.trailing-comma/out | 12 +++++++++---
 testing/btest/bifs/table_values.zeek               | 10 +++++-----
 testing/btest/language/trailing-comma.zeek         |  4 ++--
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/testing/btest/Baseline/bifs.table_values/out b/testing/btest/Baseline/bifs.table_values/out
index d89f8a0be4..a8105f90d0 100644
--- a/testing/btest/Baseline/bifs.table_values/out
+++ b/testing/btest/Baseline/bifs.table_values/out
@@ -1,3 +1,9 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-[example, test]
-[80/tcp, http, 443/tcp, https, 21/tcp, ftp, 23/tcp, telnet]
+[example, test], vector of string
+[{
+[80/tcp, http] ,
+[443/tcp, https] 
+}, {
+[21/tcp, ftp] ,
+[23/tcp, telnet] 
+}], vector of set[port,string]
diff --git a/testing/btest/Baseline/language.trailing-comma/out b/testing/btest/Baseline/language.trailing-comma/out
index 3c95ca6f8d..1927b10eaf 100644
--- a/testing/btest/Baseline/language.trailing-comma/out
+++ b/testing/btest/Baseline/language.trailing-comma/out
@@ -38,9 +38,15 @@ tab6, table[string,string] of vector of count, {
 [a, b] = [1, 2],
 [c, d] = [3, 4]
 }
-tab7, table[string,string] of list of count,count, {
-[a, b] = 1, 2,
-[c, d] = 3, 4
+tab7, table[string,string] of set[count], {
+[a, b] = {
+2,
+1
+},
+[c, d] = {
+4,
+3
+}
 }
 tab8, table[MyRecord] of count, {
 [[a=c, b=d]] = 43,
diff --git a/testing/btest/bifs/table_values.zeek b/testing/btest/bifs/table_values.zeek
index 39dc1c1371..e702cd4929 100644
--- a/testing/btest/bifs/table_values.zeek
+++ b/testing/btest/bifs/table_values.zeek
@@ -6,12 +6,12 @@ event zeek_init()
 	{
 	local t1: table[count] of string = table([5] = "test", [0] = "example");
 	local t2 = table(
-		["web"] = { [80/tcp, "http"], [443/tcp, "https"] },
-		["login"] = { [21/tcp, "ftp"], [23/tcp, "telnet"] });
+		["web"] = set( [80/tcp, "http"], [443/tcp, "https"] ),
+		["login"] = set( [21/tcp, "ftp"], [23/tcp, "telnet"] ));
 	
-	local v1: vector of set[string] = table_values(t1);
+	local v1: vector of string = table_values(t1);
 	local v2: vector of set[port, string] = table_values(t2);
 
-	print v1;
-	print v2;
+	print v1, type_name(v1);
+	print v2, type_name(v2);
 	}
diff --git a/testing/btest/language/trailing-comma.zeek b/testing/btest/language/trailing-comma.zeek
index 2084651c66..d2563380d5 100644
--- a/testing/btest/language/trailing-comma.zeek
+++ b/testing/btest/language/trailing-comma.zeek
@@ -79,8 +79,8 @@ event zeek_init()
 	print "tab6", type_name(tab6), tab6;
 
 	local tab7 = table(
-		["a", "b"] = [1, 2, ],
-		["c", "d"] = [3, 4, ],
+		["a", "b"] = set(1, 2, ),
+		["c", "d"] = set(3, 4, ),
 	);
 	print "tab7", type_name(tab7), tab7;