From: Jaap A. Haitsma <jaap@haitsma.org>
Date: Thu, 29 May 2008 10:10:33 +0000 (+0000)
Subject: Add some more tests. Fixes bug #535430
X-Git-Tag: VALA_0_3_3~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e91ff952bfa2f116a2350b53fe27754a058c6a34;p=thirdparty%2Fvala.git

Add some more tests. Fixes bug #535430

2008-05-29  Jaap A. Haitsma  <jaap@haitsma.org>

	* tests/strings.vala:
	Add some more tests. Fixes bug #535430

svn path=/trunk/; revision=1481
---

diff --git a/ChangeLog b/ChangeLog
index feff56737..d1cecf78a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-29  Jaap A. Haitsma  <jaap@haitsma.org>
+
+	* tests/strings.vala:
+	Add some more tests. Fixes bug #535430
+
 2008-05-29  Jaap A. Haitsma  <jaap@haitsma.org>
 
 	* vapi/gstreamer-0.10.vapi:
diff --git a/tests/strings.vala b/tests/strings.vala
index 0ec15702f..95ba30562 100644
--- a/tests/strings.vala
+++ b/tests/strings.vala
@@ -1,6 +1,45 @@
 using GLib;
 
 class Maman.Foo : Object {
+
+	const string[] array_field = {"1", "2"};
+
+	/* Does not work, because of bug 516287 
+	static const public string s1_field = "1" + "2";
+	static const string s2_field = "1" + "2";
+
+	*/
+	static void test_string_initializers () {
+		/* Does not work yet. bug 530623
+		// Local constant
+		const string s1 = "1";
+		assert (s1 == "1");
+		*/
+
+		/* Does not work yet. bug 530623 and bug 516287
+		// Local constant with string concatenation
+		const string s2 = "1" + "2";
+		assert (s2 == "12");
+		*/
+
+		// string array
+		string[] array1 = {"1", "2"};
+		
+		assert (array1[0] == "1");
+		assert (array1[1] == "2");
+		assert (array1.length == 2);
+
+		// string array field
+		assert (array_field[0] == "1");
+		assert (array_field[1] == "2");
+		assert (array_field.length == 2);
+
+		/* Does not work, because of bug 516287 
+		// const field string with concatenation
+		assert (s1_field == "12");
+		assert (s2_field == "12");
+		*/
+	}
 	static void test_string_operators () {
 		// string == operator compares content not reference
 		string s1 = "string";
@@ -30,6 +69,7 @@ class Maman.Foo : Object {
 		stdout.printf (" 8\n");
 
 		test_string_operators ();
+		test_string_initializers ();
 
 		return 0;
 	}