Attachment 197293 Details for Bug 347446 – Proposed fix

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

[patch] Proposed fix

clipboard.txt (text/plain), 36.03 KB, created by Rüdiger Herrmann

on 2011-06-03 04:47:28 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rüdiger Herrmann

Created: 2011-06-03 04:47:28 EDT

Size: 36.03 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt.q07.test
>Index: src/org/eclipse/RWTQ07TestSuite.java
>===================================================================
>RCS file: src/org/eclipse/RWTQ07TestSuite.java
>diff -N src/org/eclipse/RWTQ07TestSuite.java
>--- src/org/eclipse/RWTQ07TestSuite.java	16 May 2011 20:19:53 -0000	1.46
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,157 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2002, 2011 Innoopract Informationssysteme GmbH.
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- *    Innoopract Informationssysteme GmbH - initial API and implementation
>- *    EclipseSource - ongoing development
>- ******************************************************************************/
>-package org.eclipse;
>-
>-import junit.framework.Test;
>-import junit.framework.TestSuite;
>-
>-import org.eclipse.rwt.internal.lifecycle.*;
>-import org.eclipse.rwt.internal.service.StartupPage_Test;
>-import org.eclipse.rwt.internal.textsize.*;
>-import org.eclipse.rwt.internal.widgets.fileuploadkit.FileUploadLCA_Test;
>-import org.eclipse.rwt.lifecycle.*;
>-import org.eclipse.swt.events.*;
>-import org.eclipse.swt.internal.browser.browserkit.BrowserLCA_Test;
>-import org.eclipse.swt.internal.custom.ccombokit.CComboLCA_Test;
>-import org.eclipse.swt.internal.custom.clabelkit.CLabelLCA_Test;
>-import org.eclipse.swt.internal.custom.ctabfolderkit.CTabFolderLCA_Test;
>-import org.eclipse.swt.internal.custom.scrolledcompositekit.ScrolledCompositeLCA_Test;
>-import org.eclipse.swt.internal.dnd.dragsourcekit.DragSourceLCA_Test;
>-import org.eclipse.swt.internal.events.ActivateEvent_Test;
>-import org.eclipse.swt.internal.events.EventLCAUtil_Test;
>-import org.eclipse.swt.internal.internal.widgets.controldecoratorkit.ControlDecoratorLCA_Test;
>-import org.eclipse.swt.internal.widgets.WidgetAdapter_Test;
>-import org.eclipse.swt.internal.widgets.buttonkit.ButtonLCA_Test;
>-import org.eclipse.swt.internal.widgets.canvaskit.CanvasLCA_Test;
>-import org.eclipse.swt.internal.widgets.canvaskit.GCOperationWriter_Test;
>-import org.eclipse.swt.internal.widgets.combokit.ComboLCA_Test;
>-import org.eclipse.swt.internal.widgets.controlkit.ControlLCA_Test;
>-import org.eclipse.swt.internal.widgets.coolbarkit.CoolBarLCA_Test;
>-import org.eclipse.swt.internal.widgets.coolitemkit.CoolItemLCA_Test;
>-import org.eclipse.swt.internal.widgets.datetimekit.DateTimeLCA_Test;
>-import org.eclipse.swt.internal.widgets.displaykit.*;
>-import org.eclipse.swt.internal.widgets.expandbarkit.ExpandBarLCA_Test;
>-import org.eclipse.swt.internal.widgets.expanditemkit.ExpandItemLCA_Test;
>-import org.eclipse.swt.internal.widgets.labelkit.LabelLCA_Test;
>-import org.eclipse.swt.internal.widgets.linkkit.LinkLCA_Test;
>-import org.eclipse.swt.internal.widgets.listkit.ListLCA_Test;
>-import org.eclipse.swt.internal.widgets.menuitemkit.MenuItemLCA_Test;
>-import org.eclipse.swt.internal.widgets.menukit.MenuLCA_Test;
>-import org.eclipse.swt.internal.widgets.progressbarkit.ProgressBarLCA_Test;
>-import org.eclipse.swt.internal.widgets.sashkit.SashLCA_Test;
>-import org.eclipse.swt.internal.widgets.scalekit.ScaleLCA_Test;
>-import org.eclipse.swt.internal.widgets.shellkit.ShellLCA_Test;
>-import org.eclipse.swt.internal.widgets.sliderkit.SliderLCA_Test;
>-import org.eclipse.swt.internal.widgets.spinnerkit.SpinnerLCA_Test;
>-import org.eclipse.swt.internal.widgets.tabfolderkit.TabFolderLCA_Test;
>-import org.eclipse.swt.internal.widgets.tabitemkit.TabItemLCA_Test;
>-import org.eclipse.swt.internal.widgets.tablecolumnkit.TableColumnLCA_Test;
>-import org.eclipse.swt.internal.widgets.tableitemkit.TableItemLCA_Test;
>-import org.eclipse.swt.internal.widgets.tablekit.TableLCA_Test;
>-import org.eclipse.swt.internal.widgets.textkit.TextLCA_Test;
>-import org.eclipse.swt.internal.widgets.toolitemkit.ToolItemLCA_Test;
>-import org.eclipse.swt.internal.widgets.tooltipkit.ToolTipLCA_Test;
>-import org.eclipse.swt.internal.widgets.treecolumnkit.TreeColumnLCA_Test;
>-import org.eclipse.swt.internal.widgets.treeitemkit.TreeItemLCA_Test;
>-import org.eclipse.swt.internal.widgets.treekit.TreeLCA_Test;
>-
>-
>-public class RWTQ07TestSuite {
>-
>-  public static Test suite() {
>-    TestSuite suite = new TestSuite( "Tests for org.eclipse.rap.rwt.q07" );
>-
>-    // TODO [fappel]: Note that the following tests belong semantically to the
>-    //                RWT core tests, but there is still some refactoring
>-    //                necessary to achieve this, so they've been moved
>-    //                temporarily to the q07 fragment tests..
>-    suite.addTestSuite( PreserveWidgets_Test.class );
>-    suite.addTestSuite( WidgetAdapter_Test.class );
>-    suite.addTestSuite( DuplicateRequest_Test.class );
>-    suite.addTestSuite( MouseEvent_Test.class );
>-    suite.addTestSuite( ControlEvent_Test.class );
>-    suite.addTestSuite( ActivateEvent_Test.class );
>-    suite.addTestSuite( FocusEvent_Test.class );
>-    suite.addTestSuite( TypedEvent_Test.class );
>-    suite.addTestSuite( UntypedEvents_Test.class );
>-
>-    // TODO [fappel]: Check also which parts of the following tests belong
>-    //                to the host bundle testsuite
>-    // == LifeCycle ==
>-    suite.addTestSuite( LifeCycleAdapter_Test.class );
>-    suite.addTestSuite( LifeCycleAdapterUtil_Test.class );
>-    suite.addTestSuite( RenderDispose_Test.class );
>-    suite.addTestSuite( JSWriter_Test.class );
>-    suite.addTestSuite( WidgetLCAUtil_Test.class );
>-    suite.addTestSuite( ControlLCAUtil_Test.class );
>-    suite.addTestSuite( EventLCAUtil_Test.class );
>-    suite.addTestSuite( UITestUtil_Test.class );
>-    suite.addTestSuite( PhaseListenerManager_Test.class );
>-    suite.addTestSuite( SimpleLifeCycle_Test.class );
>-    suite.addTestSuite( RWTLifeCycle_Test.class );
>-    suite.addTestSuite( RWTLifeCycle2_Test.class );
>-    suite.addTestSuite( ThemeAdapter_Test.class );
>-    suite.addTestSuite( MeasurementListener_Test.class );
>-    suite.addTestSuite( TextSizeUtilFacadeImpl_Test.class );
>-    suite.addTestSuite( DragSourceLCA_Test.class );
>-
>-    // == Service ==
>-    suite.addTestSuite( StartupPage_Test.class );
>-
>-    // == LCA ==
>-    suite.addTestSuite( DisplayLCA_Test.class );
>-    suite.addTestSuite( DisplayLCAFocus_Test.class );
>-    suite.addTestSuite( ControlLCA_Test.class );
>-    suite.addTestSuite( LabelLCA_Test.class );
>-    suite.addTestSuite( TextLCA_Test.class );
>-    suite.addTestSuite( ButtonLCA_Test.class );
>-    suite.addTestSuite( SashLCA_Test.class );
>-    suite.addTestSuite( TreeLCA_Test.class );
>-    suite.addTestSuite( TreeItemLCA_Test.class );
>-    suite.addTestSuite( TreeColumnLCA_Test.class );
>-    suite.addTestSuite( ShellLCA_Test.class );
>-    suite.addTestSuite( MenuLCA_Test.class );
>-    suite.addTestSuite( MenuItemLCA_Test.class );
>-    suite.addTestSuite( TableLCA_Test.class );
>-    suite.addTestSuite( TableColumnLCA_Test.class );
>-    suite.addTestSuite( TableItemLCA_Test.class );
>-    suite.addTestSuite( CTabFolderLCA_Test.class );
>-    suite.addTestSuite( CoolBarLCA_Test.class );
>-    suite.addTestSuite( CoolItemLCA_Test.class );
>-    suite.addTestSuite( LinkLCA_Test.class );
>-    suite.addTestSuite( ListLCA_Test.class );
>-    suite.addTestSuite( SpinnerLCA_Test.class );
>-    suite.addTestSuite( ComboLCA_Test.class );
>-    suite.addTestSuite( ToolItemLCA_Test.class );
>-    suite.addTestSuite( TabFolderLCA_Test.class );
>-    suite.addTestSuite( TabItemLCA_Test.class );
>-    suite.addTestSuite( ScrolledCompositeLCA_Test.class );
>-    suite.addTestSuite( BrowserLCA_Test.class );
>-    suite.addTestSuite( ScaleLCA_Test.class );
>-    suite.addTestSuite( DateTimeLCA_Test.class );
>-    suite.addTestSuite( ExpandBarLCA_Test.class );
>-    suite.addTestSuite( ExpandItemLCA_Test.class );
>-    suite.addTestSuite( SliderLCA_Test.class );
>-    suite.addTestSuite( CComboLCA_Test.class );
>-    suite.addTestSuite( CLabelLCA_Test.class );
>-    suite.addTestSuite( ProgressBarLCA_Test.class );
>-    suite.addTestSuite( ControlDecoratorLCA_Test.class );
>-    suite.addTestSuite( DNDSupport_Test.class );
>-    suite.addTestSuite( CanvasLCA_Test.class );
>-    suite.addTestSuite( GCOperationWriter_Test.class );
>-    suite.addTestSuite( ToolTipLCA_Test.class );
>-    suite.addTestSuite( ActiveKeysUtil_Test.class );
>-    suite.addTestSuite( FileUploadLCA_Test.class );
>-    suite.addTestSuite( ClientResources_Test.class );
>-    return suite;
>-  }
>-}
>\ No newline at end of file
>#P org.eclipse.rap.rwt.test
>Index: src/org/eclipse/RWTHostTestSuite.java
>===================================================================
>RCS file: src/org/eclipse/RWTHostTestSuite.java
>diff -N src/org/eclipse/RWTHostTestSuite.java
>--- src/org/eclipse/RWTHostTestSuite.java	1 Jun 2011 07:26:58 -0000	1.118
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,296 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2002, 2011 Innoopract Informationssysteme GmbH.
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- *    Innoopract Informationssysteme GmbH - initial API and implementation
>- *    EclipseSource - ongoing development
>- *    Frank Appel - replaced singletons and static fields (Bug 337787)
>- ******************************************************************************/
>-package org.eclipse;
>-
>-import junit.framework.Test;
>-import junit.framework.TestSuite;
>-
>-import org.eclipse.rwt.*;
>-import org.eclipse.rwt.graphics.Graphics_Test;
>-import org.eclipse.rwt.internal.*;
>-import org.eclipse.rwt.internal.branding.BrandingManager_Test;
>-import org.eclipse.rwt.internal.branding.BrandingUtil_Test;
>-import org.eclipse.rwt.internal.engine.*;
>-import org.eclipse.rwt.internal.events.EventAdapter_Test;
>-import org.eclipse.rwt.internal.lifecycle.*;
>-import org.eclipse.rwt.internal.resources.*;
>-import org.eclipse.rwt.internal.service.*;
>-import org.eclipse.rwt.internal.textsize.*;
>-import org.eclipse.rwt.internal.theme.*;
>-import org.eclipse.rwt.internal.theme.css.*;
>-import org.eclipse.rwt.internal.util.*;
>-import org.eclipse.rwt.internal.widgets.JSExecutor_Test;
>-import org.eclipse.rwt.lifecycle.*;
>-import org.eclipse.rwt.service.*;
>-import org.eclipse.rwt.widgets.*;
>-import org.eclipse.swt.browser.BrowserFunction_Test;
>-import org.eclipse.swt.browser.Browser_Test;
>-import org.eclipse.swt.custom.*;
>-import org.eclipse.swt.dnd.*;
>-import org.eclipse.swt.events.*;
>-import org.eclipse.swt.graphics.*;
>-import org.eclipse.swt.internal.events.DragDetectEvent_Test;
>-import org.eclipse.swt.internal.graphics.*;
>-import org.eclipse.swt.internal.widgets.*;
>-import org.eclipse.swt.widgets.*;
>-
>-public class RWTHostTestSuite {
>-
>-  public static Test suite() {
>-    TestSuite suite = new TestSuite( "Tests for org.eclipse.rap.rwt" );
>-
>-// TODO [fappel]: Note that the following commented tests belong semantically
>-//                to the RWT host tests, but there is still some refactoring
>-//                necessary to achieve this, so they've been moved temporarily
>-//                to the q07 fragment tests.
>-//    suite.addTestSuite( PreserveWidgetsPhaseListener_Test.class );
>-//    suite.addTestSuite( WidgetAdapter_Test.class );
>-//    suite.addTestSuite( DuplicateRequest_Test.class );
>-//    suite.addTestSuite( MouseEvent_Test.class );
>-//    suite.addTestSuite( ControlEvent_Test.class );
>-//    suite.addTestSuite( ActivateEvent_Test.class );
>-//    suite.addTestSuite( FocusEvent_Test.class );
>-//    suite.addTestSuite( TypedEvent_Test.class );
>-//    suite.addTestSuite( UntypedEvents_Test.class );
>-//    suite.addTestSuite( Tree_Test.class );
>-//    suite.addTestSuite( TreeItem_Test.class );
>-
>-    // Former W4T Tests
>-    suite.addTestSuite( NLS_Test.class );
>-    suite.addTestSuite( AdapterManager_Test.class );
>-    suite.addTestSuite( AdapterFactoryRegistry_Test.class );
>-    suite.addTestSuite( JavaScriptResponseWriter_Test.class );
>-    suite.addTestSuite( SessionSingletonBase_Test.class );
>-    suite.addTestSuite( SingletonManager_Test.class );
>-    suite.addTestSuite( LifeCycleUtil_Test.class );
>-    suite.addTestSuite( LifeCycleFactory_Test.class );
>-    suite.addTestSuite( PrepareUIRoot_Test.class );
>-    suite.addTestSuite( ProcessAction_Test.class );
>-    suite.addTestSuite( Render_Test.class );
>-    suite.addTestSuite( PhaseExecutor_Test.class );
>-    suite.addTestSuite( ReadData_Test.class );
>-    suite.addTestSuite( PhaseId_Test.class );
>-    suite.addTestSuite( PhaseListenerUtil_Test.class );
>-    suite.addTestSuite( ServiceHandler_Test.class );
>-    suite.addTestSuite( SessionStoreImpl_Test.class );
>-    suite.addTestSuite( SessionStoreImplSerialization_Test.class );
>-    suite.addTestSuite( SessionStoreEvent_Test.class );
>-    suite.addTestSuite( ApplicationStoreImpl_Test.class );
>-    suite.addTestSuite( RWTConfiguration_Test.class );
>-    suite.addTestSuite( QxCleanup_Test.class );
>-    suite.addTestSuite( ResourceManagerImpl_Test.class );
>-    suite.addTestSuite( ResourceUtil_Test.class );
>-    suite.addTestSuite( TokenList_Test.class );
>-    suite.addTestSuite( EventAdapter_Test.class );
>-    suite.addTestSuite( WrappedRequest_Test.class );
>-    suite.addTestSuite( RequestParameterBuffer_Test.class );
>-    suite.addTestSuite( ContextProvider_Test.class );
>-    suite.addTestSuite( ServiceContext_Test.class );
>-    suite.addTestSuite( ServletLog_Test.class );
>-    suite.addTestSuite( RWT_Test.class );
>-
>-    // RWT Tests
>-    suite.addTestSuite( EntryPointManager_Test.class );
>-    suite.addTestSuite( RWTServletContextListener_Test.class );
>-    suite.addTestSuite( RWTConfigurationConfigurable_Test.class );
>-    suite.addTestSuite( EntryPointManagerConfigurable_Test.class );
>-    suite.addTestSuite( BrandingManagerConfigurable_Test.class );
>-    suite.addTestSuite( SettingStoreManagerConfigurable_Test.class );
>-    suite.addTestSuite( PhaseListenerRegistryConfigurable_Test.class );
>-    suite.addTestSuite( AdapterManagerConfigurable_Test.class );
>-    suite.addTestSuite( ResourceRegistryConfigurable_Test.class );
>-    suite.addTestSuite( ServiceManagerConfigurable_Test.class );
>-    suite.addTestSuite( ThemeManagerConfigurable_Test.class );
>-    suite.addTestSuite( ApplicationContext_Test.class );
>-    suite.addTestSuite( ApplicationContextUtil_Test.class );
>-    suite.addTestSuite( RWTFactory_Test.class );
>-    suite.addTestSuite( PhaseListenerRegistry_Test.class );
>-    suite.addTestSuite( RWTDelegate_Test.class );
>-    suite.addTestSuite( RWTClusterSupport_Test.class );
>-    suite.addTestSuite( ResourceRegistry_Test.class );
>-    suite.addTestSuite( RWTRequestVersionControl_Test.class );
>-    suite.addTestSuite( ResourceManagerProvider_Test.class );
>-    suite.addTestSuite( BrandingManager_Test.class );
>-    suite.addTestSuite( BrandingUtil_Test.class );
>-    suite.addTestSuite( JSListenerType_Test.class );
>-    suite.addTestSuite( JSVar_Test.class );
>-    suite.addTestSuite( WidgetUtil_Test.class );
>-    suite.addTestSuite( SelectionEvent_Test.class );
>-    suite.addTestSuite( DisposeEvent_Test.class );
>-    suite.addTestSuite( ShellEvent_Test.class );
>-    suite.addTestSuite( TreeEvent_Test.class );
>-    suite.addTestSuite( KeyEvent_Test.class );
>-    suite.addTestSuite( MenuDetectEvent_Test.class );
>-    suite.addTestSuite( UntypedEventAdapter_Test.class );
>-    suite.addTestSuite( IdManager_Test.class );
>-    suite.addTestSuite( UICallBack_Test.class );
>-    suite.addTestSuite( UICallBackManager_Test.class );
>-    suite.addTestSuite( UICallBackServiceHandler_Test.class );
>-    suite.addTestSuite( JSLibraryServiceHandler_Test.class);
>-    suite.addTestSuite( JSLibraryConcatenator_Test.class);
>-    suite.addTestSuite( LifeCycleServiceHandler_Test.class );
>-    suite.addTestSuite( StartupPageTemplateHolder_Test.class );
>-    suite.addTestSuite( EncodingUtil_Test.class );
>-    suite.addTestSuite( ClassUtil_Test.class );
>-    suite.addTestSuite( StreamWritingUtil_Test.class );
>-    suite.addTestSuite( SharedInstanceBuffer_Test.class );
>-    suite.addTestSuite( NumberFormatUtil_Test.class );
>-
>-    suite.addTestSuite( Display_Test.class );
>-    suite.addTestSuite( DisplaySerialization_Test.class );
>-    suite.addTestSuite( Monitor_Test.class );
>-    suite.addTestSuite( Shell_Test.class );
>-    suite.addTestSuite( Widget_Test.class );
>-    suite.addTestSuite( Control_Test.class );
>-    suite.addTestSuite( Composite_Test.class );
>-    suite.addTestSuite( Canvas_Test.class );
>-    suite.addTestSuite( Item_Test.class );
>-    suite.addTestSuite( ItemHolder_Test.class );
>-    suite.addTestSuite( ControlHolder_Test.class );
>-    suite.addTestSuite( Composition_Test.class );
>-    suite.addTestSuite( WidgetTreeVisitor_Test.class );
>-    suite.addTestSuite( Layout_Test.class );
>-    suite.addTestSuite( SlimList_Test.class );
>-    suite.addTestSuite( Button_Test.class );
>-    suite.addTestSuite( TreeColumn_Test.class );
>-    suite.addTestSuite( TabFolderAndItem_Test.class );
>-    suite.addTestSuite( Menu_Test.class );
>-    suite.addTestSuite( MenuItem_Test.class );
>-    suite.addTestSuite( MenuHolder_Test.class );
>-    suite.addTestSuite( Table_Test.class );
>-    suite.addTestSuite( TableColumn_Test.class );
>-    suite.addTestSuite( TableItem_Test.class );
>-    suite.addTestSuite( CCombo_Test.class );
>-    suite.addTestSuite( Combo_Test.class );
>-    suite.addTestSuite( List_Test.class );
>-    suite.addTestSuite( ToolBar_Test.class );
>-    suite.addTestSuite( ToolItem_Test.class );
>-    suite.addTestSuite( CTabFolder_Test.class );
>-    suite.addTestSuite( CTabItem_Test.class );
>-    suite.addTestSuite( CLabel_Test.class );
>-    suite.addTestSuite( CoolBar_Test.class );
>-    suite.addTestSuite( CoolItem_Test.class );
>-    suite.addTestSuite( Label_Test.class );
>-    suite.addTestSuite( Link_Test.class );
>-    suite.addTestSuite( Browser_Test.class );
>-    suite.addTestSuite( BrowserFunction_Test.class );
>-    suite.addTestSuite( Group_Test.class );
>-    suite.addTestSuite( Text_Test.class );
>-    suite.addTestSuite( Spinner_Test.class );
>-    suite.addTestSuite( JSExecutor_Test.class );
>-    suite.addTestSuite( ExternalBrowser_Test.class );
>-    suite.addTestSuite( BrowserHistory_Test.class );
>-    suite.addTestSuite( ProgressBar_Test.class );
>-    suite.addTestSuite( BusyIndicator_Test.class );
>-    suite.addTestSuite( Scale_Test.class );
>-    suite.addTestSuite( DateTime_Test.class );
>-    suite.addTestSuite( MessageBox_Test.class );
>-    suite.addTestSuite( ExpandBar_Test.class );
>-    suite.addTestSuite( ExpandItem_Test.class );
>-    suite.addTestSuite( Slider_Test.class );
>-    suite.addTestSuite( Dialog_Test.class );
>-    suite.addTestSuite( FontDialog_Test.class );
>-    suite.addTestSuite( ColorDialog_Test.class );
>-    suite.addTestSuite( Scrollable_Test.class );
>-    suite.addTestSuite( Decorations_Test.class );
>-    suite.addTestSuite( ScrolledComposite_Test.class );
>-    suite.addTestSuite( Decorator_Test.class );
>-    suite.addTestSuite( DragDetectEvent_Test.class );
>-    suite.addTestSuite( DragSource_Test.class );
>-    suite.addTestSuite( DragSourceEffect_Test.class );
>-    suite.addTestSuite( Transfer_Test.class );
>-    suite.addTestSuite( ByteArrayTransfer_Test.class );
>-    suite.addTestSuite( Tree_Test.class );
>-    suite.addTestSuite( TreeItem_Test.class );
>-    suite.addTestSuite( ToolTip_Test.class );
>-    suite.addTestSuite( FileUpload_Test.class );
>-
>-    suite.addTestSuite( Image_Test.class );
>-    suite.addTestSuite( ImageData_Test.class );
>-    suite.addTestSuite( ImageDataCache_Test.class );
>-    suite.addTestSuite( ImageDataFactory_Test.class );
>-    suite.addTestSuite( Color_Test.class );
>-    suite.addTestSuite( RGB_Test.class );
>-    suite.addTestSuite( Font_Test.class );
>-    suite.addTestSuite( FontData_Test.class );
>-    suite.addTestSuite( Graphics_Test.class );
>-    suite.addTestSuite( Resource_Test.class );
>-    suite.addTestSuite( Cursor_Test.class );
>-    suite.addTestSuite( Device_Test.class );
>-    suite.addTestSuite( DeviceSerialization_Test.class );
>-    suite.addTestSuite( GC_Test.class );
>-    suite.addTestSuite( ControlGC_Test.class );
>-    suite.addTestSuite( DeviceGC_Test.class );
>-    suite.addTestSuite( FontMetrics_Test.class );
>-    suite.addTestSuite( LineAttributes_Test.class );
>-    suite.addTestSuite( TextSizeEstimation_Test.class );
>-    suite.addTestSuite( TextSizeUtil_Test.class );
>-    suite.addTestSuite( TextSizeStorageUtil_Test.class );
>-    suite.addTestSuite( Probe_Test.class );
>-    suite.addTestSuite( ProbeStore_Test.class );
>-    suite.addTestSuite( ProbeResultStore_Test.class );
>-    suite.addTestSuite( MeasurementItem_Test.class );
>-    suite.addTestSuite( TextSizeRecalculation_Test.class );
>-    suite.addTestSuite( TextSizeStorage_Test.class );
>-    suite.addTestSuite( MeasurementOperator_Test.class );
>-    suite.addTestSuite( ProbeResult_Test.class );
>-    suite.addTestSuite( ResourceFactory_Test.class );
>-    suite.addTestSuite( ImageFactory_Test.class );
>-    suite.addTestSuite( InternalImageFactory_Test.class );
>-    suite.addTestSuite( WidgetGraphicsAdapter_Test.class );
>-    suite.addTestSuite( FontDataFactory_Test.class );
>-
>-    // == Theming ==
>-    suite.addTestSuite( Theme_Test.class );
>-    suite.addTestSuite( ThemeManager_Test.class );
>-    suite.addTestSuite( ThemeUtil_Test.class );
>-    suite.addTestSuite( ThemeAdapterManager_Test.class );
>-    suite.addTestSuite( QxTheme_Test.class );
>-    suite.addTestSuite( ThemeDefinitionReader_Test.class );
>-    suite.addTestSuite( QxColor_Test.class );
>-    suite.addTestSuite( QxBorder_Test.class );
>-    suite.addTestSuite( QxBoolean_Test.class );
>-    suite.addTestSuite( QxDimension_Test.class );
>-    suite.addTestSuite( QxBoxDimensions_Test.class );
>-    suite.addTestSuite( QxFont_Test.class );
>-    suite.addTestSuite( QxImage_Test.class );
>-    suite.addTestSuite( QxCursor_Test.class );
>-    suite.addTestSuite( QxAnimation_Test.class );
>-    suite.addTestSuite( QxIdentifier_Test.class );
>-    suite.addTestSuite( QxShadow_Test.class );
>-    suite.addTestSuite( CssFileReader_Test.class );
>-    suite.addTestSuite( PropertyResolver_Test.class );
>-    suite.addTestSuite( JsonArray_Test.class );
>-    suite.addTestSuite( JsonObject_Test.class );
>-    suite.addTestSuite( JsonValue_Test.class );
>-    suite.addTestSuite( StyleSheet_Test.class );
>-    suite.addTestSuite( WidgetMatcher_Test.class );
>-    suite.addTestSuite( SimpleSelector_Test.class );
>-    suite.addTestSuite( ThemeCssValuesMap_Test.class );
>-    suite.addTestSuite( AbstractThemeAdapter_Test.class );
>-    suite.addTestSuite( AppearancesUtil_Test.class );
>-    suite.addTestSuite( ControlThemeAdapter_Test.class );
>-    suite.addTestSuite( ShellThemeAdapter_Test.class );
>-    suite.addTestSuite( ToolBarThemeAdapter_Test.class );
>-    suite.addTestSuite( StyleSheetBuilder_Test.class );
>-    suite.addTestSuite( ThemeStoreWriter_Test.class );
>-    suite.addTestSuite( ThemePropertyAdapterRegistry_Test.class );
>-
>-    // == SettingStore ==
>-    suite.addTestSuite( MemorySettingStore_Test.class );
>-    suite.addTestSuite( FileSettingStore_Test.class );
>-    suite.addTestSuite( SettingStoreManager_Test.class );
>-
>-    return suite;
>-  }
>-}
>\ No newline at end of file
>#P org.eclipse.rap.rwt.themes.test
>Index: src/org/eclipse/rap/rwt/themes/test/ThemesTestSuite.java
>===================================================================
>RCS file: src/org/eclipse/rap/rwt/themes/test/ThemesTestSuite.java
>diff -N src/org/eclipse/rap/rwt/themes/test/ThemesTestSuite.java
>--- src/org/eclipse/rap/rwt/themes/test/ThemesTestSuite.java	30 May 2011 09:59:21 -0000	1.8
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,32 +0,0 @@
>-/******************************************************************************* 
>-* Copyright (c) 2011 EclipseSource and others. All rights reserved. This
>-* program and the accompanying materials are made available under the terms of
>-* the Eclipse Public License v1.0 which accompanies this distribution, and is
>-* available at http://www.eclipse.org/legal/epl-v10.html
>-*
>-* Contributors:
>-*   EclipseSource - initial API and implementation
>-*******************************************************************************/ 
>-package org.eclipse.rap.rwt.themes.test;
>-
>-import junit.framework.Test;
>-import junit.framework.TestSuite;
>-
>-import org.eclipse.rap.rwt.themes.test.business.BusinessTheme_Test;
>-import org.eclipse.rap.rwt.themes.test.classic.ClassicTheme_Test;
>-import org.eclipse.rap.rwt.themes.test.fancy.FancyTheme_Test;
>-import org.eclipse.rap.rwt.themes.test.rwtdefault.DefaultTheme_Test;
>-
>-
>-public class ThemesTestSuite {
>-  
>-  public static Test suite() {
>-    TestSuite result = new TestSuite( "Tests for RWT Themes" );
>-    result.addTest( new TestSuite( DefaultTheme_Test.class, "Default Theme" ) );
>-    result.addTest( new TestSuite( ClassicTheme_Test.class, "Classic Theme" ) );
>-    result.addTest( new TestSuite( BusinessTheme_Test.class, "Business Theme" ) );
>-    result.addTest( new TestSuite( FancyTheme_Test.class, "Fancy Theme" ) );
>-    return result;
>-  }
>-  
>-}
>#P org.eclipse.rap.ui.forms.test
>Index: src/org/eclipse/ui/forms/AllFormsTests.java
>===================================================================
>RCS file: src/org/eclipse/ui/forms/AllFormsTests.java
>diff -N src/org/eclipse/ui/forms/AllFormsTests.java
>--- src/org/eclipse/ui/forms/AllFormsTests.java	23 Apr 2009 07:39:54 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,34 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2009 EclipseSource and others. All rights reserved.
>- * This program and the accompanying materials are made available under the
>- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
>- * and is available at http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- *   EclipseSource - initial API and implementation
>- ******************************************************************************/
>-package org.eclipse.ui.forms;
>-
>-import junit.framework.Test;
>-import junit.framework.TestSuite;
>-
>-import org.eclipse.ui.forms.internal.widgets.FormsQ07TestSuite;
>-import org.eclipse.ui.forms.widgets.FormsHostTestSuite;
>-
>-public class AllFormsTests extends TestSuite {
>-
>-  /*
>-   * Returns the entire test suite.
>-   */
>-  public static Test suite() {
>-    return new AllFormsTests();
>-  }
>-
>-  /*
>-   * Constructs a new test suite.
>-   */
>-  public AllFormsTests() {
>-    addTest( FormsHostTestSuite.suite() );
>-    addTest( FormsQ07TestSuite.suite() );
>-  }
>-}
>Index: src/org/eclipse/ui/forms/internal/widgets/FormsQ07TestSuite.java
>===================================================================
>RCS file: src/org/eclipse/ui/forms/internal/widgets/FormsQ07TestSuite.java
>diff -N src/org/eclipse/ui/forms/internal/widgets/FormsQ07TestSuite.java
>--- src/org/eclipse/ui/forms/internal/widgets/FormsQ07TestSuite.java	23 Apr 2009 07:39:54 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,34 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2009 EclipseSource and others. All rights reserved.
>- * This program and the accompanying materials are made available under the
>- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
>- * and is available at http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- *   EclipseSource - initial API and implementation
>- ******************************************************************************/
>-package org.eclipse.ui.forms.internal.widgets;
>-
>-import org.eclipse.ui.forms.internal.widgets.formtextkit.FormTextLCA_Test;
>-import org.eclipse.ui.forms.internal.widgets.hyperlinkkit.HyperlinkLCA_Test;
>-import org.eclipse.ui.forms.internal.widgets.imagehyperlinkkit.ImageHyperlinkLCA_Test;
>-import org.eclipse.ui.forms.internal.widgets.togglehyperlinkkit.ToggleHyperlinkLCA_Test;
>-
>-import junit.framework.Test;
>-import junit.framework.TestSuite;
>-
>-public class FormsQ07TestSuite {
>-
>-  public static Test suite() {
>-	TestSuite suite
>-	  = new TestSuite( "Tests for org.eclipse.ui.forms.internal.widgets" );
>-	//$JUnit-BEGIN$
>-	suite.addTestSuite( HyperlinkLCA_Test.class );
>-	suite.addTestSuite( ImageHyperlinkLCA_Test.class );
>-	suite.addTestSuite( ToggleHyperlinkLCA_Test.class );
>-	suite.addTestSuite( FormTextLCA_Test.class );
>-	//$JUnit-END$
>-	return suite;
>-  }
>-
>-}
>Index: src/org/eclipse/ui/forms/widgets/FormsHostTestSuite.java
>===================================================================
>RCS file: src/org/eclipse/ui/forms/widgets/FormsHostTestSuite.java
>diff -N src/org/eclipse/ui/forms/widgets/FormsHostTestSuite.java
>--- src/org/eclipse/ui/forms/widgets/FormsHostTestSuite.java	23 Apr 2009 07:39:54 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,29 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2009 EclipseSource and others. All rights reserved.
>- * This program and the accompanying materials are made available under the
>- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
>- * and is available at http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- *   EclipseSource - initial API and implementation
>- ******************************************************************************/
>-package org.eclipse.ui.forms.widgets;
>-
>-import junit.framework.Test;
>-import junit.framework.TestSuite;
>-
>-public class FormsHostTestSuite {
>-
>-  public static Test suite() {
>-	TestSuite suite
>-	  = new TestSuite( "Tests for org.eclipse.ui.forms.widgets" );
>-	//$JUnit-BEGIN$
>-	suite.addTestSuite( FormText_Test.class );
>-	suite.addTestSuite( Hyperlink_Test.class );
>-	suite.addTestSuite( ImageHyperlink_Test.class );
>-	suite.addTestSuite( ToggleHyperlink_Test.class );
>-	//$JUnit-END$
>-	return suite;
>-  }
>-
>-}
>#P org.eclipse.rwt.test.all
>Index: .classpath
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rwt.test.all/.classpath,v
>retrieving revision 1.7
>diff -u -r1.7 .classpath
>--- .classpath	31 May 2011 10:50:00 -0000	1.7
>+++ .classpath	3 Jun 2011 08:37:20 -0000
>@@ -6,5 +6,7 @@
> 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.rap.rwt.q07.test"/>
> 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.rap.rwt.test"/>
> 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.rap.rwt.themes.test"/>
>+	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.rwt.widgets.styledtext.test"/>
>+	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.rap.ui.forms.test"/>
> 	<classpathentry kind="output" path="bin"/>
> </classpath>
>Index: src/org/eclipse/rwt/test/RWTAllTestSuite.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rwt.test.all/src/org/eclipse/rwt/test/RWTAllTestSuite.java,v
>retrieving revision 1.5
>diff -u -r1.5 RWTAllTestSuite.java
>--- src/org/eclipse/rwt/test/RWTAllTestSuite.java	7 Feb 2011 11:10:04 -0000	1.5
>+++ src/org/eclipse/rwt/test/RWTAllTestSuite.java	3 Jun 2011 08:37:20 -0000
>@@ -10,23 +10,127 @@
> *******************************************************************************/
> package org.eclipse.rwt.test;
> 
>+import java.io.*;
>+import java.net.URL;
>+import java.net.URLClassLoader;
>+import java.util.jar.JarEntry;
>+import java.util.jar.JarInputStream;
>+
> import junit.framework.Test;
> import junit.framework.TestSuite;
> 
>-import org.eclipse.RWTHostTestSuite;
>-import org.eclipse.RWTQ07TestSuite;
>-import org.eclipse.rap.rwt.themes.test.ThemesTestSuite;
>-
> 
> public class RWTAllTestSuite {
>+  private static final String JAR_EXTENSION = ".jar";
>+  private static final String CLASS_EXTENSION = ".class";
> 
>   public static Test suite() {
>-    TestSuite suite = new TestSuite( "Test for all RWT Tests" );
>-    // $JUnit-BEGIN$
>-    suite.addTest( RWTHostTestSuite.suite() );
>-    suite.addTest( RWTQ07TestSuite.suite() );
>-    suite.addTest( ThemesTestSuite.suite() );
>-    // $JUnit-END$
>+    return new RWTAllTestSuite().createSuite();
>+  }
>+  
>+  private final TestSuite suite;
>+  private final URLClassLoader classLoader;
>+
>+  RWTAllTestSuite() {
>+    suite = new TestSuite( "RWT Test Suite" );
>+    classLoader = ( URLClassLoader )getClass().getClassLoader();
>+  }
>+  
>+  Test createSuite() {
>+    try {
>+      scanClasspath();
>+    } catch( IOException ioe ) {
>+      throw new RuntimeException( ioe );
>+    }
>     return suite;
>   }
>+
>+  private void scanClasspath() throws IOException {
>+    URL[] urls = classLoader.getURLs();
>+    for( int i = 0; i < urls.length; i++ ) {
>+      File file = new File( urls[ i ].getFile() );
>+      if( file.exists() ) {
>+        if( file.getName().endsWith( JAR_EXTENSION ) ) {
>+          scanJar( file );
>+        } else {
>+          scanDirectory( file, "", file.getPath() );
>+        }
>+      }  
>+    }
>+  }
>+
>+  private void scanJar( File file ) throws IOException {
>+    JarInputStream inputStream = new JarInputStream( new FileInputStream( file ), false );
>+    JarEntry jarEntry = inputStream.getNextJarEntry();
>+    while( jarEntry != null ) {
>+      if( isClassEntry( jarEntry ) ) {
>+        String className = toClassName( jarEntry );
>+        addToSuite( className );
>+      }
>+      jarEntry = inputStream.getNextJarEntry();
>+    }
>+    inputStream.close();
>+  }
>+
>+  private void scanDirectory( File file, String initialPackagePath, String rootDirectory ) {
>+    if( file.isDirectory() ) {
>+      String packagePath = computePackagePath( file, initialPackagePath, rootDirectory );
>+      String[] files = file.list();
>+      for( int i = 0; i < files.length; i++ ) {
>+        File directory = new File( file, files[ i ] );
>+        scanDirectory( directory, packagePath, rootDirectory );
>+      }
>+    } else if( isClassFile( file ) ) {
>+      String className = toClassName( file, initialPackagePath );
>+      addToSuite( className );
>+    }
>+  }
>+
>+  private static String computePackagePath( File file, String initialPackagePath, String rootDir ) {
>+    String result;
>+    if( file.getPath().equals( rootDir ) ) {
>+      result = "";
>+    } else if( initialPackagePath.length() == 0 ) {
>+      result = file.getName();
>+    } else {
>+      result = initialPackagePath + "." + file.getName();
>+    }
>+    return result;
>+  }
>+
>+  private void addToSuite( String className ) {
>+    if( className.endsWith( "_Test" ) ) {
>+      try {
>+        suite.addTestSuite( classLoader.loadClass( className ) );
>+      } catch( ClassNotFoundException cnfe ) {
>+        throw new RuntimeException( cnfe );
>+      }
>+    }
>+  }
>+
>+  private static String toClassName( JarEntry jarEntry ) {
>+    String result = removeClassExtension( jarEntry.getName() );
>+    result = result.replace( '/', '.' );
>+    return result;
>+  }
>+
>+  private static String toClassName( File file, String packageName ) {
>+    String result = removeClassExtension( file.getName() );
>+    if( packageName.length() > 0 ) {
>+      result = packageName + "." + result;
>+    } 
>+    return result;
>+  }
>+
>+  private static String removeClassExtension( String name ) {
>+    return name.substring( 0, name.lastIndexOf( CLASS_EXTENSION ) );
>+  }
>+
>+  private static boolean isClassEntry( JarEntry jarEntry ) {
>+    return ( !jarEntry.isDirectory() ) && jarEntry.getName().endsWith( CLASS_EXTENSION );
>+  }
>+
>+  private static boolean isClassFile( File file ) {
>+    return file.isFile() && file.getName().endsWith( CLASS_EXTENSION );
>+  }
> }

Actions: View | Diff

Attachments on bug 347446: 196853 | 197293