summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMajouane BENJELLOUL <majouane.benjelloul@inria.fr>2007-07-19 12:33:41 +0000
committerMajouane BENJELLOUL <majouane.benjelloul@inria.fr>2007-07-19 12:33:41 +0000
commitc62d6dcee11bee7d6f6763dbc1efa0f5eb73e275 (patch)
treef707551e44d37a2c9b3f9b8adbe9118d24513004 /tests
parente555c2406181c7829b6b3018e67bc166e81a0d8b (diff)
downloadscilab-c62d6dcee11bee7d6f6763dbc1efa0f5eb73e275.zip
scilab-c62d6dcee11bee7d6f6763dbc1efa0f5eb73e275.tar.gz
keeping tests up to date
Diffstat (limited to 'tests')
-rw-r--r--tests/GUI/addmember/AddMemberTest.java6
-rw-r--r--tests/GUI/window/WindowTest2.java15
2 files changed, 16 insertions, 5 deletions
diff --git a/tests/GUI/addmember/AddMemberTest.java b/tests/GUI/addmember/AddMemberTest.java
index 0b28183..961d3af 100644
--- a/tests/GUI/addmember/AddMemberTest.java
+++ b/tests/GUI/addmember/AddMemberTest.java
@@ -50,7 +50,7 @@ public class AddMemberTest {
50 50
51 // Try to add a Frame in a Tab 51 // Try to add a Frame in a Tab
52 assertTrue("_MUST_ be able to add a Frame in a Tab", tab.addMember(frame) != -1); 52 assertTrue("_MUST_ be able to add a Frame in a Tab", tab.addMember(frame) != -1);
53 assertTrue("_MUST_ be able to add a Frame in a Tab (Through the Bridge)", ScilabBridge.addMember(tab.getAsSimpleTab(), frame.getAsSimpleFrame()) != -1); 53 assertTrue("_MUST_ be able to add a Frame in a Tab (Through the Bridge)", ScilabBridge.addMember(tab, frame) != -1);
54 System.out.println(STOP_BANNER); 54 System.out.println(STOP_BANNER);
55 } 55 }
56 56
@@ -69,7 +69,7 @@ public class AddMemberTest {
69 69
70 // Try to add a Console in a Frame 70 // Try to add a Console in a Frame
71 assertTrue("_MUST_NOT_ be able to add a Console in a Frame", frame.addMember(console) == -1); 71 assertTrue("_MUST_NOT_ be able to add a Console in a Frame", frame.addMember(console) == -1);
72 assertTrue("_MUST_ be able to add a Console in a Frame (Through the Bridge)", ScilabBridge.addMember(frame.getAsSimpleFrame(), console.getAsSimpleConsole()) != -1); 72 assertTrue("_MUST_ be able to add a Console in a Frame (Through the Bridge)", ScilabBridge.addMember(frame, console) != -1);
73 System.out.println(STOP_BANNER); 73 System.out.println(STOP_BANNER);
74 } 74 }
75 75
@@ -88,7 +88,7 @@ public class AddMemberTest {
88 88
89 // Try to add a Console in a Tab 89 // Try to add a Console in a Tab
90 assertTrue("_MUST_ be able to add a Console in a Tab", tab.addMember(console) != -1); 90 assertTrue("_MUST_ be able to add a Console in a Tab", tab.addMember(console) != -1);
91 assertTrue("_MUST_ be able to add a Console in a Tab(Through the Bridge)", ScilabBridge.addMember(tab.getAsSimpleTab(), console.getAsSimpleConsole()) != -1); 91 assertTrue("_MUST_ be able to add a Console in a Tab(Through the Bridge)", ScilabBridge.addMember(tab, console) != -1);
92 System.out.println(STOP_BANNER); 92 System.out.println(STOP_BANNER);
93 } 93 }
94 94
diff --git a/tests/GUI/window/WindowTest2.java b/tests/GUI/window/WindowTest2.java
index d135809..e1ca9fd 100644
--- a/tests/GUI/window/WindowTest2.java
+++ b/tests/GUI/window/WindowTest2.java
@@ -99,6 +99,17 @@ public class WindowTest2 {
99 menuItem.setMnemonic(KeyEvent.VK_S); 99 menuItem.setMnemonic(KeyEvent.VK_S);
100 menu.add(menuItem); 100 menu.add(menuItem);
101 menuBar.add(menu); 101 menuBar.add(menu);
102 menu.addSeparator();
103 Menu subMenu = ScilabMenu.createMenu();
104 subMenu.setText("Sub Menu");
105 menuItem = ScilabMenuItem.createMenuItem();
106 menuItem.setText("Sub Menu Item 1");
107 subMenu.add(menuItem);
108 menuItem = ScilabMenuItem.createMenuItem();
109 menuItem.setText("Sub Menu Item 1");
110 subMenu.add(menuItem);
111 menu.add(subMenu);
112 menuBar.add(menu);
102 113
103 //System.out.println("mainView.menuBar is null : result = " + mainView.getMenuBar()); 114 //System.out.println("mainView.menuBar is null : result = " + mainView.getMenuBar());
104 mainView.addMenuBar(menuBar); 115 mainView.addMenuBar(menuBar);
@@ -155,8 +166,8 @@ public class WindowTest2 {
155 // pushButton on frame 166 // pushButton on frame
156 PushButton pushButton1 = ScilabPushButton.createPushButton(); 167 PushButton pushButton1 = ScilabPushButton.createPushButton();
157 pushButton1.setText("push Button in a Frame"); 168 pushButton1.setText("push Button in a Frame");
158 pushButton1.setPosition(new Position(0,0)); 169 pushButton1.setPosition(new Position(0, 0));
159 pushButton1.setDims(new Size(200,20)); 170 pushButton1.setDims(new Size(200, 20));
160 frame1.addMember(pushButton1); 171 frame1.addMember(pushButton1);
161 172
162 testTab.addMember(frame1); 173 testTab.addMember(frame1);