Replace custom array equals assertion methods with standard ones

Author: HeikoKlare

tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ComboScenarios.java

@@ -15,6 +15,7 @@
  *******************************************************************************/
 package org.eclipse.jface.tests.databinding.scenarios;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
 import java.lang.reflect.InvocationTargetException;

tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ComboViewerScenario.java

@@ -16,13 +16,14 @@
  *******************************************************************************/
 package org.eclipse.jface.tests.databinding.scenarios;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
 import org.eclipse.core.databinding.beans.typed.BeanProperties;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
 import org.eclipse.jface.databinding.viewers.ViewerSupport;
+import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
 import org.eclipse.jface.examples.databinding.model.Adventure;
 import org.eclipse.jface.examples.databinding.model.Catalog;
 import org.eclipse.jface.examples.databinding.model.Lodging;

tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ListViewerScenario.java

@@ -15,6 +15,7 @@
  *******************************************************************************/
 package org.eclipse.jface.tests.databinding.scenarios;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
 import org.eclipse.core.databinding.beans.typed.BeanProperties;

tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/MasterDetailScenarios.java

@@ -15,6 +15,7 @@
  *******************************************************************************/
 package org.eclipse.jface.tests.databinding.scenarios;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;

tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ScenariosTestCase.java

@@ -14,10 +14,6 @@
  *******************************************************************************/
 package org.eclipse.jface.tests.databinding.scenarios;
 
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.observable.Realm;
 import org.eclipse.jface.databinding.conformance.util.RealmTester;
@@ -151,8 +147,4 @@ protected void enterText(Text text, String string) {
 		text.notifyListeners(SWT.FocusOut, null);
 	}
 
-	protected void assertArrayEquals(Object[] expected, Object[] actual) {
-		assertEquals(Arrays.asList(expected), Arrays.asList(actual));
-	}
-
 }

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/AbstractTreeViewerTest.java

@@ -13,6 +13,7 @@
  *******************************************************************************/
 package org.eclipse.jface.tests.viewers;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -35,15 +36,6 @@ public abstract class AbstractTreeViewerTest extends StructuredItemViewerTest {
 
 	AbstractTreeViewer fTreeViewer;
 
-	protected void assertEqualsArray(String s, Object[] a1, Object[] a2) {
-		int s1 = a1.length;
-		int s2 = a2.length;
-		assertEquals(s, s1, s2);
-		for (int i = 0; i < s1; i++) {
-			assertEquals(s, a1[i], a2[i]);
-		}
-	}
-
 	@Override
 	protected void assertSelectionEquals(String message, TestElement expected) {
 		IStructuredSelection selection = fViewer.getStructuredSelection();
@@ -79,7 +71,7 @@ public void testBulkExpand() {
 
 		Object[] list2 = fTreeViewer.getExpandedElements();
 
-		assertEqualsArray("old and new expand state are the same", list1, list2);
+		assertArrayEquals("old and new expand state are the same", list1, list2);
 	}
 
 	@Test

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/MultipleEqualElementsTreeViewerTest.java

@@ -13,6 +13,7 @@
  *******************************************************************************/
 package org.eclipse.jface.tests.viewers;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -148,13 +149,13 @@ public void testSelection() {
 	@Test
 	public void testExpansion() {
 		getTreeViewer().expandToLevel(treePath_1_21_212, 1);
-		assertEqualsArray("element expansion", new Object[] { element_1, element_2_1 },
+		assertArrayEquals("element expansion", new Object[] { element_1, element_2_1 },
 				getTreeViewer().getExpandedElements());
-		assertEqualsArray("path expansion", new Object[] { treePath_1, treePath_1_21 },
+		assertArrayEquals("path expansion", new Object[] { treePath_1, treePath_1_21 },
 				getTreeViewer().getExpandedTreePaths());
 		getTreeViewer().setExpandedTreePaths(
 				new TreePath[] { treePath_1, treePath_1_2, treePath_1_2_21, treePath_2, treePath_2_21 });
-		assertEqualsArray("path expansion",
+		assertArrayEquals("path expansion",
 				new Object[] { treePath_1, treePath_1_2, treePath_1_2_21, treePath_2, treePath_2_21 },
 				getTreeViewer().getExpandedTreePaths());
 	}