X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/b3db2950b11fc5f3abd9ecdae855746e2d19c836..573256d3bc21896c54c511d5c0e6927f09b4209e:/src/test.gob

diff --git a/src/test.gob b/src/test.gob
index 8146a72..a885f4f 100644
--- a/src/test.gob
+++ b/src/test.gob
@@ -84,6 +84,14 @@ error TEST_OBJECT_ERROR {
 	BAD_THAT
 } Test:Object:Error;
 
+enum BUBLE {
+        KEIN = 0,
+        STANDARD,
+        STANDARD_RO,
+        KOMPLETT,
+        ALT
+} Buble:Enum;
+
 class Test:Object from G:Object
 	(interface Gtk:Tree:Model)
 	/* We can add more interfaces by adding more lines like the above */
@@ -196,18 +204,18 @@ class Test:Object from G:Object
 				link);
 
 	private Some:Flags flags_property;
-	property ENUM flags_property (nick   = "flagsprop",
+	property FLAGS flags_property (nick   = "flagsprop",
 				blurb  = "flagsprop",
 				flags_type = Some:Flags,
 				link);
 
-	  private PackageBoxed *prop;
+	  private PackageBoxed prop;
 	  property BOXED prop (nick="prop",
 			       blurb="prop",
 			       boxed_type=Package:Boxed,
 			       link);
 	  /* testing old semantics */
-	  private PackageBoxed *prop2;
+	  private PackageBoxed prop2;
 	  property BOXED prop2 (nick="prop2",
 			       blurb="prop2",
 			       boxed_type=PACKAGE_TYPE_BOXED,
@@ -269,6 +277,9 @@ class Test:Object from G:Object
 	char *
 	test_handler (self, GObject *w, int h, gpointer data)
 	{
+		data = w = NULL;
+		h = 0;
+			
 		return NULL;
 	}
 
@@ -292,6 +303,9 @@ class Test:Object from G:Object
 		test_object_connect_data__bleh (self, self_test_handler, NULL, NULL, 0);
 		self_connect_data__bleh (self, self_test_handler, NULL, NULL, 0);
 
+		wid = NULL;
+		h = 0;
+
 		/* testing multiple marshaller support */
 		return 0;
 	}
@@ -332,14 +346,17 @@ class Test:Object from G:Object
 	}*/
 	public int consttest(self, const gchar *text, ...)
 	{
+		text = NULL;
 		return 25;
 	}
 	public int consttest2(self, gchar const *text, ...)
 	{
+		text = NULL;
 		return 25;
 	}
 	public int consttest3(self, G:Object const *wid (check null type))
 	{
+		wid = NULL;
 		return 25;
 	}
 	public int consttest4(const self)
@@ -367,10 +384,14 @@ class Test:Object from G:Object
 	}
 	public int consttest9(const self, int i, double b)
 	{
+		b = 0.0;
+		i = 0;
 		return 25;
 	}
 	public int consttest10(self const, int i, double b)
 	{
+		b = 0.0;
+		i = 0;
 		return 25;
 	}
 	signal private first NONE (NONE)
@@ -412,26 +433,32 @@ class Test:Object from G:Object
 	{
 		puts("TEST3");
 		self_googlegoogle(self);
+		if (some_array[0]) return;
 	}
 	private virtual
 	void testprivvirtual2(self, const int some_array[5][8][9])
 	{
 		/* nothing here */
+		if (some_array[0]) return;
 	}
 	public virtual
 	void testpublicvirtual(self, int const some_array[5][8][9])
 	{
 		/* nothing here */
+		if (some_array[0]) return;
 	}
 	protected virtual
 	void testprotectedvirtual(self, int some_array[5][8][9])
 	{
 		/* nothing here */
+		if (some_array[0]) return;
 	}
-	signal first NONE (POINTER)
-	void testarrsignal(self, long arr[8])
+	signal first NONE (POINTER, ENUM)
+	void testarrsignal(self, long arr[8], Buble:Enum foo)
 	{
 		/* foo */
+		arr[0] = 1;
+		foo = BUBLE_KEIN;
 	}
 
 	/* testing empty func */
@@ -481,6 +508,10 @@ class Test:Object from G:Object
 		 gulong g, gfloat h, gdouble i, gchar * j, gint k,
 		 gpointer o, GObject *p)
 	{
+		h = i = k = 0;
+		a = b = c = d = e = f = g = 0;
+		o = p = (GObject *)NULL;
+		j = (char *)NULL;
 		/* ugh, testing casting */
 	}
 
@@ -498,6 +529,15 @@ class Test:Object from G:Object
 		return FALSE;
 	}
 
+	/* some more enum testing */
+	public BubleEnum buble;
+        property ENUM buble
+                (nick = "Buble",
+                 blurb = "Buble",
+                 enum_type = Buble:Enum,
+                 default_value = BUBLE_STANDARD,
+                 link, export);
+
 	/* testing types */
 	public int t1;
 	public long int t2;