Attachment #139696 for bug #280994

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 280994
Collapse All | Expand All

Lines 749-755 Link Here

(-)src/org/eclipse/swt/custom/CCombo.java (-1 / +1 lines)
749	model.deselectAll();	749	model.deselectAll();
750	String[] items = model.getItems();	750	String[] items = model.getItems();
751	for( int i = 0; i < items.length; i++ ) {	751	for( int i = 0; i < items.length; i++ ) {
752	if( verifiedText == items[i] ) {	752	if( verifiedText.equals( items[i] ) ) {
753	model.setSelection( i );	753	model.setSelection( i );
754	break;	754	break;
755	}	755	}

Lines 607-613 Link Here

(-)src/org/eclipse/swt/widgets/Combo.java (-1 / +1 lines)
607	model.deselectAll();	607	model.deselectAll();
608	String[] items = model.getItems();	608	String[] items = model.getItems();
609	for( int i = 0; i < items.length; i++ ) {	609	for( int i = 0; i < items.length; i++ ) {
610	if( verifiedText == items[i] ) {	610	if( verifiedText.equals( items[i] ) ) {
611	model.setSelection( i );	611	model.setSelection( i );
612	break;	612	break;
613	}	613	}

Lines 131-136 Link Here

(-)src/org/eclipse/RWTHostTestSuite.java (+1 lines)
131	suite.addTestSuite( TableColumn_Test.class );	131	suite.addTestSuite( TableColumn_Test.class );
132	suite.addTestSuite( TableItem_Test.class );	132	suite.addTestSuite( TableItem_Test.class );
133	suite.addTestSuite( CCombo_Test.class );	133	suite.addTestSuite( CCombo_Test.class );
		134	suite.addTestSuite( Combo_Test.class );
134	suite.addTestSuite( List_Test.class );	135	suite.addTestSuite( List_Test.class );
135	suite.addTestSuite( ToolBar_Test.class );	136	suite.addTestSuite( ToolBar_Test.class );
136	suite.addTestSuite( CTabFolder_Test.class );	137	suite.addTestSuite( CTabFolder_Test.class );




import org.eclipse.rwt.lifecycle.PhaseId;
import org.eclipse.swt.RWTFixture;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.*;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.*;


    expected = new Point( 100, 100 );
    assertEquals( expected, combo.computeSize( 100, 100 ) );
  }
  
  public void testSetTextAndSelection() throws Exception {
    RWTFixture.fakePhase( PhaseId.PROCESS_ACTION );
    Display display = new Display();
    Shell shell = new Shell( display, SWT.NONE );
    final CCombo combo = new CCombo( shell, SWT.NONE );
    combo.add( "test" );
    combo.add( "test1" );
    combo.add( "test2" );
    combo.addVerifyListener( new VerifyListener() {
      public void verifyText( VerifyEvent event ) {
        event.text = event.text + "2";
      }
    } );
    combo.setText( "test" );
    assertEquals( 2, combo.getSelectionIndex() );
  }

  protected void setUp() throws Exception {
    RWTFixture.setUp();




import org.eclipse.rwt.lifecycle.PhaseId;
import org.eclipse.swt.RWTFixture;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.*;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.graphics.Point;

/*

    expected = new Point( 104, 104 );
    assertEquals( expected, combo.computeSize( 100, 100 ) );
  }
  
  public void testSetTextAndSelection() throws Exception {
    RWTFixture.fakePhase( PhaseId.PROCESS_ACTION );
    Display display = new Display();
    Shell shell = new Shell( display, SWT.NONE );
    final Combo combo = new Combo( shell, SWT.NONE );
    combo.add( "test" );
    combo.add( "test1" );
    combo.add( "test2" );
    combo.addVerifyListener( new VerifyListener() {
      public void verifyText( VerifyEvent event ) {
        event.text = event.text + "2";
      }
    } );
    combo.setText( "test" );
    assertEquals( 2, combo.getSelectionIndex() );
  }

  protected void setUp() throws Exception {
    RWTFixture.setUp();

Return to bug 280994

Lines 16-23 Link Here

(-)src/org/eclipse/swt/custom/CCombo_Test.java (-2 / +18 lines)
16	import org.eclipse.rwt.lifecycle.PhaseId;	16	import org.eclipse.rwt.lifecycle.PhaseId;
17	import org.eclipse.swt.RWTFixture;	17	import org.eclipse.swt.RWTFixture;
18	import org.eclipse.swt.SWT;	18	import org.eclipse.swt.SWT;
19	import org.eclipse.swt.events.ModifyEvent;	19	import org.eclipse.swt.events.*;
20	import org.eclipse.swt.events.ModifyListener;
21	import org.eclipse.swt.graphics.Point;	20	import org.eclipse.swt.graphics.Point;
22	import org.eclipse.swt.widgets.*;	21	import org.eclipse.swt.widgets.*;
23		22
Lines 537-542 Link Here
537	expected = new Point( 100, 100 );	536	expected = new Point( 100, 100 );
538	assertEquals( expected, combo.computeSize( 100, 100 ) );	537	assertEquals( expected, combo.computeSize( 100, 100 ) );
539	}	538	}
		539
		540	public void testSetTextAndSelection() throws Exception {
		541	RWTFixture.fakePhase( PhaseId.PROCESS_ACTION );
		542	Display display = new Display();
		543	Shell shell = new Shell( display, SWT.NONE );
		544	final CCombo combo = new CCombo( shell, SWT.NONE );
		545	combo.add( "test" );
		546	combo.add( "test1" );
		547	combo.add( "test2" );
		548	combo.addVerifyListener( new VerifyListener() {
		549	public void verifyText( VerifyEvent event ) {
		550	event.text = event.text + "2";
		551	}
		552	} );
		553	combo.setText( "test" );
		554	assertEquals( 2, combo.getSelectionIndex() );
		555	}
540		556
541	protected void setUp() throws Exception {	557	protected void setUp() throws Exception {
542	RWTFixture.setUp();	558	RWTFixture.setUp();

Lines 17-24 Link Here

(-)src/org/eclipse/swt/widgets/Combo_Test.java (-2 / +18 lines)
17	import org.eclipse.rwt.lifecycle.PhaseId;	17	import org.eclipse.rwt.lifecycle.PhaseId;
18	import org.eclipse.swt.RWTFixture;	18	import org.eclipse.swt.RWTFixture;
19	import org.eclipse.swt.SWT;	19	import org.eclipse.swt.SWT;
20	import org.eclipse.swt.events.ModifyEvent;	20	import org.eclipse.swt.events.*;
21	import org.eclipse.swt.events.ModifyListener;
22	import org.eclipse.swt.graphics.Point;	21	import org.eclipse.swt.graphics.Point;
23		22
24	/*	23	/*
Lines 468-473 Link Here
468	expected = new Point( 104, 104 );	467	expected = new Point( 104, 104 );
469	assertEquals( expected, combo.computeSize( 100, 100 ) );	468	assertEquals( expected, combo.computeSize( 100, 100 ) );
470	}	469	}
		470
		471	public void testSetTextAndSelection() throws Exception {
		472	RWTFixture.fakePhase( PhaseId.PROCESS_ACTION );
		473	Display display = new Display();
		474	Shell shell = new Shell( display, SWT.NONE );
		475	final Combo combo = new Combo( shell, SWT.NONE );
		476	combo.add( "test" );
		477	combo.add( "test1" );
		478	combo.add( "test2" );
		479	combo.addVerifyListener( new VerifyListener() {
		480	public void verifyText( VerifyEvent event ) {
		481	event.text = event.text + "2";
		482	}
		483	} );
		484	combo.setText( "test" );
		485	assertEquals( 2, combo.getSelectionIndex() );
		486	}
471		487
472	protected void setUp() throws Exception {	488	protected void setUp() throws Exception {
473	RWTFixture.setUp();	489	RWTFixture.setUp();