Add tests for previously-untested strings BIFs

testing/btest/Baseline/bifs.byte_len/out

@@ -0,0 +1 @@
+11

testing/btest/Baseline/bifs.cat_string_array/out

@@ -0,0 +1,3 @@
+isatest
+thisisatest
+isa

testing/btest/Baseline/bifs.edit/out

@@ -0,0 +1 @@
+llo t

testing/btest/Baseline/bifs.escape_string/out

@@ -0,0 +1,10 @@
+12
+Test \0string
+13
+Test \0string
+15
+Test \x00string
+13
+Test \0string
+24
+546573742000737472696e67

testing/btest/Baseline/bifs.find_all/out

@@ -0,0 +1,4 @@
+es
+hi
+-------------------
+0

testing/btest/Baseline/bifs.find_last/out

@@ -0,0 +1,3 @@
+es
+-------------------
+0

testing/btest/Baseline/bifs.hexdump/out

@@ -0,0 +1 @@
+0000  61 62 63 ff 64 65 66 67  68 69 6a 6b 6c 6d 6e 6f  abc.defg hijklmno^J0010  70 71 72 73 74 75 76 77  78 79 7a                 pqrstuvw xyz^J

testing/btest/Baseline/bifs.join_string/out

@@ -0,0 +1 @@
+this * is * a * test

testing/btest/Baseline/bifs.lowerupper/out

@@ -0,0 +1,2 @@
+this is a test
+THIS IS A TEST

testing/btest/Baseline/bifs.sort_string_array/out

@@ -0,0 +1,4 @@
+a
+is
+test
+this

testing/btest/Baseline/bifs.split/out

