Attachment #196522 for bug #346198

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

Lines 18-24 Link Here

(-)src/org/eclipse/swt/internal/browser/browserkit/BrowserLCA.java (-2 / +1 lines)
18	import org.eclipse.rwt.RWT;	18	import org.eclipse.rwt.RWT;
19	import org.eclipse.rwt.internal.engine.RWTFactory;	19	import org.eclipse.rwt.internal.engine.RWTFactory;
20	import org.eclipse.rwt.internal.lifecycle.LifeCycleUtil;	20	import org.eclipse.rwt.internal.lifecycle.LifeCycleUtil;
21	import org.eclipse.rwt.internal.lifecycle.RWTLifeCycle;
22	import org.eclipse.rwt.internal.service.ContextProvider;	21	import org.eclipse.rwt.internal.service.ContextProvider;
23	import org.eclipse.rwt.internal.service.IServiceStateInfo;	22	import org.eclipse.rwt.internal.service.IServiceStateInfo;
24	import org.eclipse.rwt.internal.util.EncodingUtil;	23	import org.eclipse.rwt.internal.util.EncodingUtil;
Lines 139-145 Link Here
139		138
140	static boolean hasUrlChanged( final Browser browser ) {	139	static boolean hasUrlChanged( final Browser browser ) {
141	boolean initialized = WidgetUtil.getAdapter( browser ).isInitialized();	140	boolean initialized = WidgetUtil.getAdapter( browser ).isInitialized();
142	return !initialized \|\| getAdapter( browser ).getAndResetUrlChanged();	141	return getAdapter( browser ).getAndResetUrlChanged() \|\| !initialized;
143	}	142	}
144		143
145	static String getUrl( final Browser browser ) throws IOException {	144	static String getUrl( final Browser browser ) throws IOException {




import org.eclipse.rwt.lifecycle.*;
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.*;
import org.eclipse.swt.internal.widgets.IBrowserAdapter;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;


    assertEquals( "http://eclipse.org/rip", BrowserLCA.getUrl( browser ) );
  }

  public void testResetUrlChanged_NotInitialized() throws IOException {
    Display display = new Display();
    Shell shell = new Shell( display );
    Fixture.markInitialized( display );
    Browser browser = new Browser( shell, SWT.NONE );
    browser.setUrl( "http://eclipse.org/rap" );
    Fixture.fakeResponseWriter();

    BrowserLCA lca = new BrowserLCA();
    lca.renderChanges( browser );

    assertFalse( getAdapter( browser).getAndResetUrlChanged() );
  }

  public void testResetUrlChanged_Initialized() throws IOException {
    Display display = new Display();
    Shell shell = new Shell( display );
    Fixture.markInitialized( display );
    Browser browser = new Browser( shell, SWT.NONE );
    Fixture.markInitialized( browser );
    browser.setUrl( "http://eclipse.org/rap" );
    Fixture.fakeResponseWriter();

    BrowserLCA lca = new BrowserLCA();
    lca.renderChanges( browser );

    assertFalse( getAdapter( browser).getAndResetUrlChanged() );
  }

  public void testRenderUrl() throws IOException {
    Display display = new Display();
    Fixture.markInitialized( display );

    assertEquals( "completed", log.get( 1 ) );
  }

  private static IBrowserAdapter getAdapter( final Browser browser ) {
    return ( IBrowserAdapter )browser.getAdapter( IBrowserAdapter.class );
  }

  protected void setUp() throws Exception {
    Fixture.setUp();
  }

Return to bug 346198

Lines 21-26 Link Here

(-)src/org/eclipse/swt/internal/browser/browserkit/BrowserLCA_Test.java (+34 lines)
21	import org.eclipse.rwt.lifecycle.*;	21	import org.eclipse.rwt.lifecycle.*;
22	import org.eclipse.swt.SWT;	22	import org.eclipse.swt.SWT;
23	import org.eclipse.swt.browser.*;	23	import org.eclipse.swt.browser.*;
		24	import org.eclipse.swt.internal.widgets.IBrowserAdapter;
24	import org.eclipse.swt.widgets.Display;	25	import org.eclipse.swt.widgets.Display;
25	import org.eclipse.swt.widgets.Shell;	26	import org.eclipse.swt.widgets.Shell;
26		27
Lines 95-100 Link Here
95	assertEquals( "http://eclipse.org/rip", BrowserLCA.getUrl( browser ) );	96	assertEquals( "http://eclipse.org/rip", BrowserLCA.getUrl( browser ) );
96	}	97	}
97		98
		99	public void testResetUrlChanged_NotInitialized() throws IOException {
		100	Display display = new Display();
		101	Shell shell = new Shell( display );
		102	Fixture.markInitialized( display );
		103	Browser browser = new Browser( shell, SWT.NONE );
		104	browser.setUrl( "http://eclipse.org/rap" );
		105	Fixture.fakeResponseWriter();
		106
		107	BrowserLCA lca = new BrowserLCA();
		108	lca.renderChanges( browser );
		109
		110	assertFalse( getAdapter( browser).getAndResetUrlChanged() );
		111	}
		112
		113	public void testResetUrlChanged_Initialized() throws IOException {
		114	Display display = new Display();
		115	Shell shell = new Shell( display );
		116	Fixture.markInitialized( display );
		117	Browser browser = new Browser( shell, SWT.NONE );
		118	Fixture.markInitialized( browser );
		119	browser.setUrl( "http://eclipse.org/rap" );
		120	Fixture.fakeResponseWriter();
		121
		122	BrowserLCA lca = new BrowserLCA();
		123	lca.renderChanges( browser );
		124
		125	assertFalse( getAdapter( browser).getAndResetUrlChanged() );
		126	}
		127
98	public void testRenderUrl() throws IOException {	128	public void testRenderUrl() throws IOException {
99	Display display = new Display();	129	Display display = new Display();
100	Fixture.markInitialized( display );	130	Fixture.markInitialized( display );
Lines 337-342 Link Here
337	assertEquals( "completed", log.get( 1 ) );	367	assertEquals( "completed", log.get( 1 ) );
338	}	368	}
339		369
		370	private static IBrowserAdapter getAdapter( final Browser browser ) {
		371	return ( IBrowserAdapter )browser.getAdapter( IBrowserAdapter.class );
		372	}
		373
340	protected void setUp() throws Exception {	374	protected void setUp() throws Exception {
341	Fixture.setUp();	375	Fixture.setUp();
342	}	376	}