From 00f7bbda96d32d3c323ad03559669e757e4d20c4 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@ncsa.illinois.edu>
Date: Wed, 28 Nov 2012 14:53:36 -0600
Subject: [PATCH] Add test of record() constructor to table initializer unit
 test.

---
 .../output                                    |  8 +++++++
 .../language/table-init-container-ctors.bro   | 21 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/testing/btest/Baseline/language.table-init-container-ctors/output b/testing/btest/Baseline/language.table-init-container-ctors/output
index feda20fea7..27774a660a 100644
--- a/testing/btest/Baseline/language.table-init-container-ctors/output
+++ b/testing/btest/Baseline/language.table-init-container-ctors/output
@@ -28,6 +28,14 @@ table of table
 }
 }
 
+table of record
+{
+[13] = [a=1, b=foo],
+[5] = [a=2, b=bar]
+}
+
+T
+T
 T
 T
 T
diff --git a/testing/btest/language/table-init-container-ctors.bro b/testing/btest/language/table-init-container-ctors.bro
index 8882cb5640..4829f41688 100644
--- a/testing/btest/language/table-init-container-ctors.bro
+++ b/testing/btest/language/table-init-container-ctors.bro
@@ -7,10 +7,15 @@
 type set_yield: set[string, count];
 type vector_yield: vector of count;
 type table_yield: table[string, count] of count;
+type record_yield: record {
+	a: count;
+	b: string;
+};
 
 global lone_set_ctor: set_yield = set(["foo", 1], ["bar", 2]);
 global lone_vector_ctor: vector_yield = vector(1, 2);
 global lone_table_ctor: table_yield = table(["foo", 1] = 1, ["bar", 2] = 2);
+global lone_record_ctor: record_yield = record($a=1, $b="foo");
 
 global table_of_set: table[count] of set_yield = {
 	[13] = lone_set_ctor,
@@ -27,11 +32,17 @@ global table_of_table: table[count] of table_yield = {
 	 [5] = table(["bah", 3] = 3, ["baz", 4] = 4),
 };
 
+global table_of_record: table[count] of record_yield = {
+	[13] = lone_record_ctor,
+	 [5] = record($a=2, $b="bar"),
+};
+
 # Just copying the inline ctors used in the table initializer lists here
 # for later comparisons.
 global inline_set_ctor: set_yield = set(["bah", 3], ["baz", 4]);
 global inline_vector_ctor: vector_yield = vector(3, 4);
 global inline_table_ctor: table_yield = table(["bah", 3] = 3, ["baz", 4] = 4);
+global inline_record_ctor: record_yield = record($a=2, $b="bar");
 
 function compare_set_yield(a: set_yield, b: set_yield)
 	{
@@ -56,6 +67,11 @@ function compare_table_yield(a: table_yield, b: table_yield)
 		print [s, c] in b && a[s, c] == b[s, c];
 	}
 
+function compare_record_yield(a: record_yield, b: record_yield)
+	{
+	print a$a == b$a && a$b == b$b;
+	}
+
 print "table of set";
 print table_of_set;
 print "";
@@ -65,6 +81,9 @@ print "";
 print "table of table";
 print table_of_table;
 print "";
+print "table of record";
+print table_of_record;
+print "";
 
 compare_set_yield(table_of_set[13], lone_set_ctor);
 compare_set_yield(table_of_set[5], inline_set_ctor);
@@ -72,3 +91,5 @@ compare_vector_yield(table_of_vector[13], lone_vector_ctor);
 compare_vector_yield(table_of_vector[5], inline_vector_ctor);
 compare_table_yield(table_of_table[13], lone_table_ctor);
 compare_table_yield(table_of_table[5], inline_table_ctor);
+compare_record_yield(table_of_record[13], lone_record_ctor);
+compare_record_yield(table_of_record[5], inline_record_ctor);