keeping tests up to date

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 {
 
                 // Try to add a Frame in a Tab
                 assertTrue("_MUST_ be able to add a Frame in a Tab", tab.addMember(frame) != -1);
-                assertTrue("_MUST_ be able to add a Frame in a Tab (Through the Bridge)", ScilabBridge.addMember(tab.getAsSimpleTab(), frame.getAsSimpleFrame()) != -1);
+                assertTrue("_MUST_ be able to add a Frame in a Tab (Through the Bridge)", ScilabBridge.addMember(tab, frame) != -1);
                 System.out.println(STOP_BANNER);
         }
 
@@ -69,7 +69,7 @@ public class AddMemberTest {
 
                 // Try to add a Console in a Frame
                 assertTrue("_MUST_NOT_ be able to add a Console in a Frame", frame.addMember(console) == -1);
-                assertTrue("_MUST_ be able to add a Console in a Frame (Through the Bridge)", ScilabBridge.addMember(frame.getAsSimpleFrame(), console.getAsSimpleConsole()) != -1);
+                assertTrue("_MUST_ be able to add a Console in a Frame (Through the Bridge)", ScilabBridge.addMember(frame, console) != -1);
                 System.out.println(STOP_BANNER);
         }
 
@@ -88,7 +88,7 @@ public class AddMemberTest {
 
                 // Try to add a Console in a Tab
                 assertTrue("_MUST_ be able to add a Console in a Tab", tab.addMember(console) != -1);
-                assertTrue("_MUST_ be able to add a Console in a Tab(Through the Bridge)", ScilabBridge.addMember(tab.getAsSimpleTab(), console.getAsSimpleConsole()) != -1);
+                assertTrue("_MUST_ be able to add a Console in a Tab(Through the Bridge)", ScilabBridge.addMember(tab, console) != -1);
                 System.out.println(STOP_BANNER);
                 }
 
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 {
                 menuItem.setMnemonic(KeyEvent.VK_S);
                 menu.add(menuItem);
                 menuBar.add(menu);
+                menu.addSeparator();
+                Menu subMenu = ScilabMenu.createMenu();
+                subMenu.setText("Sub Menu");
+                menuItem = ScilabMenuItem.createMenuItem();
+                menuItem.setText("Sub Menu Item 1");
+                subMenu.add(menuItem);
+                menuItem = ScilabMenuItem.createMenuItem();
+                menuItem.setText("Sub Menu Item 1");
+                subMenu.add(menuItem);
+                menu.add(subMenu);
+                menuBar.add(menu);
                 
                 //System.out.println("mainView.menuBar is null : result = " + mainView.getMenuBar());
                 mainView.addMenuBar(menuBar);
@@ -155,8 +166,8 @@ public class WindowTest2 {
                 // pushButton on frame
                 PushButton pushButton1 = ScilabPushButton.createPushButton();
                 pushButton1.setText("push Button in a Frame");
-                pushButton1.setPosition(new Position(0,0));
-                pushButton1.setDims(new Size(200,20));
+                pushButton1.setPosition(new Position(0, 0));
+                pushButton1.setDims(new Size(200, 20));
                 frame1.addMember(pushButton1);
                 
                 testTab.addMember(frame1);