From: Timm Bäder <mail@baedert.org>
Date: Tue, 8 Nov 2016 07:44:26 +0000 (+0100)
Subject: Add more nullability tests
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b010635c7e7d7ad0ee10cec57b05acb10128b193;p=thirdparty%2Fvala.git

Add more nullability tests
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 58767d15d..c1ef055e6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -237,6 +237,9 @@ TESTS = \
 	gir/bug742012.test \
 	nullability/local-reference.vala \
 	nullability/assignment-to-non-nullable-ok.vala \
+	nullability/assignment-to-non-nullable-fail.test \
+	nullability/coalesce-operator.vala \
+	nullability/non-null-assign.vala
 	$(NULL)
 
 check-TESTS: $(TESTS)
diff --git a/tests/nullability/assignment-to-non-nullable-fail.test b/tests/nullability/assignment-to-non-nullable-fail.test
new file mode 100644
index 000000000..1045ccf25
--- /dev/null
+++ b/tests/nullability/assignment-to-non-nullable-fail.test
@@ -0,0 +1,9 @@
+Invalid Code
+
+void main () {
+	string? s = null;
+
+	string s2;
+	
+	s2 = s; // can't convert string? to string.
+}
diff --git a/tests/nullability/assignment-to-nullable.test b/tests/nullability/assignment-to-nullable.test
new file mode 100644
index 000000000..010781b96
--- /dev/null
+++ b/tests/nullability/assignment-to-nullable.test
@@ -0,0 +1,7 @@
+Invalid Code
+
+void main () {
+	string? s = null;
+
+	string s2 = s; // can't convert string? to string.
+}
diff --git a/tests/nullability/coalesce-operator.vala b/tests/nullability/coalesce-operator.vala
new file mode 100644
index 000000000..c6d1294e4
--- /dev/null
+++ b/tests/nullability/coalesce-operator.vala
@@ -0,0 +1,10 @@
+
+
+void main () {
+	string? s1 = null;
+	string s2;
+
+	//s2 = s1 ?? "foo";
+
+	//assert (s2 == "foo");
+}
diff --git a/tests/nullability/non-null-assign.vala b/tests/nullability/non-null-assign.vala
new file mode 100644
index 000000000..3bc9e79c6
--- /dev/null
+++ b/tests/nullability/non-null-assign.vala
@@ -0,0 +1,9 @@
+
+
+void main () {
+	string? s = null;
+
+	s = "foo";
+
+	int k = s.length;
+}