Adjust tests to changes in testfixture (Operation)
As of change 26193, RAP testfixture uses the new Operation types from
RWT.
See https://git.eclipse.org/r/#/c/26193/
diff --git a/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumngroupkit/GridColumnGroupLCA_Test.java b/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumngroupkit/GridColumnGroupLCA_Test.java
index 628435c..66f4501 100644
--- a/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumngroupkit/GridColumnGroupLCA_Test.java
+++ b/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumngroupkit/GridColumnGroupLCA_Test.java
@@ -13,30 +13,28 @@
import static org.eclipse.nebula.widgets.grid.GridTestUtil.createGridColumns;
import static org.eclipse.nebula.widgets.grid.GridTestUtil.loadImage;
import static org.eclipse.rap.rwt.internal.lifecycle.WidgetUtil.getId;
+import static org.eclipse.rap.rwt.testfixture.TestMessage.getParent;
+import static org.eclipse.rap.rwt.testfixture.TestMessage.getStyles;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
import org.eclipse.nebula.widgets.grid.Grid;
import org.eclipse.nebula.widgets.grid.GridColumnGroup;
-import org.eclipse.nebula.widgets.grid.internal.gridcolumngroupkit.GridColumnGroupLCA;
-import org.eclipse.nebula.widgets.grid.internal.gridcolumngroupkit.GridColumnGroupOperationHandler;
import org.eclipse.rap.json.JsonArray;
import org.eclipse.rap.json.JsonObject;
import org.eclipse.rap.json.JsonValue;
import org.eclipse.rap.rwt.RWT;
-import org.eclipse.rap.rwt.internal.remote.RemoteObjectRegistry;
import org.eclipse.rap.rwt.internal.lifecycle.WidgetUtil;
+import org.eclipse.rap.rwt.internal.protocol.Operation;
+import org.eclipse.rap.rwt.internal.protocol.Operation.CreateOperation;
+import org.eclipse.rap.rwt.internal.protocol.Operation.DestroyOperation;
+import org.eclipse.rap.rwt.internal.remote.RemoteObjectRegistry;
import org.eclipse.rap.rwt.remote.OperationHandler;
import org.eclipse.rap.rwt.testfixture.Fixture;
import org.eclipse.rap.rwt.testfixture.TestMessage;
-import org.eclipse.rap.rwt.testfixture.TestMessage.CreateOperation;
-import org.eclipse.rap.rwt.testfixture.TestMessage.DestroyOperation;
-import org.eclipse.rap.rwt.testfixture.TestMessage.Operation;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
@@ -90,8 +88,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( group );
- List<Object> styles = Arrays.asList( operation.getStyles() );
- assertTrue( styles.contains( "TOGGLE" ) );
+ assertTrue( getStyles( operation ).contains( "TOGGLE" ) );
}
@Test
@@ -110,7 +107,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( group );
- assertEquals( WidgetUtil.getId( group.getParent() ), operation.getParent() );
+ assertEquals( WidgetUtil.getId( group.getParent() ), getParent( operation ) );
}
@Test
@@ -129,7 +126,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( group );
- assertTrue( operation.getPropertyNames().indexOf( "text" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "text" ) == -1 );
}
@Test
@@ -211,7 +208,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( group );
- assertTrue( operation.getPropertyNames().indexOf( "font" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "font" ) == -1 );
}
@Test
@@ -243,7 +240,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( group );
- assertTrue( operation.getPropertyNames().indexOf( "expanded" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "expanded" ) == -1 );
}
@Test
@@ -274,7 +271,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( group );
- assertTrue( operation.getPropertyNames().indexOf( "left" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "left" ) == -1 );
}
@Test
@@ -312,7 +309,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( group );
- assertTrue( operation.getPropertyNames().indexOf( "width" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "width" ) == -1 );
}
@Test
@@ -344,7 +341,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( group );
- assertTrue( operation.getPropertyNames().indexOf( "height" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "height" ) == -1 );
}
@Test
@@ -380,7 +377,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( group );
- assertTrue( operation.getPropertyNames().indexOf( "visibility" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "visibility" ) == -1 );
}
@Test
@@ -414,7 +411,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( group );
- assertTrue( operation.getPropertyNames().indexOf( "customVariant" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "customVariant" ) == -1 );
}
@Test
diff --git a/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumnkit/GridColumnLCA_Test.java b/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumnkit/GridColumnLCA_Test.java
index c38d541..c4badf1 100644
--- a/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumnkit/GridColumnLCA_Test.java
+++ b/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumnkit/GridColumnLCA_Test.java
@@ -14,6 +14,7 @@
import static org.eclipse.nebula.widgets.grid.GridTestUtil.loadImage;
import static org.eclipse.rap.rwt.internal.lifecycle.WidgetUtil.getId;
import static org.eclipse.rap.rwt.testfixture.Fixture.getProtocolMessage;
+import static org.eclipse.rap.rwt.testfixture.TestMessage.getParent;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@@ -31,14 +32,14 @@
import org.eclipse.rap.json.JsonObject;
import org.eclipse.rap.json.JsonValue;
import org.eclipse.rap.rwt.RWT;
-import org.eclipse.rap.rwt.internal.remote.RemoteObjectRegistry;
import org.eclipse.rap.rwt.internal.lifecycle.WidgetUtil;
+import org.eclipse.rap.rwt.internal.protocol.Operation;
+import org.eclipse.rap.rwt.internal.protocol.Operation.CreateOperation;
+import org.eclipse.rap.rwt.internal.protocol.Operation.DestroyOperation;
+import org.eclipse.rap.rwt.internal.remote.RemoteObjectRegistry;
import org.eclipse.rap.rwt.remote.OperationHandler;
import org.eclipse.rap.rwt.testfixture.Fixture;
import org.eclipse.rap.rwt.testfixture.TestMessage;
-import org.eclipse.rap.rwt.testfixture.TestMessage.CreateOperation;
-import org.eclipse.rap.rwt.testfixture.TestMessage.DestroyOperation;
-import org.eclipse.rap.rwt.testfixture.TestMessage.Operation;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionListener;
@@ -86,7 +87,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( column );
assertEquals( "rwt.widgets.GridColumn", operation.getType() );
- assertFalse( operation.getPropertyNames().contains( "group" ) );
+ assertFalse( operation.getProperties().names().contains( "group" ) );
}
@Test
@@ -97,7 +98,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( column );
- assertTrue( operation.getPropertyNames().indexOf( "style" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "style" ) == -1 );
assertEquals( "right", message.findCreateProperty( column, "alignment" ).asString() );
}
@@ -117,7 +118,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( column );
- assertEquals( WidgetUtil.getId( column.getParent() ), operation.getParent() );
+ assertEquals( WidgetUtil.getId( column.getParent() ), getParent( operation ) );
}
@Test
@@ -129,7 +130,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( column );
- assertEquals( getId( group ), operation.getProperty( "group" ).asString() );
+ assertEquals( getId( group ), operation.getProperties().get( "group" ).asString() );
}
@Test
@@ -169,7 +170,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( column );
- assertTrue( operation.getPropertyNames().indexOf( "toolTip" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "toolTip" ) == -1 );
}
@Test
@@ -200,7 +201,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( column );
- assertTrue( operation.getPropertyNames().indexOf( "customVariant" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "customVariant" ) == -1 );
}
@Test
@@ -231,7 +232,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( column );
- assertTrue( operation.getPropertyNames().indexOf( "text" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "text" ) == -1 );
}
@Test
@@ -343,7 +344,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( column );
- assertTrue( operation.getPropertyNames().indexOf( "left" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "left" ) == -1 );
}
@Test
@@ -406,7 +407,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( column );
- assertTrue( operation.getPropertyNames().indexOf( "alignment" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "alignment" ) == -1 );
}
@Test
@@ -437,7 +438,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( column );
- assertTrue( operation.getPropertyNames().indexOf( "resizable" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "resizable" ) == -1 );
}
@Test
@@ -468,7 +469,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( column );
- assertTrue( operation.getPropertyNames().indexOf( "moveable" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "moveable" ) == -1 );
}
@Test
@@ -499,7 +500,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( column );
- assertTrue( operation.getPropertyNames().indexOf( "visibility" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "visibility" ) == -1 );
}
@Test
@@ -530,7 +531,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( column );
- assertTrue( operation.getPropertyNames().indexOf( "check" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "check" ) == -1 );
}
@Test
@@ -661,7 +662,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( column );
- assertTrue( operation.getPropertyNames().indexOf( "font" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "font" ) == -1 );
}
@Test
@@ -693,7 +694,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( column );
- assertTrue( operation.getPropertyNames().indexOf( "footerFont" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "footerFont" ) == -1 );
}
@Test
@@ -725,7 +726,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( column );
- assertTrue( operation.getPropertyNames().indexOf( "footerText" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "footerText" ) == -1 );
}
@Test
diff --git a/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/griditemkit/GridItemLCA_Test.java b/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/griditemkit/GridItemLCA_Test.java
index 53e846b..075f395 100644
--- a/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/griditemkit/GridItemLCA_Test.java
+++ b/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/griditemkit/GridItemLCA_Test.java
@@ -13,8 +13,9 @@
import static org.eclipse.nebula.widgets.grid.GridTestUtil.createGridColumns;
import static org.eclipse.nebula.widgets.grid.GridTestUtil.createGridItems;
import static org.eclipse.nebula.widgets.grid.GridTestUtil.loadImage;
-import static org.eclipse.rap.rwt.internal.protocol.RemoteObjectFactory.getRemoteObject;
import static org.eclipse.rap.rwt.internal.lifecycle.WidgetUtil.getId;
+import static org.eclipse.rap.rwt.internal.protocol.RemoteObjectFactory.getRemoteObject;
+import static org.eclipse.rap.rwt.testfixture.TestMessage.getParent;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -28,14 +29,14 @@
import org.eclipse.rap.json.JsonObject;
import org.eclipse.rap.json.JsonValue;
import org.eclipse.rap.rwt.RWT;
+import org.eclipse.rap.rwt.internal.lifecycle.WidgetUtil;
+import org.eclipse.rap.rwt.internal.protocol.Operation.CreateOperation;
+import org.eclipse.rap.rwt.internal.protocol.Operation.DestroyOperation;
import org.eclipse.rap.rwt.internal.remote.RemoteObjectImpl;
import org.eclipse.rap.rwt.internal.remote.RemoteObjectRegistry;
-import org.eclipse.rap.rwt.internal.lifecycle.WidgetUtil;
import org.eclipse.rap.rwt.remote.OperationHandler;
import org.eclipse.rap.rwt.testfixture.Fixture;
import org.eclipse.rap.rwt.testfixture.TestMessage;
-import org.eclipse.rap.rwt.testfixture.TestMessage.CreateOperation;
-import org.eclipse.rap.rwt.testfixture.TestMessage.DestroyOperation;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
@@ -80,7 +81,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( items[ 8 ] );
assertEquals( "rwt.widgets.GridItem", operation.getType() );
- assertEquals( 3, operation.getProperty( "index" ).asInt() );
+ assertEquals( 3, operation.getProperties().get( "index" ).asInt() );
}
@Test
@@ -92,7 +93,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( items[ 10 ] );
assertEquals( "rwt.widgets.GridItem", operation.getType() );
- assertEquals( 1, operation.getProperty( "index" ).asInt() );
+ assertEquals( 1, operation.getProperties().get( "index" ).asInt() );
}
@Test
@@ -111,7 +112,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( item );
- assertEquals( WidgetUtil.getId( item.getParent() ), operation.getParent() );
+ assertEquals( WidgetUtil.getId( item.getParent() ), getParent( operation ) );
}
@Test
@@ -122,7 +123,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( subitem );
- assertEquals( WidgetUtil.getId( item ), operation.getParent() );
+ assertEquals( WidgetUtil.getId( item ), getParent( operation ) );
}
@Test
@@ -172,7 +173,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( item );
- assertTrue( operation.getPropertyNames().indexOf( "customVariant" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "customVariant" ) == -1 );
}
@Test
@@ -203,7 +204,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( item );
- assertTrue( operation.getPropertyNames().indexOf( "itemCount" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "itemCount" ) == -1 );
}
@Test
@@ -234,7 +235,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( item );
- assertTrue( operation.getPropertyNames().indexOf( "height" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "height" ) == -1 );
}
@Test
@@ -268,7 +269,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( item );
- assertTrue( operation.getPropertyNames().indexOf( "texts" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "texts" ) == -1 );
}
@Test
@@ -307,7 +308,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( item );
- assertTrue( operation.getPropertyNames().indexOf( "images" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "images" ) == -1 );
}
@Test
@@ -345,7 +346,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( item );
- assertTrue( operation.getPropertyNames().indexOf( "background" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "background" ) == -1 );
}
@Test
@@ -377,7 +378,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( item );
- assertTrue( operation.getPropertyNames().indexOf( "foreground" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "foreground" ) == -1 );
}
@Test
@@ -409,7 +410,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( item );
- assertTrue( operation.getPropertyNames().indexOf( "font" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "font" ) == -1 );
}
@Test
@@ -443,7 +444,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( item );
- assertTrue( operation.getPropertyNames().indexOf( "cellBackgrounds" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "cellBackgrounds" ) == -1 );
}
@Test
@@ -480,7 +481,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( item );
- assertTrue( operation.getPropertyNames().indexOf( "cellForegrounds" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "cellForegrounds" ) == -1 );
}
@Test
@@ -517,7 +518,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( item );
- assertTrue( operation.getPropertyNames().indexOf( "cellFonts" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "cellFonts" ) == -1 );
}
@Test
@@ -552,7 +553,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( item );
- assertTrue( operation.getPropertyNames().indexOf( "expanded" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "expanded" ) == -1 );
}
@Test
@@ -590,7 +591,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( item );
- assertTrue( operation.getPropertyNames().indexOf( "cellChecked" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "cellChecked" ) == -1 );
}
@Test
@@ -633,7 +634,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( item );
- assertTrue( operation.getPropertyNames().indexOf( "cellGrayed" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "cellGrayed" ) == -1 );
}
@Test
@@ -676,7 +677,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( item );
- assertTrue( operation.getPropertyNames().indexOf( "cellCheckable" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "cellCheckable" ) == -1 );
}
@Test
diff --git a/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridkit/GridLCA_Test.java b/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridkit/GridLCA_Test.java
index 6028488..f3ec7e3 100644
--- a/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridkit/GridLCA_Test.java
+++ b/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridkit/GridLCA_Test.java
@@ -13,8 +13,10 @@
import static org.eclipse.nebula.widgets.grid.GridTestUtil.createGridColumns;
import static org.eclipse.nebula.widgets.grid.GridTestUtil.createGridItems;
import static org.eclipse.nebula.widgets.grid.GridTestUtil.loadImage;
-import static org.eclipse.rap.rwt.internal.protocol.RemoteObjectFactory.getRemoteObject;
import static org.eclipse.rap.rwt.internal.lifecycle.WidgetUtil.getId;
+import static org.eclipse.rap.rwt.internal.protocol.RemoteObjectFactory.getRemoteObject;
+import static org.eclipse.rap.rwt.testfixture.TestMessage.getParent;
+import static org.eclipse.rap.rwt.testfixture.TestMessage.getStyles;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -24,7 +26,6 @@
import static org.mockito.Mockito.verify;
import java.io.IOException;
-import java.util.Arrays;
import java.util.List;
import org.eclipse.nebula.widgets.grid.Grid;
@@ -36,14 +37,14 @@
import org.eclipse.rap.json.JsonObject;
import org.eclipse.rap.json.JsonValue;
import org.eclipse.rap.rwt.RWT;
-import org.eclipse.rap.rwt.internal.remote.RemoteObjectRegistry;
import org.eclipse.rap.rwt.internal.lifecycle.WidgetUtil;
+import org.eclipse.rap.rwt.internal.protocol.Operation;
+import org.eclipse.rap.rwt.internal.protocol.Operation.CreateOperation;
+import org.eclipse.rap.rwt.internal.protocol.Operation.DestroyOperation;
+import org.eclipse.rap.rwt.internal.remote.RemoteObjectRegistry;
import org.eclipse.rap.rwt.remote.OperationHandler;
import org.eclipse.rap.rwt.testfixture.Fixture;
import org.eclipse.rap.rwt.testfixture.TestMessage;
-import org.eclipse.rap.rwt.testfixture.TestMessage.CreateOperation;
-import org.eclipse.rap.rwt.testfixture.TestMessage.DestroyOperation;
-import org.eclipse.rap.rwt.testfixture.TestMessage.Operation;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionListener;
@@ -89,12 +90,11 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( grid );
- List<Object> styles = Arrays.asList( operation.getStyles() );
assertEquals( "rwt.widgets.Grid", operation.getType() );
- assertEquals( "tree", operation.getProperty( "appearance" ).asString() );
- assertEquals( 16, operation.getProperty( "indentionWidth" ).asInt() );
- assertFalse( operation.getPropertyNames().contains( "checkBoxMetrics" ) );
- assertTrue( styles.contains( "FULL_SELECTION" ) );
+ assertEquals( "tree", operation.getProperties().get( "appearance" ).asString() );
+ assertEquals( 16, operation.getProperties().get( "indentionWidth" ).asInt() );
+ assertFalse( operation.getProperties().names().contains( "checkBoxMetrics" ) );
+ assertTrue( getStyles( operation ).contains( "FULL_SELECTION" ) );
}
@Test
@@ -103,7 +103,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( grid );
- assertEquals( getId( grid.getParent() ), operation.getParent() );
+ assertEquals( getId( grid.getParent() ), getParent( operation ) );
}
@Test
@@ -114,7 +114,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( grid );
- List<Object> styles = Arrays.asList( operation.getStyles() );
+ List<String> styles = getStyles( operation );
assertTrue( styles.contains( "VIRTUAL" ) );
assertTrue( styles.contains( "MULTI" ) );
assertEquals( JsonValue.TRUE, message.findListenProperty( grid, "SetData" ) );
@@ -157,7 +157,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( grid );
- assertTrue( operation.getPropertyNames().indexOf( "itemCount" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "itemCount" ) == -1 );
}
@Test
@@ -269,7 +269,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( grid );
- assertTrue( operation.getPropertyNames().indexOf( "columnCount" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "columnCount" ) == -1 );
}
@Test
@@ -302,7 +302,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( grid );
- assertTrue( operation.getPropertyNames().indexOf( "treeColumn" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "treeColumn" ) == -1 );
}
@Test
@@ -338,7 +338,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( grid );
- assertTrue( operation.getPropertyNames().indexOf( "headerHeight" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "headerHeight" ) == -1 );
}
@Test
@@ -372,7 +372,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( grid );
- assertTrue( operation.getPropertyNames().indexOf( "headerVisible" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "headerVisible" ) == -1 );
}
@Test
@@ -405,7 +405,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( grid );
- assertTrue( operation.getPropertyNames().indexOf( "footerHeight" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "footerHeight" ) == -1 );
}
@Test
@@ -439,7 +439,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( grid );
- assertTrue( operation.getPropertyNames().indexOf( "footerVisible" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "footerVisible" ) == -1 );
}
@Test
@@ -503,7 +503,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( grid );
- assertTrue( operation.getPropertyNames().indexOf( "topItemIndex" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "topItemIndex" ) == -1 );
}
@Test
@@ -540,7 +540,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( grid );
- assertTrue( operation.getPropertyNames().indexOf( "focusItem" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "focusItem" ) == -1 );
}
@Test
@@ -575,7 +575,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( grid );
- assertTrue( operation.getPropertyNames().indexOf( "scrollLeft" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "scrollLeft" ) == -1 );
}
@Test
@@ -608,7 +608,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( grid );
- assertTrue( operation.getPropertyNames().indexOf( "selection" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "selection" ) == -1 );
}
@Test
@@ -645,7 +645,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( grid );
- assertTrue( operation.getPropertyNames().indexOf( "sortDirection" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "sortDirection" ) == -1 );
}
@Test
@@ -679,7 +679,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( grid );
- assertTrue( operation.getPropertyNames().indexOf( "sortColumn" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "sortColumn" ) == -1 );
}
@Test
@@ -913,7 +913,7 @@
TestMessage message = Fixture.getProtocolMessage();
CreateOperation operation = message.findCreateOperation( grid );
- assertTrue( operation.getPropertyNames().indexOf( "enableCellToolTip" ) == -1 );
+ assertTrue( operation.getProperties().names().indexOf( "enableCellToolTip" ) == -1 );
}
@Test
