diff options
| author | Lauro Moura <lauromoura@expertisesolutions.com.br> | 2018-05-03 01:02:11 -0300 |
|---|---|---|
| committer | Lauro Moura <lauromoura@expertisesolutions.com.br> | 2018-05-03 18:04:41 -0300 |
| commit | fe7106d4600edb368a51a7c683d5fd35a4e211fe (patch) | |
| tree | 29ae683965c0e62d1c9560298ade51e38d3f8837 | |
| parent | 4636d6e0eb1f4a66b202b6cf6df793ec40c135a6 (diff) | |
| download | efl-fe7106d4600edb368a51a7c683d5fd35a4e211fe.tar.gz | |
efl_mono: Update tests and examples after rename
Summary:
Separated from the generator and libs for easier review
Depends on D6050
Reviewers: felipealmeida, vitor.sousa
Reviewed By: vitor.sousa
Subscribers: cedric
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D6051
22 files changed, 455 insertions, 455 deletions
diff --git a/src/examples/efl_mono/EoInherit01.cs b/src/examples/efl_mono/EoInherit01.cs index 17ea4df27e..cf35ca5f3e 100644 --- a/src/examples/efl_mono/EoInherit01.cs +++ b/src/examples/efl_mono/EoInherit01.cs @@ -2,7 +2,7 @@ using static System.Console; class PlusTenNumberWrapper : example.NumberwrapperInherit { - public PlusTenNumberWrapper(efl.Object parent = null) + public PlusTenNumberWrapper(efl.IObject parent = null) : base(parent) {} @@ -52,7 +52,7 @@ public class ExampleEoInherit01 WriteLine("## Using original object ##\n"); // Check original EFL object - var origObj = new example.NumberwrapperConcrete(); + var origObj = new example.Numberwrapper(); given = 111; origObj.SetNumber(given); stored = origObj.GetNumber(); diff --git a/src/examples/efl_mono/FunctionPointer01.cs b/src/examples/efl_mono/FunctionPointer01.cs index 2954473a27..c32f53cd51 100644 --- a/src/examples/efl_mono/FunctionPointer01.cs +++ b/src/examples/efl_mono/FunctionPointer01.cs @@ -15,7 +15,7 @@ public class ExampleFunctionPointer01 eina.Config.Init(); efl.eo.Config.Init(); - var obj = new example.NumberwrapperConcrete(); + var obj = new example.Numberwrapper(); // Set internal value obj.SetNumber(12); diff --git a/src/examples/elementary/efl_ui_slider_mono.cs b/src/examples/elementary/efl_ui_slider_mono.cs index 6a5c6af16e..62b3504fcd 100644 --- a/src/examples/elementary/efl_ui_slider_mono.cs +++ b/src/examples/elementary/efl_ui_slider_mono.cs @@ -2,11 +2,11 @@ using System; public class Example { - public static efl.ui.Button CreateButton(efl.Object parent, + public static efl.ui.IButton CreateButton(efl.IObject parent, string text, int w, int h, EventHandler callback) { - efl.ui.Button button = new efl.ui.ButtonConcrete(parent); + efl.ui.IButton button = new efl.ui.Button(parent); button.SetText(text); button.SetSize(new eina.Size2D(w, h)); @@ -36,32 +36,32 @@ public class Example efl.All.Init(efl.Components.Ui); - efl.ui.Win win = new efl.ui.WinConcrete(null); + efl.ui.Win win = new efl.ui.Win(null); win.SetText("Hello, C#!!"); win.SetAutohide(true); - efl.ui.Box_Flow box = new efl.ui.Box_FlowConcrete(win); + efl.ui.Box_Flow box = new efl.ui.Box_Flow(win); - efl.ui.Button button = CreateButton(box, "Click to exit", 120, 30, + efl.ui.IButton button = CreateButton(box, "Click to exit", 120, 30, (object sender, EventArgs e) => { efl.ui.Config.Exit(); }); - box.Pack(button); + box.DoPack(button); - efl.ui.Progressbar bar = new efl.ui.ProgressbarConcrete(box); + efl.ui.Progressbar bar = new efl.ui.Progressbar(box); bar.SetSize(new eina.Size2D(W, H)); bar.SetFormatCb(Formatter); - efl.ui.Slider slider = new efl.ui.SliderConcrete(box); + efl.ui.ISlider slider = new efl.ui.Slider(box); slider.SetSize(new eina.Size2D(W, H)); slider.ChangedEvt += (object sender, EventArgs e) => { bar.SetRangeValue(slider.GetRangeValue()); }; - box.Pack(bar); - box.Pack(slider); + box.DoPack(bar); + box.DoPack(slider); button.SetVisible(true); box.SetVisible(true); diff --git a/src/examples/elementary/efl_ui_unit_converter.cs b/src/examples/elementary/efl_ui_unit_converter.cs index d8c5691865..85fd0213e8 100644 --- a/src/examples/elementary/efl_ui_unit_converter.cs +++ b/src/examples/elementary/efl_ui_unit_converter.cs @@ -16,14 +16,14 @@ public class Example private static void ShowErrorPopup(efl.ui.Win win, string message) { - efl.ui.Popup_Alert popup = new efl.ui.Popup_AlertConcrete(win); - efl.ui.Text popup_text = new efl.ui.TextConcrete(popup); + efl.ui.IPopup_Alert popup = new efl.ui.Popup_Alert(win); + efl.ui.Text popup_text = new efl.ui.Text(popup); popup_text.SetText($"Error: {message}"); popup.SetContent(popup_text); popup.SetVisible(true); popup.SetButton(efl.ui.Popup_Alert_Button.Positive, "Ok"); popup.SetSize(new eina.Size2D(150, 30)); - popup.ButtonClickedEvt += (object sender, efl.ui.Popup_AlertConcrete.ButtonClickedEvt_Args e) => { + popup.ButtonClickedEvt += (object sender, efl.ui.Popup_Alert.ButtonClickedEvt_Args e) => { popup.SetParent(null); popup.Del(); }; @@ -41,63 +41,63 @@ public class Example efl.All.Init(efl.Components.Ui); - efl.ui.Win win = new efl.ui.WinConcrete(null); + efl.ui.Win win = new efl.ui.Win(null); win.SetText("C# Unit Converter"); win.SetAutohide(true); - efl.ui.Box_Flow box = new efl.ui.Box_FlowConcrete(win); + efl.ui.Box_Flow box = new efl.ui.Box_Flow(win); box.SetDirection(efl.ui.Dir.Horizontal); - efl.ui.Box_Flow miles_box = new efl.ui.Box_FlowConcrete(box); + efl.ui.Box_Flow miles_box = new efl.ui.Box_Flow(box); miles_box.SetDirection(efl.ui.Dir.Down); - box.Pack(miles_box); + box.DoPack(miles_box); - efl.ui.Text miles_label = new efl.ui.TextConcrete(miles_box); + efl.ui.Text miles_label = new efl.ui.Text(miles_box); miles_label.SetText("Miles:"); miles_label.SetSize(size); miles_label.SetVisible(true); - efl.ui.Text_Editable miles_input = new efl.ui.Text_EditableConcrete(miles_box); + efl.ui.Text_Editable miles_input = new efl.ui.Text_Editable(miles_box); miles_input.SetText(""); miles_input.SetScrollable(true); miles_input.SetSize(size); miles_input.SetVisible(true); - efl.ui.Button miles_button = new efl.ui.ButtonConcrete(miles_box); + efl.ui.IButton miles_button = new efl.ui.Button(miles_box); miles_button.SetText("To Km"); miles_button.SetSize(size); miles_button.SetVisible(true); - miles_box.Pack(miles_label); - miles_box.Pack(miles_input); - miles_box.Pack(miles_button); + miles_box.DoPack(miles_label); + miles_box.DoPack(miles_input); + miles_box.DoPack(miles_button); - efl.ui.Box_Flow kms_box = new efl.ui.Box_FlowConcrete(box); + efl.ui.Box_Flow kms_box = new efl.ui.Box_Flow(box); kms_box.SetDirection(efl.ui.Dir.Down); - box.Pack(kms_box); + box.DoPack(kms_box); - efl.ui.Text kms_label = new efl.ui.TextConcrete(kms_box); + efl.ui.Text kms_label = new efl.ui.Text(kms_box); kms_label.SetText("Kilometers:"); kms_label.SetSize(size); kms_label.SetVisible(true); - efl.ui.Text_Editable kms_input = new efl.ui.Text_EditableConcrete(kms_box); + efl.ui.Text_Editable kms_input = new efl.ui.Text_Editable(kms_box); kms_input.SetText(""); kms_input.SetScrollable(true); kms_input.SetSize(size); kms_input.SetVisible(true); - efl.ui.Button kms_button = new efl.ui.ButtonConcrete(kms_box); + efl.ui.IButton kms_button = new efl.ui.Button(kms_box); kms_button.SetText("To Miles"); kms_button.SetSize(size); kms_button.SetVisible(true); - kms_box.Pack(kms_label); - kms_box.Pack(kms_input); - kms_box.Pack(kms_button); + kms_box.DoPack(kms_label); + kms_box.DoPack(kms_input); + kms_box.DoPack(kms_button); kms_button.ClickedEvt += (object sender, EventArgs e) => { try diff --git a/src/examples/evas/evas_mono_box.cs b/src/examples/evas/evas_mono_box.cs index cdc4b8b150..97c161c536 100644 --- a/src/examples/evas/evas_mono_box.cs +++ b/src/examples/evas/evas_mono_box.cs @@ -4,7 +4,7 @@ using System.Runtime.CompilerServices; public class MyBox : evas.BoxInherit { - public MyBox(efl.Object parent) : base(parent) {} + public MyBox(efl.IObject parent) : base(parent) {} [DllImport("evas")] static extern void evas_obj_box_layout_vertical(IntPtr obj, IntPtr data, IntPtr privdata); [DllImport("evas")] static extern void evas_obj_box_layout_horizontal(IntPtr obj, IntPtr data, IntPtr privdata); @@ -32,18 +32,18 @@ class TestMain { efl.All.Init(); - efl.Loop loop = new efl.LoopConcrete(); + efl.Loop loop = new efl.Loop(); EcoreEvas ecore_evas = new EcoreEvas(); - efl.canvas.Object canvas = ecore_evas.canvas; + efl.canvas.IObject canvas = ecore_evas.canvas; canvas.SetVisible(true); - efl.Object parent = canvas.GetParent(); + efl.IObject parent = canvas.GetParent(); System.Diagnostics.Debug.Assert(parent.raw_handle != IntPtr.Zero); - evas.Box box = new MyBox(canvas); + evas.IBox box = new MyBox(canvas); eina.Size2D size = new eina.Size2D(); size.W = 320; @@ -52,7 +52,7 @@ class TestMain box.SetSize(size); box.SetVisible(true); - efl.canvas.Rectangle rect = new efl.canvas.RectangleConcrete(canvas); + efl.canvas.Rectangle rect = new efl.canvas.Rectangle(canvas); rect.SetColor(0, 0, 255, 255); size.W = 320; size.H = 120; @@ -60,7 +60,7 @@ class TestMain rect.SetVisible(true); box.Append(rect); - efl.canvas.Rectangle rect2 = new efl.canvas.RectangleConcrete(canvas); + efl.canvas.Rectangle rect2 = new efl.canvas.Rectangle(canvas); rect2.SetColor(0, 255, 0, 255); rect2.SetSize(size); rect2.SetVisible(true); diff --git a/src/examples/evas/evas_mono_image.cs b/src/examples/evas/evas_mono_image.cs index ff84db5d9a..47f9b36023 100644 --- a/src/examples/evas/evas_mono_image.cs +++ b/src/examples/evas/evas_mono_image.cs @@ -6,7 +6,7 @@ class TestMain static int WIDTH = 320; static int HEIGHT = 240; - evas.Image image; + evas.IImage image; static string ImagePath([CallerFilePath] string folder="") @@ -14,7 +14,7 @@ class TestMain return System.IO.Path.GetDirectoryName(folder); } - public TestMain(evas.Image image) + public TestMain(evas.IImage image) { this.image = image; } @@ -23,18 +23,18 @@ class TestMain { efl.All.Init(); - efl.Loop loop = new efl.LoopConcrete(); + efl.Loop loop = new efl.Loop(); EcoreEvas ecore_evas = new EcoreEvas(); eina.Size2D size = new eina.Size2D(); - efl.canvas.Object canvas = ecore_evas.canvas; + efl.canvas.IObject canvas = ecore_evas.canvas; canvas.SetVisible(true); - efl.Object parent = canvas.GetParent(); + efl.IObject parent = canvas.GetParent(); System.Diagnostics.Debug.Assert(parent.raw_handle != IntPtr.Zero); - efl.canvas.Rectangle bg = new efl.canvas.RectangleConcrete(canvas); + efl.canvas.Rectangle bg = new efl.canvas.Rectangle(canvas); bg.SetColor(255, 255, 255, 255); size.W = WIDTH; size.H = HEIGHT; @@ -42,7 +42,7 @@ class TestMain bg.SetVisible(true); string valid_path = args[0]; - evas.Image image = new evas.ImageConcrete(canvas); + evas.Image image = new evas.Image(canvas); image.SetFile(valid_path, null); /* FIXME evas-image uses error handling code from diff --git a/src/examples/evas/evas_mono_image2.cs b/src/examples/evas/evas_mono_image2.cs index e2ae49f092..1f0e52ac62 100644 --- a/src/examples/evas/evas_mono_image2.cs +++ b/src/examples/evas/evas_mono_image2.cs @@ -12,17 +12,17 @@ class TestMain { efl.All.Init(); - efl.Loop loop = new efl.LoopConcrete(); + efl.Loop loop = new efl.Loop(); EcoreEvas ecore_evas = new EcoreEvas(); eina.Size2D size = new eina.Size2D(); eina.Position2D pos = new eina.Position2D(); - efl.canvas.Object canvas = ecore_evas.canvas; + efl.canvas.IObject canvas = ecore_evas.canvas; canvas.SetVisible(true); - efl.canvas.Rectangle bg = new efl.canvas.RectangleConcrete(canvas); + efl.canvas.Rectangle bg = new efl.canvas.Rectangle(canvas); bg.SetColor(255, 255, 255, 255); pos.X = 0; pos.Y = 0; @@ -33,7 +33,7 @@ class TestMain bg.SetVisible(true); string path = args[0]; - evas.Image logo = new evas.ImageConcrete(canvas); + evas.Image logo = new evas.Image(canvas); logo.SetFillAuto(true); // TODO add preloaded support (depends on events) @@ -53,7 +53,7 @@ class TestMain pixels[i] = generator.Next(); } - evas.Image noise_img = new evas.ImageConcrete(canvas); + evas.Image noise_img = new evas.Image(canvas); size.W = WIDTH / 4; size.H = HEIGHT / 4; noise_img.SetSize(size); @@ -66,7 +66,7 @@ class TestMain noise_img.SetVisible(true); Console.WriteLine("Creating noise image with sizez %d, %d", WIDTH/4, HEIGHT/4); - efl.canvas.Proxy proxy_img = new efl.canvas.ProxyConcrete(canvas); + efl.canvas.Proxy proxy_img = new efl.canvas.Proxy(canvas); proxy_img.SetSource(noise_img); pos.X = WIDTH / 2; pos.Y = HEIGHT / 2; diff --git a/src/examples/evas/evas_mono_rectangle.cs b/src/examples/evas/evas_mono_rectangle.cs index 8db2c63e07..c31c24785e 100644 --- a/src/examples/evas/evas_mono_rectangle.cs +++ b/src/examples/evas/evas_mono_rectangle.cs @@ -14,15 +14,15 @@ class TestMain efl.All.Init(); - efl.Loop loop = new efl.LoopConcrete(); + efl.Loop loop = new efl.Loop(); EcoreEvas ecore_evas = new EcoreEvas(); - efl.canvas.Object canvas = ecore_evas.canvas; + efl.canvas.IObject canvas = ecore_evas.canvas; canvas.SetVisible(true); - efl.Object parent = canvas.GetParent(); + efl.IObject parent = canvas.GetParent(); System.Diagnostics.Debug.Assert(parent.raw_handle != IntPtr.Zero); - efl.canvas.Rectangle rect = new efl.canvas.RectangleConcrete(canvas); + efl.canvas.Rectangle rect = new efl.canvas.Rectangle(canvas); rect.SetColor(colors[0, 0], colors[0, 1], colors[0, 2], 255); eina.Size2D size = new eina.Size2D(); size.W = 640; @@ -30,7 +30,7 @@ class TestMain rect.SetSize(size); rect.SetVisible(true); - canvas.KeyDownEvt += (object sender, efl.input.InterfaceConcrete.KeyDownEvt_Args e) => { + canvas.KeyDownEvt += (object sender, efl.input.Interface.KeyDownEvt_Args e) => { color_index = (color_index + 1) % 3; Console.WriteLine("Key Down"); Console.WriteLine("Got key obj at {0}", e.arg.raw_handle.ToString("X")); diff --git a/src/examples/evas/evas_mono_table.cs b/src/examples/evas/evas_mono_table.cs index e79ad7c956..db329b22cd 100644 --- a/src/examples/evas/evas_mono_table.cs +++ b/src/examples/evas/evas_mono_table.cs @@ -11,7 +11,7 @@ class TestMain { efl.All.Init(); - efl.Loop loop = new efl.LoopConcrete(); + efl.Loop loop = new efl.Loop(); EcoreEvas ecore_evas = new EcoreEvas(); @@ -21,25 +21,25 @@ class TestMain eina.Size2D hint = new eina.Size2D(); - efl.canvas.Object canvas = ecore_evas.canvas; + efl.canvas.IObject canvas = ecore_evas.canvas; canvas.SetVisible(true); - efl.Object parent = canvas.GetParent(); + efl.IObject parent = canvas.GetParent(); System.Diagnostics.Debug.Assert(parent.raw_handle != IntPtr.Zero); - efl.canvas.Rectangle bg = new efl.canvas.RectangleConcrete(canvas); + efl.canvas.Rectangle bg = new efl.canvas.Rectangle(canvas); bg.SetColor(255, 255, 255, 255); bg.SetSize(size); bg.SetVisible(true); - evas.Table table = new evas.TableConcrete(canvas); + evas.Table table = new evas.Table(canvas); table.SetHomogeneous(evas.object_table.Homogeneous_Mode.None); table.SetPadding(0, 0); table.SetSize(size); table.SetVisible(true); - efl.canvas.Rectangle rect = new efl.canvas.RectangleConcrete(canvas); + efl.canvas.Rectangle rect = new efl.canvas.Rectangle(canvas); rect.SetColor(255, 0, 0, 255); hint.W = 100; hint.H = 50; @@ -47,7 +47,7 @@ class TestMain rect.SetVisible(true); table.Pack(rect, 1, 1, 2, 1); - rect = new efl.canvas.RectangleConcrete(canvas); + rect = new efl.canvas.Rectangle(canvas); rect.SetColor(0, 255, 0, 255); hint.W = 50; hint.H = 100; @@ -55,7 +55,7 @@ class TestMain rect.SetVisible(true); table.Pack(rect, 1, 2, 1, 2); - rect = new efl.canvas.RectangleConcrete(canvas); + rect = new efl.canvas.Rectangle(canvas); rect.SetColor(0, 0, 255, 255); hint.W = 50; hint.H = 50; @@ -63,7 +63,7 @@ class TestMain rect.SetVisible(true); table.Pack(rect, 2, 2, 1, 1); - rect = new efl.canvas.RectangleConcrete(canvas); + rect = new efl.canvas.Rectangle(canvas); rect.SetColor(255, 255, 0, 255); rect.SetHintMin(hint); rect.SetVisible(true); diff --git a/src/examples/evas/evas_mono_text.cs b/src/examples/evas/evas_mono_text.cs index 799ade551c..a1532a4583 100644 --- a/src/examples/evas/evas_mono_text.cs +++ b/src/examples/evas/evas_mono_text.cs @@ -22,8 +22,8 @@ class TestMain static int HEIGHT = 240; private EcoreEvas ecore_evas; - private efl.canvas.Object canvas; - private efl.canvas.Rectangle bg; + private efl.canvas.IObject canvas; + private efl.canvas.IRectangle bg; private evas.Text text; private evas.Image border; @@ -34,7 +34,7 @@ class TestMain canvas = ecore_evas.canvas; canvas.SetVisible(true); - bg = new efl.canvas.RectangleConcrete(canvas); + bg = new efl.canvas.Rectangle(canvas); bg.SetColor(255, 255, 255, 255); position.X = 0; position.Y = 0; @@ -47,7 +47,7 @@ class TestMain bg.KeyDownEvt += On_KeyDown; - text = new evas.TextConcrete(canvas); + text = new evas.Text(canvas); text.SetStyle(evas.Text_Style_Type.OutlineSoftShadow); text.SetColor(0, 0, 0, 255); @@ -71,7 +71,7 @@ class TestMain Console.WriteLine("Adding text object with font {0} and size {1}", font, size); // setup border - border = new evas.ImageConcrete(canvas); + border = new evas.Image(canvas); border.SetFile(border_file, null); border.SetBorder(3, 3, 3, 3); border.SetBorderCenterFill(0); @@ -87,7 +87,7 @@ class TestMain } - private void On_KeyDown(object sender, efl.input.InterfaceConcrete.KeyDownEvt_Args e) + private void On_KeyDown(object sender, efl.input.Interface.KeyDownEvt_Args e) { var key = e.arg.GetKey(); @@ -114,7 +114,7 @@ class TestMain if (args.Length >= 1) border_path = args[0]; - efl.Loop loop = new efl.LoopConcrete(); + efl.Loop loop = new efl.Loop(); TestMain t = new TestMain(border_path); loop.Begin(); diff --git a/src/tests/efl_mono/BasicDirection.cs b/src/tests/efl_mono/BasicDirection.cs index cf7634d09e..5db27a1534 100644 --- a/src/tests/efl_mono/BasicDirection.cs +++ b/src/tests/efl_mono/BasicDirection.cs @@ -11,7 +11,7 @@ class TestIntDirections { int original = 1984; int received; - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); t.IntOut(original, out received); @@ -22,7 +22,7 @@ class TestIntDirections { int original = 1984; int received; - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); t.IntPtrOut(original, out received); diff --git a/src/tests/efl_mono/Eina.cs b/src/tests/efl_mono/Eina.cs index bd2d2976b9..9a844f5280 100644 --- a/src/tests/efl_mono/Eina.cs +++ b/src/tests/efl_mono/Eina.cs @@ -28,55 +28,55 @@ public static class BaseData public static readonly string[] append_seq_str = {"42","43","33"}; public static readonly string[] modified_seq_str = {"0x0","0x2A","0x42","42","43","33"}; - public static test.Numberwrapper NW(int n) + public static test.INumberwrapper NW(int n) { - var nw = new test.NumberwrapperConcrete(); + var nw = new test.Numberwrapper(); nw.SetNumber(n); return nw; } - public static test.Numberwrapper[] BaseSeqObj() + public static test.INumberwrapper[] BaseSeqObj() { - var a = new test.NumberwrapperConcrete(); - var b = new test.NumberwrapperConcrete(); - var c = new test.NumberwrapperConcrete(); + var a = new test.Numberwrapper(); + var b = new test.Numberwrapper(); + var c = new test.Numberwrapper(); a.SetNumber(0x0); b.SetNumber(0x2A); c.SetNumber(0x42); - return new test.NumberwrapperConcrete[]{a,b,c}; + return new test.INumberwrapper[]{a,b,c}; } public static test.Numberwrapper[] AppendSeqObj() { - var a = new test.NumberwrapperConcrete(); - var b = new test.NumberwrapperConcrete(); - var c = new test.NumberwrapperConcrete(); + var a = new test.Numberwrapper(); + var b = new test.Numberwrapper(); + var c = new test.Numberwrapper(); a.SetNumber(42); b.SetNumber(43); c.SetNumber(33); - return new test.NumberwrapperConcrete[]{a,b,c}; + return new test.Numberwrapper[]{a,b,c}; } public static test.Numberwrapper[] ModifiedSeqObj() { - var a = new test.NumberwrapperConcrete(); - var b = new test.NumberwrapperConcrete(); - var c = new test.NumberwrapperConcrete(); - var d = new test.NumberwrapperConcrete(); - var e = new test.NumberwrapperConcrete(); - var f = new test.NumberwrapperConcrete(); + var a = new test.Numberwrapper(); + var b = new test.Numberwrapper(); + var c = new test.Numberwrapper(); + var d = new test.Numberwrapper(); + var e = new test.Numberwrapper(); + var f = new test.Numberwrapper(); a.SetNumber(0x0); b.SetNumber(0x2A); c.SetNumber(0x42); d.SetNumber(42); e.SetNumber(43); f.SetNumber(33); - return new test.NumberwrapperConcrete[]{a,b,c,d,e,f}; + return new test.Numberwrapper[]{a,b,c,d,e,f}; } public static void NumberwrapperSequenceAssertEqual( - test.Numberwrapper[] a - , test.Numberwrapper[] b + test.INumberwrapper[] a + , test.INumberwrapper[] b , [CallerLineNumber] int line = 0 , [CallerFilePath] string file = null , [CallerMemberName] string member = null) @@ -430,7 +430,7 @@ class TestEinaBinbuf public static void test_eina_binbuf_in() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var binbuf = new eina.Binbuf(base_seq, (uint)base_seq.Length); Test.Assert(t.EinaBinbufIn(binbuf)); Test.Assert(binbuf.Own); @@ -441,7 +441,7 @@ class TestEinaBinbuf public static void test_eina_binbuf_in_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var binbuf = new eina.Binbuf(base_seq, (uint)base_seq.Length); Test.Assert(t.EinaBinbufInOwn(binbuf)); Test.Assert(!binbuf.Own); @@ -453,7 +453,7 @@ class TestEinaBinbuf public static void test_eina_binbuf_out() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Binbuf binbuf; Test.Assert(t.EinaBinbufOut(out binbuf)); Test.Assert(!binbuf.Own); @@ -467,7 +467,7 @@ class TestEinaBinbuf public static void test_eina_binbuf_out_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Binbuf binbuf; Test.Assert(t.EinaBinbufOutOwn(out binbuf)); Test.Assert(binbuf.Own); @@ -480,7 +480,7 @@ class TestEinaBinbuf public static void test_eina_binbuf_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var binbuf = t.EinaBinbufReturn(); Test.Assert(!binbuf.Own); Test.Assert(binbuf.GetBytes().SequenceEqual(new byte[]{33})); @@ -493,7 +493,7 @@ class TestEinaBinbuf public static void test_eina_binbuf_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var binbuf = t.EinaBinbufReturnOwn(); Test.Assert(binbuf.Own); Test.Assert(binbuf.GetBytes().SequenceEqual(new byte[]{33})); @@ -616,7 +616,7 @@ class TestEinaSlice public static void test_eina_slice_in() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var slc = new eina.Slice(pinnedPtr, (UIntPtr)3); Test.Assert(t.EinaSliceIn(slc)); } @@ -629,7 +629,7 @@ class TestEinaSlice var slc = new eina.Rw_Slice(ptr, (UIntPtr)3); - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); Test.Assert(t.EinaRwSliceIn(slc)); Test.Assert(slc.GetBytes().SequenceEqual(new byte[3]{0x1,0x2B,0x43})); @@ -639,7 +639,7 @@ class TestEinaSlice public static void test_eina_slice_out() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var slc = new eina.Slice(); Test.Assert(t.EinaSliceOut(ref slc)); Test.Assert(slc.Mem != IntPtr.Zero); @@ -649,7 +649,7 @@ class TestEinaSlice public static void test_eina_rw_slice_out() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var slc = new eina.Rw_Slice(); Test.Assert(t.EinaRwSliceOut(ref slc)); Test.Assert(slc.Mem != IntPtr.Zero); @@ -741,9 +741,9 @@ class TestEinaArray public static void push_obj() { - var a = new eina.Array<test.NumberwrapperConcrete>(); + var a = new eina.Array<test.INumberwrapper>(); Test.Assert(a.Handle != IntPtr.Zero); - var o = new test.NumberwrapperConcrete(); + var o = new test.Numberwrapper(); o.SetNumber(88); Test.Assert(a.Push(o)); Test.Assert(a[0].raw_handle == o.raw_handle); @@ -770,9 +770,9 @@ class TestEinaArray public static void pop_obj() { - var a = new eina.Array<test.NumberwrapperConcrete>(); + var a = new eina.Array<test.INumberwrapper>(); Test.Assert(a.Handle != IntPtr.Zero); - var o = new test.NumberwrapperConcrete(); + var o = new test.Numberwrapper(); o.SetNumber(88); Test.Assert(a.Push(o)); var p = a.Pop(); @@ -807,24 +807,24 @@ class TestEinaArray public static void data_set_obj() { - var a = new eina.Array<test.NumberwrapperConcrete>(); + var a = new eina.Array<test.INumberwrapper>(); Test.Assert(a.Handle != IntPtr.Zero); - var o1 = new test.NumberwrapperConcrete(); + var o1 = new test.Numberwrapper(); o1.SetNumber(88); Test.Assert(a.Push(o1)); Test.Assert(a[0].raw_handle == o1.raw_handle); Test.Assert(a[0].GetNumber() == 88); - var o2 = new test.NumberwrapperConcrete(); + var o2 = new test.Numberwrapper(); o2.SetNumber(44); a.DataSet(0, o2); Test.Assert(a[0].raw_handle == o2.raw_handle); Test.Assert(a[0].GetNumber() == 44); - var o3 = new test.NumberwrapperConcrete(); + var o3 = new test.Numberwrapper(); o3.SetNumber(22); a[0] = o3; @@ -866,26 +866,26 @@ class TestEinaArray public static void count_obj() { - var a = new eina.Array<test.NumberwrapperConcrete>(); + var a = new eina.Array<test.INumberwrapper>(); Test.Assert(a.Handle != IntPtr.Zero); Test.Assert(a.Count() == 0); - var o1 = new test.NumberwrapperConcrete(); + var o1 = new test.Numberwrapper(); o1.SetNumber(88); Test.Assert(a.Push(o1)); Test.Assert(a[0].raw_handle == o1.raw_handle); Test.Assert(a[0].GetNumber() == 88); Test.Assert(a.Count() == 1); - var o2 = new test.NumberwrapperConcrete(); + var o2 = new test.Numberwrapper(); o2.SetNumber(44); Test.Assert(a.Push(o2)); Test.Assert(a[1].raw_handle == o2.raw_handle); Test.Assert(a[1].GetNumber() == 44); Test.Assert(a.Count() == 2); - var o3 = new test.NumberwrapperConcrete(); + var o3 = new test.Numberwrapper(); o3.SetNumber(22); Test.Assert(a.Push(o3)); Test.Assert(a[2].raw_handle == o3.raw_handle); @@ -959,22 +959,22 @@ class TestEinaArray public static void eina_array_as_ienumerable_obj() { - var a = new test.NumberwrapperConcrete(); - var b = new test.NumberwrapperConcrete(); - var c = new test.NumberwrapperConcrete(); + var a = new test.Numberwrapper(); + var b = new test.Numberwrapper(); + var c = new test.Numberwrapper(); a.SetNumber(88); b.SetNumber(44); c.SetNumber(22); - var cmp = new test.NumberwrapperConcrete[]{a,b,c}; + var cmp = new test.Numberwrapper[]{a,b,c}; - var arr = new eina.Array<test.NumberwrapperConcrete>(); + var arr = new eina.Array<test.INumberwrapper>(); Test.Assert(arr.Handle != IntPtr.Zero); Test.Assert(arr.Push(a)); Test.Assert(arr.Push(b)); Test.Assert(arr.Push(c)); int i = 0; - foreach (test.NumberwrapperConcrete e in arr) + foreach (test.Numberwrapper e in arr) { Test.AssertEquals(cmp[i].GetNumber(), e.GetNumber()); Test.Assert(cmp[i].raw_handle == e.raw_handle); @@ -990,7 +990,7 @@ class TestEinaArray public static void test_eina_array_int_in() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = new eina.Array<int>(); arr.Append(base_seq_int); Test.Assert(t.EinaArrayIntIn(arr)); @@ -1002,7 +1002,7 @@ class TestEinaArray public static void test_eina_array_int_in_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = new eina.Array<int>(); arr.Append(base_seq_int); Test.Assert(t.EinaArrayIntInOwn(arr)); @@ -1015,7 +1015,7 @@ class TestEinaArray public static void test_eina_array_int_out() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Array<int> arr; Test.Assert(t.EinaArrayIntOut(out arr)); Test.Assert(!arr.Own); @@ -1028,7 +1028,7 @@ class TestEinaArray public static void test_eina_array_int_out_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Array<int> arr; Test.Assert(t.EinaArrayIntOutOwn(out arr)); Test.Assert(arr.Own); @@ -1040,7 +1040,7 @@ class TestEinaArray public static void test_eina_array_int_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = t.EinaArrayIntReturn(); Test.Assert(!arr.Own); Test.Assert(arr.ToArray().SequenceEqual(base_seq_int)); @@ -1052,7 +1052,7 @@ class TestEinaArray public static void test_eina_array_int_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = t.EinaArrayIntReturnOwn(); Test.Assert(arr.Own); Test.Assert(arr.ToArray().SequenceEqual(base_seq_int)); @@ -1064,7 +1064,7 @@ class TestEinaArray // String // public static void test_eina_array_str_in() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = new eina.Array<string>(); arr.Append(base_seq_str); Test.Assert(t.EinaArrayStrIn(arr)); @@ -1076,7 +1076,7 @@ class TestEinaArray public static void test_eina_array_str_in_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = new eina.Array<string>(); arr.Append(base_seq_str); Test.Assert(t.EinaArrayStrInOwn(arr)); @@ -1089,7 +1089,7 @@ class TestEinaArray public static void test_eina_array_str_out() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Array<string> arr; Test.Assert(t.EinaArrayStrOut(out arr)); Test.Assert(!arr.Own); @@ -1102,7 +1102,7 @@ class TestEinaArray public static void test_eina_array_str_out_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Array<string> arr; Test.Assert(t.EinaArrayStrOutOwn(out arr)); Test.Assert(arr.Own); @@ -1114,7 +1114,7 @@ class TestEinaArray public static void test_eina_array_str_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = t.EinaArrayStrReturn(); Test.Assert(!arr.Own); Test.Assert(arr.ToArray().SequenceEqual(base_seq_str)); @@ -1126,7 +1126,7 @@ class TestEinaArray public static void test_eina_array_str_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = t.EinaArrayStrReturnOwn(); Test.Assert(arr.Own); Test.Assert(arr.ToArray().SequenceEqual(base_seq_str)); @@ -1139,8 +1139,8 @@ class TestEinaArray public static void test_eina_array_obj_in() { - test.Testing t = new test.TestingConcrete(); - var arr = new eina.Array<test.Numberwrapper>(); + test.ITesting t = new test.Testing(); + var arr = new eina.Array<test.INumberwrapper>(); arr.Append(BaseSeqObj()); Test.Assert(t.EinaArrayObjIn(arr)); Test.Assert(arr.Own); @@ -1151,8 +1151,8 @@ class TestEinaArray public static void test_eina_array_obj_in_own() { - test.Testing t = new test.TestingConcrete(); - var arr = new eina.Array<test.Numberwrapper>(); + test.ITesting t = new test.Testing(); + var arr = new eina.Array<test.INumberwrapper>(); arr.Append(BaseSeqObj()); Test.Assert(t.EinaArrayObjInOwn(arr)); Test.Assert(!arr.Own); @@ -1164,8 +1164,8 @@ class TestEinaArray public static void test_eina_array_obj_out() { - test.Testing t = new test.TestingConcrete(); - eina.Array<test.Numberwrapper> arr; + test.ITesting t = new test.Testing(); + eina.Array<test.INumberwrapper> arr; Test.Assert(t.EinaArrayObjOut(out arr)); Test.Assert(!arr.Own); NumberwrapperSequenceAssertEqual(arr.ToArray(), BaseSeqObj()); @@ -1177,8 +1177,8 @@ class TestEinaArray public static void test_eina_array_obj_out_own() { - test.Testing t = new test.TestingConcrete(); - eina.Array<test.Numberwrapper> arr; + test.ITesting t = new test.Testing(); + eina.Array<test.INumberwrapper> arr; Test.Assert(t.EinaArrayObjOutOwn(out arr)); Test.Assert(arr.Own); NumberwrapperSequenceAssertEqual(arr.ToArray(), BaseSeqObj()); @@ -1189,7 +1189,7 @@ class TestEinaArray public static void test_eina_array_obj_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = t.EinaArrayObjReturn(); Test.Assert(!arr.Own); NumberwrapperSequenceAssertEqual(arr.ToArray(), BaseSeqObj()); @@ -1201,7 +1201,7 @@ class TestEinaArray public static void test_eina_array_obj_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = t.EinaArrayObjReturnOwn(); Test.Assert(arr.Own); NumberwrapperSequenceAssertEqual(arr.ToArray(), BaseSeqObj()); @@ -1212,9 +1212,9 @@ class TestEinaArray public static void test_eina_array_obj_return_in_same_id() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var cmp = BaseSeqObj(); - var a = new eina.Array<test.Numberwrapper>(); + var a = new eina.Array<test.INumberwrapper>(); a.Append(cmp); var b = t.EinaArrayObjReturnIn(a); NumberwrapperSequenceAssertEqual(a.ToArray(), b.ToArray()); @@ -1262,9 +1262,9 @@ class TestEinaInarray public static void push_obj() { - var a = new eina.Inarray<test.NumberwrapperConcrete>(); + var a = new eina.Inarray<test.INumberwrapper>(); Test.Assert(a.Handle != IntPtr.Zero); - var o = new test.NumberwrapperConcrete(); + var o = new test.Numberwrapper(); o.SetNumber(88); Test.Assert(a.Push(o) == 0); Test.Assert(a[0].raw_handle == o.raw_handle); @@ -1294,9 +1294,9 @@ class TestEinaInarray public static void pop_obj() { - var a = new eina.Inarray<test.NumberwrapperConcrete>(); + var a = new eina.Inarray<test.INumberwrapper>(); Test.Assert(a.Handle != IntPtr.Zero); - var o = new test.NumberwrapperConcrete(); + var o = new test.Numberwrapper(); o.SetNumber(88); Test.Assert(a.Push(o) >= 0); var p = a.Pop(); @@ -1338,17 +1338,17 @@ class TestEinaInarray public static void replace_at_obj() { - var a = new eina.Inarray<test.NumberwrapperConcrete>(); + var a = new eina.Inarray<test.INumberwrapper>(); Test.Assert(a.Handle != IntPtr.Zero); - var o1 = new test.NumberwrapperConcrete(); + var o1 = new test.Numberwrapper(); o1.SetNumber(88); Test.Assert(a.Push(o1) >= 0); Test.Assert(a[0].raw_handle == o1.raw_handle); Test.Assert(a[0].GetNumber() == 88); - var o2 = new test.NumberwrapperConcrete(); + var o2 = new test.Numberwrapper(); o2.SetNumber(44); a.ReplaceAt(0, o2); @@ -1356,7 +1356,7 @@ class TestEinaInarray Test.Assert(a[0].GetNumber() == 44); Test.Assert(a.Count() == 1); - var o3 = new test.NumberwrapperConcrete(); + var o3 = new test.Numberwrapper(); o3.SetNumber(22); a[0] = o3; @@ -1403,26 +1403,26 @@ class TestEinaInarray public static void count_obj() { - var a = new eina.Inarray<test.NumberwrapperConcrete>(); + var a = new eina.Inarray<test.INumberwrapper>(); Test.Assert(a.Handle != IntPtr.Zero); Test.Assert(a.Count() == 0); - var o1 = new test.NumberwrapperConcrete(); + var o1 = new test.Numberwrapper(); o1.SetNumber(88); Test.Assert(a.Push(o1) == 0); Test.Assert(a[0].raw_handle == o1.raw_handle); Test.Assert(a[0].GetNumber() == 88); Test.Assert(a.Count() == 1); - var o2 = new test.NumberwrapperConcrete(); + var o2 = new test.Numberwrapper(); o2.SetNumber(44); Test.Assert(a.Push(o2) == 1); Test.Assert(a[1].raw_handle == o2.raw_handle); Test.Assert(a[1].GetNumber() == 44); Test.Assert(a.Count() == 2); - var o3 = new test.NumberwrapperConcrete(); + var o3 = new test.Numberwrapper(); o3.SetNumber(22); Test.Assert(a.Push(o3) == 2); Test.Assert(a[2].raw_handle == o3.raw_handle); @@ -1502,22 +1502,22 @@ class TestEinaInarray public static void eina_inarray_as_ienumerable_obj() { - var a = new test.NumberwrapperConcrete(); - var b = new test.NumberwrapperConcrete(); - var c = new test.NumberwrapperConcrete(); + var a = new test.Numberwrapper(); + var b = new test.Numberwrapper(); + var c = new test.Numberwrapper(); a.SetNumber(88); b.SetNumber(44); c.SetNumber(22); - var cmp = new test.NumberwrapperConcrete[]{a,b,c}; + var cmp = new test.Numberwrapper[]{a,b,c}; - var arr = new eina.Inarray<test.NumberwrapperConcrete>(); + var arr = new eina.Inarray<test.INumberwrapper>(); Test.Assert(arr.Handle != IntPtr.Zero); Test.Assert(arr.Push(a) == 0); Test.Assert(arr.Push(b) == 1); Test.Assert(arr.Push(c) == 2); int i = 0; - foreach (test.NumberwrapperConcrete e in arr) + foreach (test.Numberwrapper e in arr) { Test.AssertEquals(cmp[i].GetNumber(), e.GetNumber()); Test.Assert(cmp[i].raw_handle == e.raw_handle); @@ -1534,7 +1534,7 @@ class TestEinaInarray public static void test_eina_inarray_int_in() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = new eina.Inarray<int>(); arr.Append(base_seq_int); Test.Assert(t.EinaInarrayIntIn(arr)); @@ -1546,7 +1546,7 @@ class TestEinaInarray public static void test_eina_inarray_int_in_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = new eina.Inarray<int>(); arr.Append(base_seq_int); Test.Assert(t.EinaInarrayIntInOwn(arr)); @@ -1559,7 +1559,7 @@ class TestEinaInarray public static void test_eina_inarray_int_out() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Inarray<int> arr; Test.Assert(t.EinaInarrayIntOut(out arr)); Test.Assert(!arr.Own); @@ -1572,7 +1572,7 @@ class TestEinaInarray public static void test_eina_inarray_int_out_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Inarray<int> arr; Test.Assert(t.EinaInarrayIntOutOwn(out arr)); Test.Assert(arr.Own); @@ -1584,7 +1584,7 @@ class TestEinaInarray public static void test_eina_inarray_int_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = t.EinaInarrayIntReturn(); Test.Assert(!arr.Own); Test.Assert(arr.ToArray().SequenceEqual(base_seq_int)); @@ -1596,7 +1596,7 @@ class TestEinaInarray public static void test_eina_inarray_int_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = t.EinaInarrayIntReturnOwn(); Test.Assert(arr.Own); Test.Assert(arr.ToArray().SequenceEqual(base_seq_int)); @@ -1608,7 +1608,7 @@ class TestEinaInarray // String // public static void test_eina_inarray_str_in() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = new eina.Inarray<string>(); arr.Append(base_seq_str); Test.Assert(t.EinaInarrayStrIn(arr)); @@ -1620,7 +1620,7 @@ class TestEinaInarray public static void test_eina_inarray_str_in_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = new eina.Inarray<string>(); arr.Append(base_seq_str); Test.Assert(t.EinaInarrayStrInOwn(arr)); @@ -1633,7 +1633,7 @@ class TestEinaInarray public static void test_eina_inarray_str_out() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Inarray<string> arr; Test.Assert(t.EinaInarrayStrOut(out arr)); Test.Assert(!arr.Own); @@ -1646,7 +1646,7 @@ class TestEinaInarray public static void test_eina_inarray_str_out_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Inarray<string> arr; Test.Assert(t.EinaInarrayStrOutOwn(out arr)); Test.Assert(arr.Own); @@ -1658,7 +1658,7 @@ class TestEinaInarray public static void test_eina_inarray_str_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = t.EinaInarrayStrReturn(); Test.Assert(!arr.Own); Test.Assert(arr.ToArray().SequenceEqual(base_seq_str)); @@ -1670,7 +1670,7 @@ class TestEinaInarray public static void test_eina_inarray_str_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = t.EinaInarrayStrReturnOwn(); Test.Assert(arr.Own); Test.Assert(arr.ToArray().SequenceEqual(base_seq_str)); @@ -1683,8 +1683,8 @@ class TestEinaInarray public static void test_eina_inarray_obj_in() { - test.Testing t = new test.TestingConcrete(); - var arr = new eina.Inarray<test.Numberwrapper>(); + test.ITesting t = new test.Testing(); + var arr = new eina.Inarray<test.INumberwrapper>(); arr.Append(BaseSeqObj()); Test.Assert(t.EinaInarrayObjIn(arr)); Test.Assert(arr.Own); @@ -1695,8 +1695,8 @@ class TestEinaInarray public static void test_eina_inarray_obj_in_own() { - test.Testing t = new test.TestingConcrete(); - var arr = new eina.Inarray<test.Numberwrapper>(); + test.ITesting t = new test.Testing(); + var arr = new eina.Inarray<test.INumberwrapper>(); arr.Append(BaseSeqObj()); Test.Assert(t.EinaInarrayObjInOwn(arr)); Test.Assert(!arr.Own); @@ -1708,8 +1708,8 @@ class TestEinaInarray public static void test_eina_inarray_obj_out() { - test.Testing t = new test.TestingConcrete(); - eina.Inarray<test.Numberwrapper> arr; + test.ITesting t = new test.Testing(); + eina.Inarray<test.INumberwrapper> arr; Test.Assert(t.EinaInarrayObjOut(out arr)); Test.Assert(!arr.Own); NumberwrapperSequenceAssertEqual(arr.ToArray(), BaseSeqObj()); @@ -1721,8 +1721,8 @@ class TestEinaInarray public static void test_eina_inarray_obj_out_own() { - test.Testing t = new test.TestingConcrete(); - eina.Inarray<test.Numberwrapper> arr; + test.ITesting t = new test.Testing(); + eina.Inarray<test.INumberwrapper> arr; Test.Assert(t.EinaInarrayObjOutOwn(out arr)); Test.Assert(arr.Own); NumberwrapperSequenceAssertEqual(arr.ToArray(), BaseSeqObj()); @@ -1733,7 +1733,7 @@ class TestEinaInarray public static void test_eina_inarray_obj_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = t.EinaInarrayObjReturn(); Test.Assert(!arr.Own); NumberwrapperSequenceAssertEqual(arr.ToArray(), BaseSeqObj()); @@ -1745,7 +1745,7 @@ class TestEinaInarray public static void test_eina_inarray_obj_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = t.EinaInarrayObjReturnOwn(); Test.Assert(arr.Own); NumberwrapperSequenceAssertEqual(arr.ToArray(), BaseSeqObj()); @@ -1756,9 +1756,9 @@ class TestEinaInarray public static void test_eina_inarray_obj_return_in_same_id() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var cmp = BaseSeqObj(); - var a = new eina.Inarray<test.Numberwrapper>(); + var a = new eina.Inarray<test.INumberwrapper>(); a.Append(cmp); var b = t.EinaInarrayObjReturnIn(a); NumberwrapperSequenceAssertEqual(a.ToArray(), b.ToArray()); @@ -1799,23 +1799,23 @@ class TestEinaList public static void data_set_obj() { - var lst = new eina.List<test.NumberwrapperConcrete>(); + var lst = new eina.List<test.INumberwrapper>(); - var o1 = new test.NumberwrapperConcrete(); + var o1 = new test.Numberwrapper(); o1.SetNumber(88); lst.Append(o1); Test.Assert(lst[0].raw_handle == o1.raw_handle); Test.Assert(lst[0].GetNumber() == 88); - var o2 = new test.NumberwrapperConcrete(); + var o2 = new test.Numberwrapper(); o2.SetNumber(44); lst.DataSet(0, o2); Test.Assert(lst[0].raw_handle == o2.raw_handle); Test.Assert(lst[0].GetNumber() == 44); - var o3 = new test.NumberwrapperConcrete(); + var o3 = new test.Numberwrapper(); o3.SetNumber(22); lst[0] = o3; @@ -1855,25 +1855,25 @@ class TestEinaList public static void append_count_obj() { - var lst = new eina.List<test.NumberwrapperConcrete>(); + var lst = new eina.List<test.INumberwrapper>(); Test.Assert(lst.Count() == 0); - var o1 = new test.NumberwrapperConcrete(); + var o1 = new test.Numberwrapper(); o1.SetNumber(88); lst.Append(o1); Test.Assert(lst[0].raw_handle == o1.raw_handle); Test.Assert(lst[0].GetNumber() == 88); Test.Assert(lst.Count() == 1); - var o2 = new test.NumberwrapperConcrete(); + var o2 = new test.Numberwrapper(); o2.SetNumber(44); lst.Append(o2); Test.Assert(lst[1].raw_handle == o2.raw_handle); Test.Assert(lst[1].GetNumber() == 44); Test.Assert(lst.Count() == 2); - var o3 = new test.NumberwrapperConcrete(); + var o3 = new test.Numberwrapper(); o3.SetNumber(22); lst.Append(o3); Test.Assert(lst[2].raw_handle == o3.raw_handle); @@ -1943,25 +1943,25 @@ class TestEinaList public static void prepend_count_obj() { - var lst = new eina.List<test.NumberwrapperConcrete>(); + var lst = new eina.List<test.INumberwrapper>(); Test.Assert(lst.Count() == 0); - var o1 = new test.NumberwrapperConcrete(); + var o1 = new test.Numberwrapper(); o1.SetNumber(88); lst.Prepend(o1); Test.Assert(lst[0].raw_handle == o1.raw_handle); Test.Assert(lst[0].GetNumber() == 88); Test.Assert(lst.Count() == 1); - var o2 = new test.NumberwrapperConcrete(); + var o2 = new test.Numberwrapper(); o2.SetNumber(44); lst.Prepend(o2); Test.Assert(lst[0].raw_handle == o2.raw_handle); Test.Assert(lst[0].GetNumber() == 44); Test.Assert(lst.Count() == 2); - var o3 = new test.NumberwrapperConcrete(); + var o3 = new test.Numberwrapper(); o3.SetNumber(22); lst.Prepend(o3); Test.Assert(lst[0].raw_handle == o3.raw_handle); @@ -2073,21 +2073,21 @@ class TestEinaList public static void eina_list_as_ienumerable_obj() { - var a = new test.NumberwrapperConcrete(); - var b = new test.NumberwrapperConcrete(); - var c = new test.NumberwrapperConcrete(); + var a = new test.Numberwrapper(); + var b = new test.Numberwrapper(); + var c = new test.Numberwrapper(); a.SetNumber(88); b.SetNumber(44); c.SetNumber(22); - var cmp = new test.NumberwrapperConcrete[]{a,b,c}; + var cmp = new test.Numberwrapper[]{a,b,c}; - var lst = new eina.List<test.NumberwrapperConcrete>(); + var lst = new eina.List<test.INumberwrapper>(); lst.Append(a); lst.Append(b); lst.Append(c); int i = 0; - foreach (test.NumberwrapperConcrete e in lst) + foreach (test.Numberwrapper e in lst) { Test.AssertEquals(cmp[i].GetNumber(), e.GetNumber()); Test.Assert(cmp[i].raw_handle == e.raw_handle); @@ -2103,7 +2103,7 @@ class TestEinaList public static void test_eina_list_int_in() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = new eina.List<int>(); lst.AppendArray(base_seq_int); Test.Assert(t.EinaListIntIn(lst)); @@ -2115,7 +2115,7 @@ class TestEinaList public static void test_eina_list_int_in_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = new eina.List<int>(); lst.AppendArray(base_seq_int); Test.Assert(t.EinaListIntInOwn(lst)); @@ -2127,7 +2127,7 @@ class TestEinaList public static void test_eina_list_int_out() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.List<int> lst; Test.Assert(t.EinaListIntOut(out lst)); Test.Assert(!lst.Own); @@ -2139,7 +2139,7 @@ class TestEinaList public static void test_eina_list_int_out_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.List<int> lst; Test.Assert(t.EinaListIntOutOwn(out lst)); Test.Assert(lst.Own); @@ -2151,7 +2151,7 @@ class TestEinaList public static void test_eina_list_int_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = t.EinaListIntReturn(); Test.Assert(!lst.Own); Test.Assert(lst.ToArray().SequenceEqual(base_seq_int)); @@ -2162,7 +2162,7 @@ class TestEinaList public static void test_eina_list_int_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = t.EinaListIntReturnOwn(); Test.Assert(lst.Own); Test.Assert(lst.ToArray().SequenceEqual(base_seq_int)); @@ -2174,7 +2174,7 @@ class TestEinaList // String // public static void test_eina_list_str_in() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = new eina.List<string>(); lst.AppendArray(base_seq_str); Test.Assert(t.EinaListStrIn(lst)); @@ -2186,7 +2186,7 @@ class TestEinaList public static void test_eina_list_str_in_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = new eina.List<string>(); lst.AppendArray(base_seq_str); Test.Assert(t.EinaListStrInOwn(lst)); @@ -2198,7 +2198,7 @@ class TestEinaList public static void test_eina_list_str_out() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.List<string> lst; Test.Assert(t.EinaListStrOut(out lst)); Test.Assert(!lst.Own); @@ -2210,7 +2210,7 @@ class TestEinaList public static void test_eina_list_str_out_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.List<string> lst; Test.Assert(t.EinaListStrOutOwn(out lst)); Test.Assert(lst.Own); @@ -2222,7 +2222,7 @@ class TestEinaList public static void test_eina_list_str_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = t.EinaListStrReturn(); Test.Assert(!lst.Own); Test.Assert(lst.ToArray().SequenceEqual(base_seq_str)); @@ -2233,7 +2233,7 @@ class TestEinaList public static void test_eina_list_str_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = t.EinaListStrReturnOwn(); Test.Assert(lst.Own); Test.Assert(lst.ToArray().SequenceEqual(base_seq_str)); @@ -2246,8 +2246,8 @@ class TestEinaList public static void test_eina_list_obj_in() { - test.Testing t = new test.TestingConcrete(); - var lst = new eina.List<test.Numberwrapper>(); + test.ITesting t = new test.Testing(); + var lst = new eina.List<test.INumberwrapper>(); lst.AppendArray(BaseSeqObj()); Test.Assert(t.EinaListObjIn(lst)); Test.Assert(lst.Own); @@ -2258,8 +2258,8 @@ class TestEinaList public static void test_eina_list_obj_in_own() { - test.Testing t = new test.TestingConcrete(); - var lst = new eina.List<test.Numberwrapper>(); + test.ITesting t = new test.Testing(); + var lst = new eina.List<test.INumberwrapper>(); lst.AppendArray(BaseSeqObj()); Test.Assert(t.EinaListObjInOwn(lst)); Test.Assert(!lst.Own); @@ -2270,8 +2270,8 @@ class TestEinaList public static void test_eina_list_obj_out() { - test.Testing t = new test.TestingConcrete(); - eina.List<test.Numberwrapper> lst; + test.ITesting t = new test.Testing(); + eina.List<test.INumberwrapper> lst; Test.Assert(t.EinaListObjOut(out lst)); Test.Assert(!lst.Own); NumberwrapperSequenceAssertEqual(lst.ToArray(), BaseSeqObj()); @@ -2282,8 +2282,8 @@ class TestEinaList public static void test_eina_list_obj_out_own() { - test.Testing t = new test.TestingConcrete(); - eina.List<test.Numberwrapper> lst; + test.ITesting t = new test.Testing(); + eina.List<test.INumberwrapper> lst; Test.Assert(t.EinaListObjOutOwn(out lst)); Test.Assert(lst.Own); NumberwrapperSequenceAssertEqual(lst.ToArray(), BaseSeqObj()); @@ -2294,7 +2294,7 @@ class TestEinaList public static void test_eina_list_obj_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = t.EinaListObjReturn(); Test.Assert(!lst.Own); NumberwrapperSequenceAssertEqual(lst.ToArray(), BaseSeqObj()); @@ -2305,7 +2305,7 @@ class TestEinaList public static void test_eina_list_obj_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = t.EinaListObjReturnOwn(); Test.Assert(lst.Own); NumberwrapperSequenceAssertEqual(lst.ToArray(), BaseSeqObj()); @@ -2316,9 +2316,9 @@ class TestEinaList public static void test_eina_list_obj_return_in_same_id() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var cmp = BaseSeqObj(); - var a = new eina.List<test.Numberwrapper>(); + var a = new eina.List<test.INumberwrapper>(); a.AppendArray(cmp); var b = t.EinaListObjReturnIn(a); NumberwrapperSequenceAssertEqual(a.ToArray(), b.ToArray()); @@ -2360,23 +2360,23 @@ class TestEinaInlist public static void data_set_obj() { - var lst = new eina.Inlist<test.NumberwrapperConcrete>(); + var lst = new eina.Inlist<test.INumberwrapper>(); - var o1 = new test.NumberwrapperConcrete(); + var o1 = new test.Numberwrapper(); o1.SetNumber(88); lst.Append(o1); Test.Assert(lst[0].raw_handle == o1.raw_handle); Test.Assert(lst[0].GetNumber() == 88); - var o2 = new test.NumberwrapperConcrete(); + var o2 = new test.Numberwrapper(); o2.SetNumber(44); lst.DataSet(0, o2); Test.Assert(lst[0].raw_handle == o2.raw_handle); Test.Assert(lst[0].GetNumber() == 44); - var o3 = new test.NumberwrapperConcrete(); + var o3 = new test.Numberwrapper(); o3.SetNumber(22); lst[0] = o3; @@ -2418,25 +2418,25 @@ class TestEinaInlist public static void append_count_obj() { - var lst = new eina.Inlist<test.NumberwrapperConcrete>(); + var lst = new eina.Inlist<test.INumberwrapper>(); Test.Assert(lst.Count() == 0); - var o1 = new test.NumberwrapperConcrete(); + var o1 = new test.Numberwrapper(); o1.SetNumber(88); lst.Append(o1); Test.Assert(lst[0].raw_handle == o1.raw_handle); Test.Assert(lst[0].GetNumber() == 88); Test.Assert(lst.Count() == 1); - var o2 = new test.NumberwrapperConcrete(); + var o2 = new test.Numberwrapper(); o2.SetNumber(44); lst.Append(o2); Test.Assert(lst[1].raw_handle == o2.raw_handle); Test.Assert(lst[1].GetNumber() == 44); Test.Assert(lst.Count() == 2); - var o3 = new test.NumberwrapperConcrete(); + var o3 = new test.Numberwrapper(); o3.SetNumber(22); lst.Append(o3); Test.Assert(lst[2].raw_handle == o3.raw_handle); @@ -2506,25 +2506,25 @@ class TestEinaInlist public static void prepend_count_obj() { - var lst = new eina.Inlist<test.NumberwrapperConcrete>(); + var lst = new eina.Inlist<test.INumberwrapper>(); Test.Assert(lst.Count() == 0); - var o1 = new test.NumberwrapperConcrete(); + var o1 = new test.Numberwrapper(); o1.SetNumber(88); lst.Prepend(o1); Test.Assert(lst[0].raw_handle == o1.raw_handle); Test.Assert(lst[0].GetNumber() == 88); Test.Assert(lst.Count() == 1); - var o2 = new test.NumberwrapperConcrete(); + var o2 = new test.Numberwrapper(); o2.SetNumber(44); lst.Prepend(o2); Test.Assert(lst[0].raw_handle == o2.raw_handle); Test.Assert(lst[0].GetNumber() == 44); Test.Assert(lst.Count() == 2); - var o3 = new test.NumberwrapperConcrete(); + var o3 = new test.Numberwrapper(); o3.SetNumber(22); lst.Prepend(o3); Test.Assert(lst[0].raw_handle == o3.raw_handle); @@ -2564,21 +2564,21 @@ class TestEinaInlist public static void eina_inlist_as_ienumerable_obj() { - var a = new test.NumberwrapperConcrete(); - var b = new test.NumberwrapperConcrete(); - var c = new test.NumberwrapperConcrete(); + var a = new test.Numberwrapper(); + var b = new test.Numberwrapper(); + var c = new test.Numberwrapper(); a.SetNumber(88); b.SetNumber(44); c.SetNumber(22); - var cmp = new test.NumberwrapperConcrete[]{a,b,c}; + var cmp = new test.Numberwrapper[]{a,b,c}; - var lst = new eina.Inlist<test.NumberwrapperConcrete>(); + var lst = new eina.Inlist<test.INumberwrapper>(); lst.Append(a); lst.Append(b); lst.Append(c); int i = 0; - foreach (test.NumberwrapperConcrete e in lst) + foreach (test.Numberwrapper e in lst) { Test.AssertEquals(cmp[i].GetNumber(), e.GetNumber()); Test.Assert(cmp[i].raw_handle == e.raw_handle); @@ -2594,7 +2594,7 @@ class TestEinaInlist public static void test_eina_inlist_int_in() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = new eina.Inlist<int>(); lst.AppendArray(base_seq_int); Test.Assert(t.EinaInlistIntIn(lst)); @@ -2606,7 +2606,7 @@ class TestEinaInlist public static void test_eina_inlist_int_in_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = new eina.Inlist<int>(); lst.AppendArray(base_seq_int); Test.Assert(t.EinaInlistIntInOwn(lst)); @@ -2618,7 +2618,7 @@ class TestEinaInlist public static void test_eina_inlist_int_out() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Inlist<int> lst; Test.Assert(t.EinaInlistIntOut(out lst)); Test.Assert(!lst.Own); @@ -2630,7 +2630,7 @@ class TestEinaInlist public static void test_eina_inlist_int_out_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Inlist<int> lst; Test.Assert(t.EinaInlistIntOutOwn(out lst)); Test.Assert(lst.Own); @@ -2642,7 +2642,7 @@ class TestEinaInlist public static void test_eina_inlist_int_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = t.EinaInlistIntReturn(); Test.Assert(!lst.Own); Test.Assert(lst.ToArray().SequenceEqual(base_seq_int)); @@ -2653,7 +2653,7 @@ class TestEinaInlist public static void test_eina_inlist_int_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = t.EinaInlistIntReturnOwn(); Test.Assert(lst.Own); Test.Assert(lst.ToArray().SequenceEqual(base_seq_int)); @@ -2665,7 +2665,7 @@ class TestEinaInlist // String // public static void test_eina_inlist_str_in() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = new eina.Inlist<string>(); lst.AppendArray(base_seq_str); Test.Assert(t.EinaInlistStrIn(lst)); @@ -2677,7 +2677,7 @@ class TestEinaInlist public static void test_eina_inlist_str_in_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = new eina.Inlist<string>(); lst.AppendArray(base_seq_str); Test.Assert(t.EinaInlistStrInOwn(lst)); @@ -2689,7 +2689,7 @@ class TestEinaInlist public static void test_eina_inlist_str_out() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Inlist<string> lst; Test.Assert(t.EinaInlistStrOut(out lst)); Test.Assert(!lst.Own); @@ -2701,7 +2701,7 @@ class TestEinaInlist public static void test_eina_inlist_str_out_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Inlist<string> lst; Test.Assert(t.EinaInlistStrOutOwn(out lst)); Test.Assert(lst.Own); @@ -2713,7 +2713,7 @@ class TestEinaInlist public static void test_eina_inlist_str_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = t.EinaInlistStrReturn(); Test.Assert(!lst.Own); Test.Assert(lst.ToArray().SequenceEqual(base_seq_str)); @@ -2724,7 +2724,7 @@ class TestEinaInlist public static void test_eina_inlist_str_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = t.EinaInlistStrReturnOwn(); Test.Assert(lst.Own); Test.Assert(lst.ToArray().SequenceEqual(base_seq_str)); @@ -2737,8 +2737,8 @@ class TestEinaInlist public static void test_eina_inlist_obj_in() { - test.Testing t = new test.TestingConcrete(); - var lst = new eina.Inlist<test.Numberwrapper>(); + test.ITesting t = new test.Testing(); + var lst = new eina.Inlist<test.INumberwrapper>(); lst.AppendArray(BaseSeqObj()); Test.Assert(t.EinaInlistObjIn(lst)); Test.Assert(lst.Own); @@ -2749,8 +2749,8 @@ class TestEinaInlist public static void test_eina_inlist_obj_in_own() { - test.Testing t = new test.TestingConcrete(); - var lst = new eina.Inlist<test.Numberwrapper>(); + test.ITesting t = new test.Testing(); + var lst = new eina.Inlist<test.INumberwrapper>(); lst.AppendArray(BaseSeqObj()); Test.Assert(t.EinaInlistObjInOwn(lst)); Test.Assert(!lst.Own); @@ -2761,8 +2761,8 @@ class TestEinaInlist public static void test_eina_inlist_obj_out() { - test.Testing t = new test.TestingConcrete(); - eina.Inlist<test.Numberwrapper> lst; + test.ITesting t = new test.Testing(); + eina.Inlist<test.INumberwrapper> lst; Test.Assert(t.EinaInlistObjOut(out lst)); Test.Assert(!lst.Own); NumberwrapperSequenceAssertEqual(lst.ToArray(), BaseSeqObj()); @@ -2773,8 +2773,8 @@ class TestEinaInlist public static void test_eina_inlist_obj_out_own() { - test.Testing t = new test.TestingConcrete(); - eina.Inlist<test.Numberwrapper> lst; + test.ITesting t = new test.Testing(); + eina.Inlist<test.INumberwrapper> lst; Test.Assert(t.EinaInlistObjOutOwn(out lst)); Test.Assert(lst.Own); NumberwrapperSequenceAssertEqual(lst.ToArray(), BaseSeqObj()); @@ -2785,7 +2785,7 @@ class TestEinaInlist public static void test_eina_inlist_obj_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = t.EinaInlistObjReturn(); Test.Assert(!lst.Own); NumberwrapperSequenceAssertEqual(lst.ToArray(), BaseSeqObj()); @@ -2796,7 +2796,7 @@ class TestEinaInlist public static void test_eina_inlist_obj_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var lst = t.EinaInlistObjReturnOwn(); Test.Assert(lst.Own); NumberwrapperSequenceAssertEqual(lst.ToArray(), BaseSeqObj()); @@ -2807,9 +2807,9 @@ class TestEinaInlist public static void test_eina_inlist_obj_return_in_same_id() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var cmp = BaseSeqObj(); - var a = new eina.Inlist<test.Numberwrapper>(); + var a = new eina.Inlist<test.INumberwrapper>(); a.AppendArray(cmp); var b = t.EinaInlistObjReturnIn(a); NumberwrapperSequenceAssertEqual(a.ToArray(), b.ToArray()); @@ -2868,7 +2868,7 @@ class TestEinaHash public static void data_set_obj() { - var hsh = new eina.Hash<test.Numberwrapper, test.Numberwrapper>(); + var hsh = new eina.Hash<test.INumberwrapper, test.INumberwrapper>(); Test.Assert(hsh.Count == 0); var a = NW(22); @@ -2955,8 +2955,8 @@ class TestEinaHash public static void eina_hash_as_ienumerable_obj() { - var hsh = new eina.Hash<test.Numberwrapper, test.Numberwrapper>(); - var dct = new Dictionary<int, test.Numberwrapper>(); + var hsh = new eina.Hash<test.INumberwrapper, test.INumberwrapper>(); + var dct = new Dictionary<int, test.INumberwrapper>(); var a = NW(22); var aa = NW(222); @@ -2975,7 +2975,7 @@ class TestEinaHash int count = 0; - foreach (KeyValuePair<test.Numberwrapper, test.Numberwrapper> kvp in hsh) + foreach (KeyValuePair<test.INumberwrapper, test.INumberwrapper> kvp in hsh) { Test.Assert(dct[kvp.Key.GetNumber()].raw_handle == kvp.Value.raw_handle); Test.Assert(dct[kvp.Key.GetNumber()].GetNumber() == kvp.Value.GetNumber()); @@ -2997,7 +2997,7 @@ class TestEinaHash public static void test_eina_hash_int_in() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var hsh = new eina.Hash<int,int>(); hsh[22] = 222; Test.Assert(t.EinaHashIntIn(hsh)); @@ -3010,7 +3010,7 @@ class TestEinaHash public static void test_eina_hash_int_in_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var hsh = new eina.Hash<int,int>(); hsh[22] = 222; Test.Assert(t.EinaHashIntInOwn(hsh)); @@ -3025,7 +3025,7 @@ class TestEinaHash public static void test_eina_hash_int_out() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Hash<int,int> hsh; Test.Assert(t.EinaHashIntOut(out hsh)); Test.Assert(!hsh.Own); @@ -3039,7 +3039,7 @@ class TestEinaHash public static void test_eina_hash_int_out_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Hash<int,int> hsh; Test.Assert(t.EinaHashIntOutOwn(out hsh)); Test.Assert(hsh.Own); @@ -3053,7 +3053,7 @@ class TestEinaHash public static void test_eina_hash_int_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var hsh = t.EinaHashIntReturn(); Test.Assert(!hsh.Own); Test.Assert(hsh[22] == 222); @@ -3066,7 +3066,7 @@ class TestEinaHash public static void test_eina_hash_int_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var hsh = t.EinaHashIntReturnOwn(); Test.Assert(hsh.Own); Test.Assert(hsh[22] == 222); @@ -3081,7 +3081,7 @@ class TestEinaHash public static void test_eina_hash_str_in() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var hsh = new eina.Hash<string,string>(); hsh["aa"] = "aaa"; Test.Assert(t.EinaHashStrIn(hsh)); @@ -3094,7 +3094,7 @@ class TestEinaHash public static void test_eina_hash_str_in_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var hsh = new eina.Hash<string,string>(); hsh["aa"] = "aaa"; Test.Assert(t.EinaHashStrInOwn(hsh)); @@ -3109,7 +3109,7 @@ class TestEinaHash public static void test_eina_hash_str_out() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Hash<string,string> hsh; Test.Assert(t.EinaHashStrOut(out hsh)); Test.Assert(!hsh.Own); @@ -3123,7 +3123,7 @@ class TestEinaHash public static void test_eina_hash_str_out_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Hash<string,string> hsh; Test.Assert(t.EinaHashStrOutOwn(out hsh)); Test.Assert(hsh.Own); @@ -3137,7 +3137,7 @@ class TestEinaHash public static void test_eina_hash_str_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var hsh = t.EinaHashStrReturn(); Test.Assert(!hsh.Own); Test.Assert(hsh["aa"] == "aaa"); @@ -3150,7 +3150,7 @@ class TestEinaHash public static void test_eina_hash_str_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var hsh = t.EinaHashStrReturnOwn(); Test.Assert(hsh.Own); Test.Assert(hsh["aa"] == "aaa"); @@ -3165,13 +3165,13 @@ class TestEinaHash public static void test_eina_hash_obj_in() { - test.Testing t = new test.TestingConcrete(); - var hsh = new eina.Hash<test.Numberwrapper,test.Numberwrapper>(); + test.ITesting t = new test.Testing(); + var hsh = new eina.Hash<test.INumberwrapper, test.INumberwrapper>(); var nwk1 = NW(22); var nwv1 = NW(222); hsh[nwk1] = nwv1; - test.Numberwrapper nwk2; - test.Numberwrapper nwv2; + test.INumberwrapper nwk2; + test.INumberwrapper nwv2; Test.Assert(t.EinaHashObjIn(hsh, nwk1, nwv1, out nwk2, out nwv2)); Test.Assert(hsh.Own); Test.Assert(hsh[nwk1].raw_handle == nwv1.raw_handle); @@ -3186,13 +3186,13 @@ class TestEinaHash public static void test_eina_hash_obj_in_own() { - test.Testing t = new test.TestingConcrete(); - var hsh = new eina.Hash<test.Numberwrapper,test.Numberwrapper>(); + test.ITesting t = new test.Testing(); + var hsh = new eina.Hash<test.INumberwrapper, test.INumberwrapper>(); var nwk1 = NW(22); var nwv1 = NW(222); hsh[nwk1] = nwv1; - test.Numberwrapper nwk2; - test.Numberwrapper nwv2; + test.INumberwrapper nwk2; + test.INumberwrapper nwv2; Test.Assert(t.EinaHashObjInOwn(hsh, nwk1, nwv1, out nwk2, out nwv2)); Test.Assert(!hsh.Own); Test.Assert(hsh[nwk1].raw_handle == nwv1.raw_handle); @@ -3208,17 +3208,17 @@ class TestEinaHash public static void test_eina_hash_obj_out() { - test.Testing t = new test.TestingConcrete(); - eina.Hash<test.Numberwrapper,test.Numberwrapper> hsh; - test.Numberwrapper nwk1; - test.Numberwrapper nwv1; + test.ITesting t = new test.Testing(); + eina.Hash<test.INumberwrapper, test.INumberwrapper> hsh; + test.INumberwrapper nwk1; + test.INumberwrapper nwv1; Test.Assert(t.EinaHashObjOut(out hsh, out nwk1, out nwv1)); Test.Assert(!hsh.Own); Test.Assert(hsh[nwk1].raw_handle == nwv1.raw_handle); Test.Assert(hsh[nwk1].GetNumber() == nwv1.GetNumber()); Test.Assert(hsh[nwk1].GetNumber() == 222); - test.Numberwrapper nwk2 = NW(44); - test.Numberwrapper nwv2 = NW(444); + test.INumberwrapper nwk2 = NW(44); + test.INumberwrapper nwv2 = NW(444); hsh[nwk2] = nwv2; hsh.Dispose(); Test.Assert(hsh.Handle == IntPtr.Zero); @@ -3227,17 +3227,17 @@ class TestEinaHash public static void test_eina_hash_obj_out_own() { - test.Testing t = new test.TestingConcrete(); - eina.Hash<test.Numberwrapper,test.Numberwrapper> hsh; - test.Numberwrapper nwk1; - test.Numberwrapper nwv1; + test.ITesting t = new test.Testing(); + eina.Hash<test.INumberwrapper, test.INumberwrapper> hsh; + test.INumberwrapper nwk1; + test.INumberwrapper nwv1; Test.Assert(t.EinaHashObjOutOwn(out hsh, out nwk1, out nwv1)); Test.Assert(hsh.Own); Test.Assert(hsh[nwk1].raw_handle == nwv1.raw_handle); Test.Assert(hsh[nwk1].GetNumber() == nwv1.GetNumber()); Test.Assert(hsh[nwk1].GetNumber() == 222); - test.Numberwrapper nwk2 = NW(44); - test.Numberwrapper nwv2 = NW(444); + test.INumberwrapper nwk2 = NW(44); + test.INumberwrapper nwv2 = NW(444); hsh[nwk2] = nwv2; hsh.Dispose(); Test.Assert(hsh.Handle == IntPtr.Zero); @@ -3246,16 +3246,16 @@ class TestEinaHash public static void test_eina_hash_obj_return() { - test.Testing t = new test.TestingConcrete(); - test.Numberwrapper nwk1; - test.Numberwrapper nwv1; + test.ITesting t = new test.Testing(); + test.INumberwrapper nwk1; + test.INumberwrapper nwv1; var hsh = t.EinaHashObjReturn(out nwk1, out nwv1); Test.Assert(!hsh.Own); Test.Assert(hsh[nwk1].raw_handle == nwv1.raw_handle); Test.Assert(hsh[nwk1].GetNumber() == nwv1.GetNumber()); Test.Assert(hsh[nwk1].GetNumber() == 222); - test.Numberwrapper nwk2 = NW(44); - test.Numberwrapper nwv2 = NW(444); + test.INumberwrapper nwk2 = NW(44); + test.INumberwrapper nwv2 = NW(444); hsh[nwk2] = nwv2; hsh.Dispose(); Test.Assert(hsh.Handle == IntPtr.Zero); @@ -3264,16 +3264,16 @@ class TestEinaHash public static void test_eina_hash_obj_return_own() { - test.Testing t = new test.TestingConcrete(); - test.Numberwrapper nwk1; - test.Numberwrapper nwv1; + test.ITesting t = new test.Testing(); + test.INumberwrapper nwk1; + test.INumberwrapper nwv1; var hsh = t.EinaHashObjReturnOwn(out nwk1, out nwv1); Test.Assert(hsh.Own); Test.Assert(hsh[nwk1].raw_handle == nwv1.raw_handle); Test.Assert(hsh[nwk1].GetNumber() == nwv1.GetNumber()); Test.Assert(hsh[nwk1].GetNumber() == 222); - test.Numberwrapper nwk2 = NW(44); - test.Numberwrapper nwv2 = NW(444); + test.INumberwrapper nwk2 = NW(44); + test.INumberwrapper nwv2 = NW(444); hsh[nwk2] = nwv2; hsh.Dispose(); Test.Assert(hsh.Handle == IntPtr.Zero); @@ -3352,10 +3352,10 @@ class TestEinaIterator public static void eina_array_obj_empty_iterator() { - var arr = new eina.Array<test.Numberwrapper>(); + var arr = new eina.Array<test.INumberwrapper>(); var itr = arr.GetIterator(); int idx = 0; - foreach (test.Numberwrapper e in itr) + foreach (test.INumberwrapper e in itr) { ++idx; } @@ -3367,12 +3367,12 @@ class TestEinaIterator public static void eina_array_obj_filled_iterator() { - var arr = new eina.Array<test.Numberwrapper>(); + var arr = new eina.Array<test.INumberwrapper>(); var base_objs = BaseSeqObj(); arr.Append(base_objs); var itr = arr.GetIterator(); int idx = 0; - foreach (test.Numberwrapper e in itr) + foreach (test.INumberwrapper e in itr) { Test.Assert(e.raw_handle == base_objs[idx].raw_handle); Test.Assert(e.GetNumber() == base_objs[idx].GetNumber()); @@ -3486,10 +3486,10 @@ class TestEinaIterator public static void eina_list_obj_empty_iterator() { - var lst = new eina.List<test.Numberwrapper>(); + var lst = new eina.List<test.INumberwrapper>(); var itr = lst.GetIterator(); int idx = 0; - foreach (test.Numberwrapper e in itr) + foreach (test.INumberwrapper e in itr) { ++idx; } @@ -3501,12 +3501,12 @@ class TestEinaIterator public static void eina_list_obj_filled_iterator() { - var lst = new eina.List<test.Numberwrapper>(); + var lst = new eina.List<test.INumberwrapper>(); var base_objs = BaseSeqObj(); lst.AppendArray(base_objs); var itr = lst.GetIterator(); int idx = 0; - foreach (test.Numberwrapper e in itr) + foreach (test.INumberwrapper e in itr) { Test.Assert(e.raw_handle == base_objs[idx].raw_handle); Test.Assert(e.GetNumber() == base_objs[idx].GetNumber()); @@ -3724,10 +3724,10 @@ class TestEinaIterator public static void eina_hash_keys_obj_empty_iterator() { - var hsh = new eina.Hash<test.Numberwrapper, test.Numberwrapper>(); + var hsh = new eina.Hash<test.INumberwrapper, test.INumberwrapper>(); var itr = hsh.Keys(); bool entered = false; - foreach (test.Numberwrapper e in itr) + foreach (test.INumberwrapper e in itr) { entered = true; } @@ -3739,10 +3739,10 @@ class TestEinaIterator public static void eina_hash_values_obj_empty_iterator() { - var hsh = new eina.Hash<test.Numberwrapper, test.Numberwrapper>(); + var hsh = new eina.Hash<test.INumberwrapper, test.INumberwrapper>(); var itr = hsh.Values(); bool entered = false; - foreach (test.Numberwrapper e in itr) + foreach (test.INumberwrapper e in itr) { entered = true; } @@ -3754,8 +3754,8 @@ class TestEinaIterator public static void eina_hash_keys_obj_filled_iterator() { - var hsh = new eina.Hash<test.Numberwrapper, test.Numberwrapper>(); - var dct = new eina.Hash<int, test.Numberwrapper>(); + var hsh = new eina.Hash<test.INumberwrapper, test.INumberwrapper>(); + var dct = new eina.Hash<int, test.INumberwrapper>(); var a = NW(22); var b = NW(44); var c = NW(88); @@ -3772,7 +3772,7 @@ class TestEinaIterator var itr = hsh.Keys(); int idx = 0; - foreach (test.Numberwrapper e in itr) + foreach (test.INumberwrapper e in itr) { Test.Assert(dct[e.GetNumber()] != null); Test.Assert(dct[e.GetNumber()].raw_handle == e.raw_handle); @@ -3789,8 +3789,8 @@ class TestEinaIterator public static void eina_hash_values_obj_filled_iterator() { - var hsh = new eina.Hash<test.Numberwrapper, test.Numberwrapper>(); - var dct = new eina.Hash<int, test.Numberwrapper>(); + var hsh = new eina.Hash<test.INumberwrapper, test.INumberwrapper>(); + var dct = new eina.Hash<int, test.INumberwrapper>(); var a = NW(22); var b = NW(44); var c = NW(88); @@ -3807,7 +3807,7 @@ class TestEinaIterator var itr = hsh.Values(); int idx = 0; - foreach (test.Numberwrapper e in itr) + foreach (test.INumberwrapper e in itr) { Test.Assert(dct[e.GetNumber()] != null); Test.Assert(dct[e.GetNumber()].raw_handle == e.raw_handle); @@ -3830,7 +3830,7 @@ class TestEinaIterator public static void test_eina_iterator_int_in() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = new eina.Array<int>(); arr.Append(base_seq_int); var itr = arr.GetIterator(); @@ -3853,7 +3853,7 @@ class TestEinaIterator public static void test_eina_iterator_int_in_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = new eina.Array<int>(); arr.Append(base_seq_int); var itr = arr.GetIterator(); @@ -3880,7 +3880,7 @@ class TestEinaIterator public static void test_eina_iterator_int_out() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Iterator<int> itr; Test.Assert(t.EinaIteratorIntOut(out itr)); @@ -3904,7 +3904,7 @@ class TestEinaIterator public static void test_eina_iterator_int_out_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Iterator<int> itr; Test.Assert(t.EinaIteratorIntOutOwn(out itr)); @@ -3925,7 +3925,7 @@ class TestEinaIterator public static void test_eina_iterator_int_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var itr = t.EinaIteratorIntReturn(); @@ -3947,7 +3947,7 @@ class TestEinaIterator public static void test_eina_iterator_int_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var itr = t.EinaIteratorIntReturnOwn(); @@ -3969,7 +3969,7 @@ class TestEinaIterator public static void test_eina_iterator_str_in() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = new eina.Array<string>(); arr.Append(base_seq_str); var itr = arr.GetIterator(); @@ -3992,7 +3992,7 @@ class TestEinaIterator public static void test_eina_iterator_str_in_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var arr = new eina.Array<string>(); arr.Append(base_seq_str); var itr = arr.GetIterator(); @@ -4023,7 +4023,7 @@ class TestEinaIterator public static void test_eina_iterator_str_out() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Iterator<string> itr; Test.Assert(t.EinaIteratorStrOut(out itr)); @@ -4046,7 +4046,7 @@ class TestEinaIterator public static void test_eina_iterator_str_out_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); eina.Iterator<string> itr; Test.Assert(t.EinaIteratorStrOutOwn(out itr)); @@ -4067,7 +4067,7 @@ class TestEinaIterator public static void test_eina_iterator_str_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var itr = t.EinaIteratorStrReturn(); @@ -4089,7 +4089,7 @@ class TestEinaIterator public static void test_eina_iterator_str_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var itr = t.EinaIteratorStrReturnOwn(); @@ -4111,8 +4111,8 @@ class TestEinaIterator public static void test_eina_iterator_obj_in() { - test.Testing t = new test.TestingConcrete(); - var arr = new eina.Array<test.Numberwrapper>(); + test.ITesting t = new test.Testing(); + var arr = new eina.Array<test.INumberwrapper>(); arr.Append(BaseSeqObj()); var itr = arr.GetIterator(); @@ -4134,8 +4134,8 @@ class TestEinaIterator public static void test_eina_iterator_obj_in_own() { - test.Testing t = new test.TestingConcrete(); - var arr = new eina.Array<test.Numberwrapper>(); + test.ITesting t = new test.Testing(); + var arr = new eina.Array<test.INumberwrapper>(); arr.Append(BaseSeqObj()); var itr = arr.GetIterator(); arr.OwnContent = false; @@ -4161,8 +4161,8 @@ class TestEinaIterator public static void test_eina_iterator_obj_out() { - test.Testing t = new test.TestingConcrete(); - eina.Iterator<test.Numberwrapper> itr; + test.ITesting t = new test.Testing(); + eina.Iterator<test.INumberwrapper> itr; Test.Assert(t.EinaIteratorObjOut(out itr)); @@ -4172,7 +4172,7 @@ class TestEinaIterator var base_seq_obj = BaseSeqObj(); int idx = 0; - foreach (test.Numberwrapper e in itr) + foreach (test.INumberwrapper e in itr) { Test.AssertEquals(e.GetNumber(), base_seq_obj[idx].GetNumber()); ++idx; @@ -4186,8 +4186,8 @@ class TestEinaIterator public static void test_eina_iterator_obj_out_own() { - test.Testing t = new test.TestingConcrete(); - eina.Iterator<test.Numberwrapper> itr; + test.ITesting t = new test.Testing(); + eina.Iterator<test.INumberwrapper> itr; Test.Assert(t.EinaIteratorObjOutOwn(out itr)); @@ -4197,7 +4197,7 @@ class TestEinaIterator var base_seq_obj = BaseSeqObj(); int idx = 0; - foreach (test.Numberwrapper e in itr) + foreach (test.INumberwrapper e in itr) { Test.AssertEquals(e.GetNumber(), base_seq_obj[idx].GetNumber()); ++idx; @@ -4209,7 +4209,7 @@ class TestEinaIterator public static void test_eina_iterator_obj_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var itr = t.EinaIteratorObjReturn(); @@ -4219,7 +4219,7 @@ class TestEinaIterator var base_seq_obj = BaseSeqObj(); int idx = 0; - foreach (test.Numberwrapper e in itr) + foreach (test.INumberwrapper e in itr) { Test.AssertEquals(e.GetNumber(), base_seq_obj[idx].GetNumber()); ++idx; @@ -4233,7 +4233,7 @@ class TestEinaIterator public static void test_eina_iterator_obj_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var itr = t.EinaIteratorObjReturnOwn(); @@ -4243,7 +4243,7 @@ class TestEinaIterator var base_seq_obj = BaseSeqObj(); int idx = 0; - foreach (test.Numberwrapper e in itr) + foreach (test.INumberwrapper e in itr) { Test.AssertEquals(e.GetNumber(), base_seq_obj[idx].GetNumber()); ++idx; diff --git a/src/tests/efl_mono/Eo.cs b/src/tests/efl_mono/Eo.cs index d6992ade55..c78027b5c6 100644 --- a/src/tests/efl_mono/Eo.cs +++ b/src/tests/efl_mono/Eo.cs @@ -14,11 +14,11 @@ class TestEo // public static void return_same_object() { - test.Testing testing = new test.TestingConcrete(); - test.Testing o1 = testing.ReturnObject(); + test.ITesting testing = new test.Testing(); + test.ITesting o1 = testing.ReturnObject(); Test.Assert(o1.raw_handle != IntPtr.Zero); Test.Assert(o1.raw_handle == testing.raw_handle); - test.Testing o2 = o1.ReturnObject(); + test.ITesting o2 = o1.ReturnObject(); Test.Assert(o2.raw_handle != IntPtr.Zero); Test.Assert(o2.raw_handle == o1.raw_handle); } @@ -28,7 +28,7 @@ class TestEo { bool delEventCalled = false; { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); obj.DEL += (object sender, EventArgs e) => { delEventCalled = true; }; } @@ -45,7 +45,7 @@ class TestEo { bool delEventCalled = false; { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); obj.DelEvt += (object sender, EventArgs e) => { delEventCalled = true; }; ((IDisposable)obj).Dispose(); } @@ -58,7 +58,7 @@ class TestEo { bool delEventCalled = false; { - test.Testing obj = new Derived(); + test.ITesting obj = new Derived(); obj.DEL += (object sender, EventArgs e) => { delEventCalled = true; }; } @@ -75,7 +75,7 @@ class TestEo { bool delEventCalled = false; { - test.Testing obj = new Derived(); + test.ITesting obj = new Derived(); obj.DEL += (object sender, EventArgs e) => { delEventCalled = true; }; ((IDisposable)obj).Dispose(); } @@ -94,7 +94,7 @@ class TestEoInherit { public static void instantiate_inherited() { - efl.Loop loop = new MyLoop(); + efl.ILoop loop = new MyLoop(); Test.Assert(loop.raw_handle != System.IntPtr.Zero); } } @@ -103,7 +103,7 @@ class TestEoNames { public static void name_getset() { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); string name = "Dummy"; obj.SetName(name); @@ -117,7 +117,7 @@ class TestEoConstructingMethods { bool called = false; string name = "Test object"; - test.Testing obj = new test.TestingConcrete(null, (test.Testing a) => { + test.ITesting obj = new test.Testing(null, (test.ITesting a) => { called = true; Console.WriteLine("callback: obj raw_handle: {0:x}", a.raw_handle); a.SetName(name); @@ -129,7 +129,7 @@ class TestEoConstructingMethods private class Derived : test.TestingInherit { - public Derived(test.Testing parent = null, + public Derived(test.ITesting parent = null, test.TestingInherit.ConstructingMethod cb = null) : base(parent, cb) { } } @@ -138,7 +138,7 @@ class TestEoConstructingMethods { bool called = false; string name = "Another test object"; - Derived obj = new Derived(null, (test.Testing a) => { + Derived obj = new Derived(null, (test.ITesting a) => { called = true; a.SetComment(name); }); @@ -152,41 +152,41 @@ class TestEoParent { public static void basic_parent() { - test.Testing parent = new test.TestingConcrete(null); - test.Testing child = new test.TestingConcrete(parent); + test.ITesting parent = new test.Testing(null); + test.ITesting child = new test.Testing(parent); Test.AssertEquals(parent, child.GetParent()); - test.Testing parent_retrieved = test.TestingConcrete.static_cast(child.GetParent()); + test.ITesting parent_retrieved = test.Testing.static_cast(child.GetParent()); Test.AssertEquals(parent, parent_retrieved); } public static void parent_inherited_class() { - test.Numberwrapper parent = new test.NumberwrapperConcrete(null); - test.Testing child = new test.TestingConcrete(parent); + test.INumberwrapper parent = new test.Numberwrapper(null); + test.ITesting child = new test.Testing(parent); Test.AssertEquals(parent, child.GetParent()); - test.Numberwrapper parent_retrieved = test.NumberwrapperConcrete.static_cast(child.GetParent()); + test.INumberwrapper parent_retrieved = test.Numberwrapper.static_cast(child.GetParent()); Test.AssertEquals(parent, parent_retrieved); } private class Derived : test.TestingInherit { - public Derived(test.Testing parent = null) : base (parent) + public Derived(test.ITesting parent = null) : base (parent) { } } public static void basic_parent_managed_inherit() { - test.Testing parent = new Derived(null); - test.Testing child = new Derived(parent); + test.ITesting parent = new Derived(null); + test.ITesting child = new Derived(parent); Test.AssertEquals(parent, child.GetParent()); - test.Testing parent_from_cast = test.TestingConcrete.static_cast(child.GetParent()); + test.ITesting parent_from_cast = test.Testing.static_cast(child.GetParent()); Test.AssertEquals(parent, parent_from_cast); } } @@ -196,15 +196,15 @@ class TestKlassMethods public static void basic_class_method() { int reference = 0xbeef; - test.TestingConcrete.SetKlassProp(reference); - Test.AssertEquals(reference, test.TestingConcrete.GetKlassProp()); + test.Testing.SetKlassProp(reference); + Test.AssertEquals(reference, test.Testing.GetKlassProp()); } public static void inherited_class_method() { int reference = 0xdead; - test.ChildConcrete.SetKlassProp(reference); - Test.AssertEquals(reference, test.ChildConcrete.GetKlassProp()); + test.Child.SetKlassProp(reference); + Test.AssertEquals(reference, test.Child.GetKlassProp()); } } diff --git a/src/tests/efl_mono/Errors.cs b/src/tests/efl_mono/Errors.cs index d403533720..6276c720b4 100644 --- a/src/tests/efl_mono/Errors.cs +++ b/src/tests/efl_mono/Errors.cs @@ -19,7 +19,7 @@ class TestEolianError public static void global_eina_error() { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); Test.AssertRaises<efl.EflException>(() => obj.RaisesEinaError()); } @@ -28,7 +28,7 @@ class TestEolianError public static void global_eina_error_inherited() { - test.Testing obj = new Child(); + test.ITesting obj = new Child(); Test.AssertRaises<efl.EflException>(() => obj.RaisesEinaError()); } @@ -44,7 +44,7 @@ class TestEolianError public static void exception_raised_from_inherited_virtual() { - test.Testing obj = new Overrider(); + test.ITesting obj = new Overrider(); Test.AssertRaises<efl.EflException>(obj.CallChildrenRaiseError); } @@ -52,7 +52,7 @@ class TestEolianError // return eina_error public static void eina_error_return() { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); eina.Error expected = 42; obj.SetErrorRet(expected); eina.Error error = obj.ReturnsError(); @@ -79,7 +79,7 @@ class TestEolianError public static void eina_error_return_from_inherited_virtual() { - test.Testing obj = new ReturnOverride(); + test.ITesting obj = new ReturnOverride(); eina.Error expected = 42; obj.SetErrorRet(expected); eina.Error error = obj.ReturnsError(); @@ -108,7 +108,7 @@ class TestEolianError // An event whose managed delegate generates an exception // must set an eina_error so it can be reported back to // the managed code - efl.Loop loop = new efl.LoopConcrete(); + efl.ILoop loop = new efl.Loop(); Listener listener = new Listener(); loop.CallbackAddEvt += listener.callback; diff --git a/src/tests/efl_mono/Events.cs b/src/tests/efl_mono/Events.cs index b24b12819d..2e977f6f0a 100644 --- a/src/tests/efl_mono/Events.cs +++ b/src/tests/efl_mono/Events.cs @@ -1,6 +1,6 @@ using System; -using static test.TestingConcrete; // For the event args +using static test.Testing; // For the event args namespace TestSuite { @@ -11,7 +11,7 @@ class TestEoEvents public bool correct_sender = false; protected void callback(object sender, EventArgs e) { called = true; - efl.Object obj = sender as efl.Object; + efl.IObject obj = sender as efl.IObject; if (obj != null) { obj.SetName("loop_called"); @@ -22,7 +22,7 @@ class TestEoEvents public static void callback_add_event() { - efl.Loop loop = new efl.LoopConcrete(); + efl.ILoop loop = new efl.Loop(); loop.SetName("loop"); TestEoEvents listener = new TestEoEvents(); loop.CallbackAddEvt += listener.callback; @@ -38,7 +38,7 @@ class TestEoEvents public static void event_with_string_payload() { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); string received_string = null; obj.EvtWithStringEvt += (object sender, EvtWithStringEvt_Args e) => { @@ -52,7 +52,7 @@ class TestEoEvents public static void event_with_int_payload() { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); int received_int= 0; obj.EvtWithIntEvt += (object sender, EvtWithIntEvt_Args e) => { @@ -66,7 +66,7 @@ class TestEoEvents public static void event_with_bool_payload() { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); bool received_bool = false; obj.EvtWithBoolEvt += (object sender, EvtWithBoolEvt_Args e) => { @@ -84,7 +84,7 @@ class TestEoEvents public static void event_with_uint_payload() { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); uint received_uint = 0; obj.EvtWithUintEvt += (object sender, EvtWithUintEvt_Args e) => { received_uint = e.arg; @@ -97,14 +97,14 @@ class TestEoEvents public static void event_with_object_payload() { - test.Testing obj = new test.TestingConcrete(); - test.Testing received_obj = null; + test.ITesting obj = new test.Testing(); + test.ITesting received_obj = null; obj.EvtWithObjEvt += (object sender, EvtWithObjEvt_Args e) => { received_obj = e.arg; }; - test.Testing sent_obj = new test.TestingConcrete(); + test.ITesting sent_obj = new test.Testing(); obj.EmitEventWithObj(sent_obj); @@ -113,7 +113,7 @@ class TestEoEvents public static void event_with_error_payload() { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); eina.Error received_error = 0; obj.EvtWithErrorEvt += (object sender, EvtWithErrorEvt_Args e) => { @@ -129,7 +129,7 @@ class TestEoEvents public static void event_with_struct_payload() { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); test.StructSimple received_struct = default(test.StructSimple); obj.EvtWithStructEvt += (object sender, EvtWithStructEvt_Args e) => { diff --git a/src/tests/efl_mono/FunctionPointerMarshalling.cs b/src/tests/efl_mono/FunctionPointerMarshalling.cs index e7627a87f1..b6ba6df3d1 100644 --- a/src/tests/efl_mono/FunctionPointerMarshalling.cs +++ b/src/tests/efl_mono/FunctionPointerMarshalling.cs @@ -9,7 +9,7 @@ class TestFunctionPointerMarshalling { public static void func_pointer_marshalling() { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); bool called = false; eina.Strbuf buf = new eina.Strbuf(); string argument = "Some String"; diff --git a/src/tests/efl_mono/FunctionPointers.cs b/src/tests/efl_mono/FunctionPointers.cs index 2514d79b82..1e2431ce47 100644 --- a/src/tests/efl_mono/FunctionPointers.cs +++ b/src/tests/efl_mono/FunctionPointers.cs @@ -29,7 +29,7 @@ class TestFunctionPointers public static void set_callback_basic() { setup(); - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); obj.SetCallback(twice); Test.Assert(called == false, "set_callback should not call the callback"); @@ -44,7 +44,7 @@ class TestFunctionPointers { setup(); - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); obj.SetCallback(y => { called = true; return y + 4; @@ -62,7 +62,7 @@ class TestFunctionPointers { setup(); - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); obj.SetCallback(twice); Test.Assert(called == false, "set_callback should not call the callback"); diff --git a/src/tests/efl_mono/Parts.cs b/src/tests/efl_mono/Parts.cs index b6ed9a882c..6137609a9c 100644 --- a/src/tests/efl_mono/Parts.cs +++ b/src/tests/efl_mono/Parts.cs @@ -13,7 +13,7 @@ public static class TestParts { public static void basic_part_test() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); do_part_test(t); } @@ -27,7 +27,7 @@ public static class TestParts do_part_test(t); } - private static void do_part_test(test.Testing t) + private static void do_part_test(test.ITesting t) { var p1 = t.Part1; var p2 = t.Part2; diff --git a/src/tests/efl_mono/Strbuf.cs b/src/tests/efl_mono/Strbuf.cs index 3f2c484a54..97a70c23d2 100644 --- a/src/tests/efl_mono/Strbuf.cs +++ b/src/tests/efl_mono/Strbuf.cs @@ -18,7 +18,7 @@ class TestStrBuf public static void test_eolian() { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); eina.Strbuf buf = new eina.Strbuf(); obj.AppendToStrbuf(buf, "Appended"); diff --git a/src/tests/efl_mono/Strings.cs b/src/tests/efl_mono/Strings.cs index f798f20715..156b7ca9cf 100644 --- a/src/tests/efl_mono/Strings.cs +++ b/src/tests/efl_mono/Strings.cs @@ -8,7 +8,7 @@ class TestStrings public static void in_string() { { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); String sent = "in_string"; String returned = obj.InString(sent); Test.AssertEquals(sent, returned); @@ -21,7 +21,7 @@ class TestStrings public static void in_own_string() { { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); String sent = "in_own_string"; String returned = obj.InOwnString(sent); Test.AssertEquals(sent, returned); @@ -33,7 +33,7 @@ class TestStrings public static void return_string() { { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); Test.AssertEquals("string", obj.ReturnString()); } System.GC.Collect(); @@ -43,7 +43,7 @@ class TestStrings public static void return_own_string() { { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); Test.AssertEquals("own_string", obj.ReturnOwnString()); } System.GC.Collect(); @@ -54,7 +54,7 @@ class TestStrings { { String str = String.Empty; - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); obj.OutString(out str); Test.AssertEquals("out_string", str); } @@ -66,7 +66,7 @@ class TestStrings { { String str = String.Empty; - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); obj.OutOwnString(out str); Test.AssertEquals(str.ToString(), "out_own_string"); } @@ -144,7 +144,7 @@ class TestStrings * some time in the future */ public static void return_string_from_virtual() { - test.Testing obj = new StringReturner(); + test.ITesting obj = new StringReturner(); /* for (int i = 0; i < 10000; i ++) // Uncomment this to check for memory leaks. */ Test.AssertEquals("inherited", obj.CallReturnString()); System.GC.Collect(); @@ -153,7 +153,7 @@ class TestStrings /* The managed wrapper must surrender the ownership to the C after the virtual call. */ public static void return_own_string_from_virtual() { - test.Testing obj = new StringReturner(); + test.ITesting obj = new StringReturner(); /* for (int i = 0; i < 10000; i ++) // Uncomment this to check for memory leaks. */ Test.AssertEquals("own_inherited", obj.CallReturnOwnString()); System.GC.Collect(); @@ -163,7 +163,7 @@ class TestStrings * need to cache it until some time in the future. */ public static void out_string_from_virtual() { - test.Testing obj = new StringReturner(); + test.ITesting obj = new StringReturner(); /* for (int i = 0; i < 10000; i ++) // Uncomment this to check for memory leaks. */ Test.AssertEquals("out_inherited", obj.CallOutString()); System.GC.Collect(); @@ -172,7 +172,7 @@ class TestStrings /* The managed wrapper gives C the ownership of the filled out parameter */ public static void out_own_string_from_virtual() { - test.Testing obj = new StringReturner(); + test.ITesting obj = new StringReturner(); /* for (int i = 0; i < 10000; i ++) // Uncomment this to check for memory leaks. */ Test.AssertEquals("out_own_inherited", obj.CallOutOwnString()); System.GC.Collect(); @@ -185,7 +185,7 @@ class TestStringshare public static void in_stringshare() { { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); String sent = "in_stringshare"; String returned = obj.InStringshare(sent); Test.AssertEquals(sent, returned); @@ -196,7 +196,7 @@ class TestStringshare public static void in_own_stringshare() { { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); String sent = "in_own_stringshare"; String returned = obj.InOwnStringshare(sent); Test.AssertEquals(sent, returned); @@ -207,7 +207,7 @@ class TestStringshare public static void return_stringshare() { { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); Test.AssertEquals("stringshare", obj.ReturnStringshare()); } System.GC.Collect(); @@ -216,7 +216,7 @@ class TestStringshare public static void return_own_stringshare() { { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); Test.AssertEquals("own_stringshare", obj.ReturnOwnStringshare()); } System.GC.Collect(); @@ -226,7 +226,7 @@ class TestStringshare { { String str = String.Empty; - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); obj.OutStringshare(out str); Test.AssertEquals("out_stringshare", str); } @@ -237,7 +237,7 @@ class TestStringshare { { String str = String.Empty; - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); obj.OutOwnStringshare(out str); Test.AssertEquals(str.ToString(), "out_own_stringshare"); } @@ -304,28 +304,28 @@ class TestStringshare public static void return_stringshare_from_virtual() { - test.Testing obj = new StringshareReturner(); + test.ITesting obj = new StringshareReturner(); // for (int i = 0; i < 1000000; i ++) // Uncomment this to check for memory leaks. Test.AssertEquals("inherited", obj.CallReturnStringshare()); } public static void return_own_stringshare_from_virtual() { - test.Testing obj = new StringshareReturner(); + test.ITesting obj = new StringshareReturner(); // for (int i = 0; i < 1000000; i ++) // Uncomment this to check for memory leaks. Test.AssertEquals("own_inherited", obj.CallReturnOwnStringshare()); } public static void out_stringshare_from_virtual() { - test.Testing obj = new StringshareReturner(); + test.ITesting obj = new StringshareReturner(); // for (int i = 0; i < 1000000; i ++) // Uncomment this to check for memory leaks. Test.AssertEquals("out_inherited", obj.CallOutStringshare()); } public static void out_own_stringshare_from_virtual() { - test.Testing obj = new StringshareReturner(); + test.ITesting obj = new StringshareReturner(); // for (int i = 0; i < 1000000; i ++) // Uncomment this to check for memory leaks. Test.AssertEquals("out_own_inherited", obj.CallOutOwnStringshare()); } diff --git a/src/tests/efl_mono/Structs.cs b/src/tests/efl_mono/Structs.cs index 00bcb266ab..4a9e7e9018 100644 --- a/src/tests/efl_mono/Structs.cs +++ b/src/tests/efl_mono/Structs.cs @@ -165,7 +165,7 @@ class TestStructs complex.Fslice.Mem = eina.MemoryNative.Alloc(1); Marshal.WriteByte(complex.Fslice.Mem, 125); - complex.Fobj = new test.NumberwrapperConcrete(); + complex.Fobj = new test.Numberwrapper(); complex.Fobj.SetNumber(42); return complex; @@ -261,7 +261,7 @@ class TestStructs public static void simple_in() { var simple = structSimpleWithValues(); - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); bool r = t.StructSimpleIn(simple); Test.Assert(r, "Function returned false"); } @@ -271,7 +271,7 @@ class TestStructs var simple = structSimpleWithValues(); int original = simple.Fint; simple.Fmstring = "Struct Ptr In"; - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); Test.Assert(t.StructSimplePtrIn(ref simple)); Test.AssertEquals(-original, simple.Fint); Test.AssertEquals("nI rtP tcurtS", simple.Fmstring); @@ -282,7 +282,7 @@ class TestStructs var simple = structSimpleWithValues(); int original = simple.Fint; simple.Fmstring = "Struct Ptr In Own"; - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); test.StructSimple result = t.StructSimplePtrInOwn(ref simple); Test.AssertEquals(-original, result.Fint); Test.AssertEquals("nwO nI rtP tcurtS", result.Fmstring); @@ -291,7 +291,7 @@ class TestStructs public static void simple_out() { var simple = new test.StructSimple(); - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); bool r = t.StructSimpleOut(out simple); Test.Assert(r, "Function returned false"); checkStructSimple(simple); @@ -300,7 +300,7 @@ class TestStructs public static void simple_ptr_out() { test.StructSimple simple; - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); test.StructSimple result = t.StructSimplePtrOut(out simple); Test.AssertEquals(result.Fint, simple.Fint); Test.AssertEquals(result.Fstring, simple.Fstring); @@ -309,7 +309,7 @@ class TestStructs public static void simple_ptr_out_own() { test.StructSimple simple; - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); test.StructSimple result = t.StructSimplePtrOutOwn(out simple); Test.AssertEquals(result.Fint, simple.Fint); Test.AssertEquals(simple.Fstring, "Ptr Out Own"); @@ -317,21 +317,21 @@ class TestStructs public static void simple_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var simple = t.StructSimpleReturn(); checkStructSimple(simple); } public static void simple_ptr_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var simple = t.StructSimplePtrReturn(); Test.AssertEquals(simple.Fstring, "Ret Ptr"); } public static void simple_ptr_return_own() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var simple = t.StructSimplePtrReturnOwn(); Test.AssertEquals(simple.Fstring, "Ret Ptr Own"); } @@ -505,7 +505,7 @@ class TestStructs public static void complex_in() { var complex = structComplexWithValues(); - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); bool r = t.StructComplexIn(complex); Test.Assert(r, "Function returned false"); } @@ -521,7 +521,7 @@ class TestStructs public static void complex_out() { var complex = new test.StructComplex(); - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); bool r = t.StructComplexOut(out complex); Test.Assert(r, "Function returned false"); checkStructComplex(complex); @@ -537,7 +537,7 @@ class TestStructs public static void complex_return() { - test.Testing t = new test.TestingConcrete(); + test.ITesting t = new test.Testing(); var complex = t.StructComplexReturn(); checkStructComplex(complex); } diff --git a/src/tests/efl_mono/ValueEolian.cs b/src/tests/efl_mono/ValueEolian.cs index f39438937f..3f39004e54 100644 --- a/src/tests/efl_mono/ValueEolian.cs +++ b/src/tests/efl_mono/ValueEolian.cs @@ -11,7 +11,7 @@ namespace TestSuite { public static class TestEinaValueEolian { public static void TestEolianEinaValueInReturn() { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); using (eina.Value v = new eina.Value(eina.ValueType.Int32)) { v.Set(42); @@ -27,7 +27,7 @@ public static class TestEinaValueEolian { public static void TestEolianEinaValueInOwn() { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); using (eina.Value v = new eina.Value(eina.ValueType.Int32)) { v.Set(2001); @@ -47,7 +47,7 @@ public static class TestEinaValueEolian { public static void TestEolianEinaValueOut() { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); using (eina.Value v = new eina.Value(eina.ValueType.String)) { eina.Value v_out = null; @@ -63,7 +63,7 @@ public static class TestEinaValueEolian { public static void TestEolianEinaValueOutOwn() { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); using (eina.Value v = new eina.Value(eina.ValueType.String)) { eina.Value v_out = null; @@ -79,7 +79,7 @@ public static class TestEinaValueEolian { public static void TestEolianEinaValueInReturnByValue() { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); using (eina.Value v = new eina.Value(eina.ValueType.Int32)) { v.Set(42); @@ -96,7 +96,7 @@ public static class TestEinaValueEolian { public static void TestEolianEinaValueOutByValue() { - test.Testing obj = new test.TestingConcrete(); + test.ITesting obj = new test.Testing(); using (eina.Value v = new eina.Value(eina.ValueType.String)) { eina.Value v_out = null; |