@@ -0,0 +1,32 @@
+t
+s is a t
+t
+---------------------
+t
+s is a test
+---------------------
+t
+hi
+s is a t
+es
+t
+---------------------
+t
+s is a test
+---------------------
+t
+hi
+s is a test
+---------------------
+[, thi, s i, s a tes, t]
+---------------------
+X-Mailer
+Testing Test (http://www.example.com)
+---------------------
+A 
+=
+ B 
+=
+ C 
+=
+ D

testing/btest/Baseline/bifs.str_shell_escape/out

@@ -0,0 +1,4 @@
+24
+echo ${TEST} > "my file"
+27
+echo \${TEST} > \"my file\"

testing/btest/Baseline/bifs.strcmp/out

@@ -0,0 +1,3 @@
+T
+T
+T

testing/btest/Baseline/bifs.string_fill/out

@@ -0,0 +1,3 @@
+*\0* 1
+*t\0* 2
+*test test\0* 10

testing/btest/Baseline/bifs.string_splitting/out

@@ -1,13 +0,0 @@
-{
-[2] = Testing Test (http://www.example.com),
-[1] = X-Mailer
-}
-{
-[2] = =,
-[4] = =,
-[6] = =,
-[7] =  D,
-[1] = A ,
-[5] =  C ,
-[3] =  B 
-}

testing/btest/Baseline/bifs.strip/out

@@ -0,0 +1,6 @@
+*  this is a test *
+*this is a test*
+**
+**
+* *
+**

testing/btest/Baseline/bifs.strstr/out

@@ -0,0 +1,2 @@
+2
+0

testing/btest/Baseline/bifs.sub/out

@@ -0,0 +1,2 @@
+that is a test
+that at a test

testing/btest/Baseline/bifs.subst_string/out

@@ -0,0 +1 @@
+that at another test

testing/btest/bifs/byte_len.bro

@@ -0,0 +1,10 @@
+#
+# @TEST-EXEC: bro %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+event bro_init()
+	{
+	local a = "hello\0there";
+
+	print byte_len(a);
+	}

testing/btest/bifs/cat_string_array.bro

@@ -0,0 +1,14 @@
+#
+# @TEST-EXEC: bro %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+event bro_init()
+	{
+	local a: string_array = { 
+		[0] = "this", [1] = "is", [2] = "a", [3] = "test" 
+	};
+
+	print cat_string_array(a);
+	print cat_string_array_n(a, 0, |a|-1);
+	print cat_string_array_n(a, 1, 2);
+	}

testing/btest/bifs/edit.bro

@@ -0,0 +1,10 @@
+#
+# @TEST-EXEC: bro %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+event bro_init()
+	{
+	local a = "hello there";
+
+	print edit(a, "e");
+	}

testing/btest/bifs/escape_string.bro

@@ -0,0 +1,27 @@
+#
+# @TEST-EXEC: bro %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+event bro_init()
+	{
+	local a = "Test \0string";
+
+	print |a|;
+	print a;
+
+	local b = clean(a);
+	print |b|;
+	print b;
+
+	local c = to_string_literal(a);
+	print |c|;
+	print c;
+
+	local d = escape_string(a);
+	print |d|;
+	print d;
+
+	local e = string_to_ascii_hex(a);
+	print |e|;
+	print e;
+	}

testing/btest/bifs/find_all.bro

@@ -0,0 +1,18 @@
+#
+# @TEST-EXEC: bro %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+event bro_init()
+	{
+	local a = "this is a test";
+	local pat = /hi|es/;
+	local pat2 = /aa|bb/;
+
+	local b = find_all(a, pat);
+	local b2 = find_all(a, pat2);
+
+	for (i in b)
+		print i;
+	print "-------------------";
+	print |b2|;
+	}

testing/btest/bifs/find_last.bro

@@ -0,0 +1,17 @@
+#
+# @TEST-EXEC: bro %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+event bro_init()
+	{
+	local a = "this is a test";
+	local pat = /hi|es/;
+	local pat2 = /aa|bb/;
+
+	local b = find_last(a, pat);
+	local b2 = find_last(a, pat2);
+
+	print b;
+	print "-------------------";
+	print |b2|;
+	}

testing/btest/bifs/hexdump.bro

@@ -0,0 +1,10 @@
+#
+# @TEST-EXEC: bro %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+event bro_init()
+	{
+	local a = "abc\xffdefghijklmnopqrstuvwxyz";
+
+	print hexdump(a);
+	}

testing/btest/bifs/join_string.bro

@@ -0,0 +1,14 @@
+#
+# @TEST-EXEC: bro %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+event bro_init()
+	{
+	local a: string_array = { 
+		[1] = "this", [2] = "is", [3] = "a", [4] = "test" 
+	};
+	local b: string_vec = vector( "this", "is", "another", "test" );
+
+	print join_string_array(" * ", a);
+	print join_string_vec(b, "__");
+	}

testing/btest/bifs/lowerupper.bro

@@ -0,0 +1,11 @@
+#
+# @TEST-EXEC: bro %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+event bro_init()
+	{
+	local a = "this is a Test";
+
+	print to_lower(a);
+	print to_upper(a);
+	}

testing/btest/bifs/sort_string_array.bro

@@ -0,0 +1,17 @@
+#
+# @TEST-EXEC: bro %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+event bro_init()
+	{
+	local a: string_array = { 
+		[1] = "this", [2] = "is", [3] = "a", [4] = "test" 
+	};
+
+	local b = sort_string_array(a);
+
+	print b[1];
+	print b[2];
+	print b[3];
+	print b[4];
+	}

testing/btest/bifs/split.bro

@@ -0,0 +1,59 @@
+#
+# @TEST-EXEC: bro %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+event bro_init()
+	{
+	local a = "this is a test";
+	local pat = /hi|es/;
+	local idx = vector( 3, 6, 13);
+
+	local b = split(a, pat);
+	local c = split1(a, pat);
+	local d = split_all(a, pat);
+	local e1 = split_n(a, pat, F, 1);
+	local e2 = split_n(a, pat, T, 1);
+
+	print b[1];
+	print b[2];
+	print b[3];
+	print b[4];
+	print "---------------------";
+	print c[1];
+	print c[2];
+	print "---------------------";
+	print d[1];
+	print d[2];
+	print d[3];
+	print d[4];
+	print d[5];
+	print "---------------------";
+	print e1[1];
+	print e1[2];
+	print "---------------------";
+	print e2[1];
+	print e2[2];
+	print e2[3];
+	print "---------------------";
+	print str_split(a, idx);
+	print "---------------------";
+
+	a = "X-Mailer: Testing Test (http://www.example.com)";
+	pat = /:[[:blank:]]*/;
+	local f = split1(a, pat);
+
+	print f[1];
+	print f[2];
+	print "---------------------";
+
+	a = "A = B = C = D";
+	pat = /=/;
+	local g = split_all(a, pat);
+	print g[1];
+	print g[2];
+	print g[3];
+	print g[4];
+	print g[5];
+	print g[6];
+	print g[7];
+	}

testing/btest/bifs/str_shell_escape.bro

@@ -0,0 +1,15 @@
+#
+# @TEST-EXEC: bro %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+event bro_init()
+	{
+	local a = "echo ${TEST} > \"my file\"";
+
+	print |a|;
+	print a;
+
+	local b = str_shell_escape(a);
+	print |b|;
+	print b;
+	}

testing/btest/bifs/strcmp.bro

@@ -0,0 +1,13 @@
+#
+# @TEST-EXEC: bro %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+event bro_init()
+	{
+	local a = "this";
+	local b = "testing";
+
+	print strcmp(a, b) > 0;
+	print strcmp(b, a) < 0;
+	print strcmp(a, a) == 0;
+	}

testing/btest/bifs/string_fill.bro

@@ -0,0 +1,16 @@
+#
+# @TEST-EXEC: bro %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+event bro_init()
+	{
+	local a = "test ";
+
+	local b = string_fill(1, a);
+	local c = string_fill(2, a);
+	local d = string_fill(10, a);
+
+	print fmt("*%s* %d", b, |b|);
+	print fmt("*%s* %d", c, |c|);
+	print fmt("*%s* %d", d, |d|);
+	}

testing/btest/bifs/string_splitting.bro

@@ -1,12 +0,0 @@
-#
-# @TEST-EXEC: bro %INPUT >out
-# @TEST-EXEC: btest-diff out
-
-event bro_init()
-	{
-	local a = "X-Mailer: Testing Test (http://www.example.com)";
-	print split1(a, /:[[:blank:]]*/);
-
-	a = "A = B = C = D";
-	print split_all(a, /=/);
-	}

testing/btest/bifs/strip.bro

@@ -0,0 +1,17 @@
+#
+# @TEST-EXEC: bro %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+event bro_init()
+	{
+	local a = "  this is a test ";
+	local b = "";
+	local c = " ";
+
+	print fmt("*%s*", a);
+	print fmt("*%s*", strip(a));
+	print fmt("*%s*", b);
+	print fmt("*%s*", strip(b));
+	print fmt("*%s*", c);
+	print fmt("*%s*", strip(c));
+	}

testing/btest/bifs/strstr.bro

@@ -0,0 +1,13 @@
+#
+# @TEST-EXEC: bro %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+event bro_init()
+	{
+	local a = "this is a test";
+	local b = "his";
+	local c = "are";
+
+	print strstr(a, b);
+	print strstr(a, c);
+	}

testing/btest/bifs/sub.bro

@@ -0,0 +1,12 @@
+#
+# @TEST-EXEC: bro %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+event bro_init()
+	{
+	local a = "this is a test";
+	local pat = /is|ss/;
+
+	print sub(a, pat, "at");
+	print gsub(a, pat, "at");
+	}

testing/btest/bifs/subst_string.bro

@@ -0,0 +1,12 @@
+#
+# @TEST-EXEC: bro %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+event bro_init()
+	{
+	local a = "this is another test";
+	local b = "is";
+	local c = "at";
+
+	print subst_string(a, b, c);
+	}