aboutsummaryrefslogtreecommitdiffstatsci
path: root/Tests
diff options
context:
space:
mode:
authorjpbruyere <jp.bruyere@hotmail.com>2015-09-17 18:30:01 +0200
committerjpbruyere <jp.bruyere@hotmail.com>2015-09-17 18:30:01 +0200
commit41b76ea576cdece6c5a2f1feb936dfb4a2a9854a (patch)
tree42c16725f61d0cfb1fef4c1016f3c0a15f130d3f /Tests
parent3aba832ca7c6f9da0e9be8f5060013a2bbc6d345 (diff)
Combobox
Diffstat (limited to 'Tests')
-rw-r--r--Tests/GOLIBTest_Listbox.cs15
-rw-r--r--Tests/GOLIBTests.cs9
-rwxr-xr-xTests/Interfaces/testCombobox.goml2
-rw-r--r--Tests/Tests.csproj3
4 files changed, 21 insertions, 8 deletions
diff --git a/Tests/GOLIBTest_Listbox.cs b/Tests/GOLIBTest_Listbox.cs
index 0189e3f6..1c19338e 100644
--- a/Tests/GOLIBTest_Listbox.cs
+++ b/Tests/GOLIBTest_Listbox.cs
@@ -64,19 +64,18 @@ namespace test
// new ClsItem("string 2"),
// new ClsItem("string 3")
// });
- public List<string> TestList;
-// string[] TestList = new string[]
-// {
-// "string 1",
-// "string 2",
-// "string 3"
-// };
+ public List<string> TestList = new List<string>( new string[]
+ {
+ "string 1",
+ "string 2",
+ "string 3"
+ });
protected override void OnLoad (EventArgs e)
{
base.OnLoad (e);
- TestList = Directory.GetFileSystemEntries("/mnt/data/MagicCardDataBase/a/", "*.txt",SearchOption.AllDirectories).ToList();
+ //TestList = Directory.GetFileSystemEntries("/mnt/data/MagicCardDataBase/a/", "*.txt",SearchOption.AllDirectories).ToList();
LoadInterface("Interfaces/test_Listbox.goml");
// TestList [1].Field = "test string";
diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
index 14c6c1a1..f5521f07 100644
--- a/Tests/GOLIBTests.cs
+++ b/Tests/GOLIBTests.cs
@@ -12,6 +12,7 @@ using System.Diagnostics;
//using GGL;
using go;
using System.Threading;
+using System.Collections.Generic;
namespace test
@@ -31,6 +32,7 @@ namespace test
int frameCpt = 0;
int idx = 0;
string[] testFiles = {
+ "testCombobox.goml",
"testBorder.goml",
"testContainer.goml",
"testLabel.goml",
@@ -85,6 +87,13 @@ namespace test
public string update = "";
#endregion
+ public List<String> TestList = new List<string>( new string[]
+ {
+ "string 1",
+ "string 2",
+ "string 3"
+ });
+
protected override void OnLoad (EventArgs e)
{
base.OnLoad (e);
diff --git a/Tests/Interfaces/testCombobox.goml b/Tests/Interfaces/testCombobox.goml
new file mode 100755
index 00000000..c022d22c
--- /dev/null
+++ b/Tests/Interfaces/testCombobox.goml
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<Combobox Height="-1" Data="{TestList}"/> \ No newline at end of file
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 06eba842..ca65a6b0 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -165,6 +165,9 @@
<None Include="Interfaces\testBorder.goml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Include="Interfaces\testCombobox.goml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
</ItemGroup>
<ItemGroup>
<Folder Include="Interfaces\" />