diff options
Diffstat (limited to 'tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Widget.java')
-rw-r--r-- | tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Widget.java | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Widget.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Widget.java index 53346acdab..4ad2b35a9b 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Widget.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Widget.java @@ -177,55 +177,55 @@ protected void setWidget(Widget w) { } protected void hookListeners(Widget w, int[] types, Listener listener) { - for (int i = 0; i < types.length; i++) { - w.addListener(types[i], listener); - } + for (int i = 0; i < types.length; i++) { + w.addListener(types[i], listener); + } } protected String[] hookExpectedEvents(String type, final java.util.List<String> events) { - return hookExpectedEvents(widget, type, events); + return hookExpectedEvents(widget, type, events); } protected String[] hookExpectedEvents(Widget w, String type, final java.util.List<String> events) { - String[] expectedEvents = ConsistencyUtility.eventOrdering.get(type); - hookExpectedEvents(w, expectedEvents, events); - return expectedEvents; + String[] expectedEvents = ConsistencyUtility.eventOrdering.get(type); + hookExpectedEvents(w, expectedEvents, events); + return expectedEvents; } protected void hookExpectedEvents(Widget w, String[] types, final java.util.List<String> events) { - hookListeners(w, ConsistencyUtility.convertEventNames(types), - e -> { - String temp = ConsistencyUtility.eventNames[e.type]; - if(e.type == SWT.Traverse) - temp += ":"+ConsistencyUtility.getTraversalType(e.detail); - else if(e.type == SWT.Selection) - temp += ":"+ConsistencyUtility.getSelectionType(e.detail); - events.add(temp); - System.out.println(temp + e.widget); + hookListeners(w, ConsistencyUtility.convertEventNames(types), + e -> { + String temp = ConsistencyUtility.eventNames[e.type]; + if(e.type == SWT.Traverse) + temp += ":"+ConsistencyUtility.getTraversalType(e.detail); + else if(e.type == SWT.Selection) + temp += ":"+ConsistencyUtility.getSelectionType(e.detail); + events.add(temp); + System.out.println(temp + e.widget); }); } protected String getTestName() { - String test = name.getMethodName(); - int index = test.lastIndexOf('_'); - if(index != -1) - test = test.substring(index+1, test.length()); - String clss = getClassName(); - if((!test.equals("MenuDetect") || clss.equals("Table") || test.startsWith("Chevron")) && - (!test.equals("DragDetect") || clss.equals("Tree") || test.startsWith("Chevron")) && - (!test.equals("DoubleClick") || clss.equals("List")) && - (!test.equals("KeySelection") || clss.equals("Slider") || clss.equals("Combo") || clss.equals("CCombo") || clss.equals("CTabFolder")) && - (!test.equals("EnterSelection") || clss.equals("Button") || clss.equals("ToolBar") || clss.equals("CCombo") || clss.equals("ExpandBar"))) - test = clss + test; - return test; + String test = name.getMethodName(); + int index = test.lastIndexOf('_'); + if(index != -1) + test = test.substring(index+1, test.length()); + String clss = getClassName(); + if((!test.equals("MenuDetect") || clss.equals("Table") || test.startsWith("Chevron")) && + (!test.equals("DragDetect") || clss.equals("Tree") || test.startsWith("Chevron")) && + (!test.equals("DoubleClick") || clss.equals("List")) && + (!test.equals("KeySelection") || clss.equals("Slider") || clss.equals("Combo") || clss.equals("CCombo") || clss.equals("CTabFolder")) && + (!test.equals("EnterSelection") || clss.equals("Button") || clss.equals("ToolBar") || clss.equals("CCombo") || clss.equals("ExpandBar"))) + test = clss + test; + return test; } protected String getClassName() { - String clazz = getClass().getName(); - int index = clazz.lastIndexOf('_'); - if(index != -1) - clazz = clazz.substring(index+1, clazz.length()); - return clazz; + String clazz = getClass().getName(); + int index = clazz.lastIndexOf('_'); + if(index != -1) + clazz = clazz.substring(index+1, clazz.length()); + return clazz; } protected void processEvents(int timeoutMs, BooleanSupplier condition) throws InterruptedException { |