Skip to content

Commit

Permalink
Get rid of ArrayUtil.equals(Object[], Object[])
Browse files Browse the repository at this point in the history 
Use JUnit's assertArrayEquals or JVM's Arrays.equals instead.
  • Loading branch information
@akurtakov
akurtakov committed Oct 29, 2024
1 parent ec2d9bd commit 4fbbe1b
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 72 deletions.
19 changes: 1 addition & 18 deletions tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/ArrayUtil.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2014 IBM Corporation and others.
* Copyright (c) 2000, 2024 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -71,21 +71,4 @@ public static boolean contains(Object[] array, Object element) {
return false;
}

/**
* Returns whether two arrays are equal. They must
* have the same size and the same contents.
*
* @param one the first array
* @param two the second array
* @return <code>true</code> if the array are equal,
* <code>false</code> otherwise.
*/
public static boolean equals(Object[] one, Object[] two) {
if (one.length != two.length)
return false;
for (int i = 0; i < one.length; i++)
if (one[i] != two[i])
return false;
return true;
}
}
7 changes: 2 additions & 5 deletions ....eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IAggregateWorkingSetTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2017 IBM Corporation and others.
* Copyright (c) 2000, 2024 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -34,7 +34,6 @@
import org.eclipse.ui.internal.AbstractWorkingSetManager;
import org.eclipse.ui.internal.AggregateWorkingSet;
import org.eclipse.ui.internal.IWorkbenchConstants;
import org.eclipse.ui.tests.harness.util.ArrayUtil;
import org.eclipse.ui.tests.harness.util.UITestCase;
import org.junit.Ignore;
import org.junit.Test;
Expand Down Expand Up @@ -128,9 +127,7 @@ public void testGetElemets() throws Throwable {
//</possible client code>

//unexpected
assertTrue(ArrayUtil.equals(
new IAdaptable[] {},
fWorkingSet.getElements()));
assertArrayEquals(new IAdaptable[] {}, fWorkingSet.getElements());
}

/**
Expand Down
4 changes: 2 additions & 2 deletions ...s/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IEditorRegistryTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2022 IBM Corporation and others.
* Copyright (c) 2000, 2024 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -123,7 +123,7 @@ public void testGetEditors() throws Throwable {
assertEquals(editors[0].getId(), map[1]);
editors2 = fReg.getEditors(FileUtil.createFile(map[0], proj)
.getName());
assertEquals(ArrayUtil.equals(editors, editors2), true);
assertArrayEquals(editors, editors2);
}

// there is no matching editor
Expand Down
63 changes: 25 additions & 38 deletions ...rg.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkingSetManagerTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2017 IBM Corporation and others.
* Copyright (c) 2000, 2024 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -14,6 +14,10 @@
*******************************************************************************/
package org.eclipse.ui.tests.api;

import static org.junit.Assert.assertArrayEquals;

import java.util.Arrays;

import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IAdaptable;
Expand Down Expand Up @@ -161,22 +165,19 @@ public void testAddPropertyChangeListener() throws Throwable {
public void testAddRecentWorkingSet() throws Throwable {
fWorkingSetManager.addRecentWorkingSet(fWorkingSet);
fWorkingSetManager.addWorkingSet(fWorkingSet);
assertTrue(ArrayUtil.equals(new IWorkingSet[] { fWorkingSet },
fWorkingSetManager.getRecentWorkingSets()));
assertArrayEquals(new IWorkingSet[] { fWorkingSet }, fWorkingSetManager.getRecentWorkingSets());

IWorkingSet workingSet2 = fWorkingSetManager.createWorkingSet(
WORKING_SET_NAME_2, new IAdaptable[] { fWorkspace.getRoot() });
fWorkingSetManager.addRecentWorkingSet(workingSet2);
fWorkingSetManager.addWorkingSet(workingSet2);
assertTrue(ArrayUtil.equals(new IWorkingSet[] { workingSet2,
fWorkingSet }, fWorkingSetManager.getRecentWorkingSets()));
assertArrayEquals(new IWorkingSet[] { workingSet2, fWorkingSet }, fWorkingSetManager.getRecentWorkingSets());
}

@Test
public void testAddWorkingSet() throws Throwable {
fWorkingSetManager.addWorkingSet(fWorkingSet);
assertTrue(ArrayUtil.equals(new IWorkingSet[] { fWorkingSet },
fWorkingSetManager.getWorkingSets()));
assertArrayEquals(new IWorkingSet[] { fWorkingSet }, fWorkingSetManager.getWorkingSets());

boolean exceptionThrown = false;
try {
Expand All @@ -185,23 +186,20 @@ public void testAddWorkingSet() throws Throwable {
exceptionThrown = true;
}
assertTrue(exceptionThrown);
assertTrue(ArrayUtil.equals(new IWorkingSet[] { fWorkingSet },
fWorkingSetManager.getWorkingSets()));
assertArrayEquals(new IWorkingSet[] { fWorkingSet }, fWorkingSetManager.getWorkingSets());
}

@Test
public void testCreateWorkingSet() throws Throwable {
IWorkingSet workingSet2 = fWorkingSetManager.createWorkingSet(
WORKING_SET_NAME_2, new IAdaptable[] { fWorkspace.getRoot() });
assertEquals(WORKING_SET_NAME_2, workingSet2.getName());
assertTrue(ArrayUtil.equals(new IAdaptable[] { fWorkspace.getRoot() },
workingSet2.getElements()));
assertArrayEquals(new IAdaptable[] { fWorkspace.getRoot() }, workingSet2.getElements());

workingSet2 = fWorkingSetManager.createWorkingSet("",
new IAdaptable[] {});
assertEquals("", workingSet2.getName());
assertTrue(ArrayUtil.equals(new IAdaptable[] {}, workingSet2
.getElements()));
assertArrayEquals(new IAdaptable[] {}, workingSet2.getElements());
}

@Test
Expand All @@ -213,8 +211,7 @@ public void testCreateWorkingSetFromMemento() throws Throwable {
IWorkingSet restoredWorkingSet2 = fWorkingSetManager
.createWorkingSet(memento);
assertEquals(WORKING_SET_NAME_2, restoredWorkingSet2.getName());
assertTrue(ArrayUtil.equals(new IAdaptable[] { fWorkspace.getRoot() },
restoredWorkingSet2.getElements()));
assertArrayEquals(new IAdaptable[] { fWorkspace.getRoot() }, restoredWorkingSet2.getElements());
}

@Test
Expand All @@ -232,19 +229,16 @@ public void testGetRecentWorkingSets() throws Throwable {

fWorkingSetManager.addRecentWorkingSet(fWorkingSet);
fWorkingSetManager.addWorkingSet(fWorkingSet);
assertTrue(ArrayUtil.equals(new IWorkingSet[] { fWorkingSet },
fWorkingSetManager.getRecentWorkingSets()));
assertArrayEquals(new IWorkingSet[] { fWorkingSet }, fWorkingSetManager.getRecentWorkingSets());

IWorkingSet workingSet2 = fWorkingSetManager.createWorkingSet(
WORKING_SET_NAME_2, new IAdaptable[] { fWorkspace.getRoot() });
fWorkingSetManager.addRecentWorkingSet(workingSet2);
fWorkingSetManager.addWorkingSet(workingSet2);
assertTrue(ArrayUtil.equals(new IWorkingSet[] { workingSet2,
fWorkingSet }, fWorkingSetManager.getRecentWorkingSets()));
assertArrayEquals(new IWorkingSet[] { workingSet2, fWorkingSet }, fWorkingSetManager.getRecentWorkingSets());

fWorkingSetManager.removeWorkingSet(workingSet2);
assertTrue(ArrayUtil.equals(new IWorkingSet[] { fWorkingSet },
fWorkingSetManager.getRecentWorkingSets()));
assertArrayEquals(new IWorkingSet[] { fWorkingSet }, fWorkingSetManager.getRecentWorkingSets());
}

@Test
Expand All @@ -261,12 +255,12 @@ public void testRecentWorkingSetsLength() throws Throwable {
fWorkingSetManager.addWorkingSet(workingSet);
workingSets[9 - i] = workingSet;
}
assertTrue(ArrayUtil.equals(workingSets, fWorkingSetManager.getRecentWorkingSets()));
assertArrayEquals(workingSets, fWorkingSetManager.getRecentWorkingSets());

fWorkingSetManager.setRecentWorkingSetsLength(7);
IWorkingSet[] workingSets7 = new IWorkingSet[7];
System.arraycopy(workingSets, 0, workingSets7, 0, 7);
assertTrue(ArrayUtil.equals(workingSets7, fWorkingSetManager.getRecentWorkingSets()));
assertArrayEquals(workingSets7, fWorkingSetManager.getRecentWorkingSets());

fWorkingSetManager.setRecentWorkingSetsLength(9);
IWorkingSet[] workingSets9 = new IWorkingSet[9];
Expand All @@ -280,7 +274,7 @@ public void testRecentWorkingSetsLength() throws Throwable {
workingSets9[8 - i] = workingSet;
}

assertTrue(ArrayUtil.equals(workingSets9, fWorkingSetManager.getRecentWorkingSets()));
assertArrayEquals(workingSets9, fWorkingSetManager.getRecentWorkingSets());
} finally {
if (oldMRULength > 0) {
fWorkingSetManager.setRecentWorkingSetsLength(oldMRULength);
Expand All @@ -302,20 +296,17 @@ public void testGetWorkingSet() throws Throwable {

@Test
public void testGetWorkingSets() throws Throwable {
assertTrue(ArrayUtil.equals(new IWorkingSet[] {}, fWorkingSetManager
.getWorkingSets()));
assertArrayEquals(new IWorkingSet[] {}, fWorkingSetManager.getWorkingSets());

fWorkingSetManager.addWorkingSet(fWorkingSet);
assertTrue(ArrayUtil.equals(new IWorkingSet[] { fWorkingSet },
fWorkingSetManager.getWorkingSets()));
assertArrayEquals(new IWorkingSet[] { fWorkingSet }, fWorkingSetManager.getWorkingSets());

try {
fWorkingSetManager.addWorkingSet(fWorkingSet);
fail("Added the same set twice");
} catch (RuntimeException exception) {
}
assertTrue(ArrayUtil.equals(new IWorkingSet[] { fWorkingSet },
fWorkingSetManager.getWorkingSets()));
assertArrayEquals(new IWorkingSet[] { fWorkingSet }, fWorkingSetManager.getWorkingSets());

IWorkingSet workingSet2 = fWorkingSetManager.createWorkingSet(
WORKING_SET_NAME_2, new IAdaptable[] { fWorkspace.getRoot() });
Expand Down Expand Up @@ -369,16 +360,14 @@ public void testRemovePropertyChangeListener() throws Throwable {
@Test
public void testRemoveWorkingSet() throws Throwable {
fWorkingSetManager.removeWorkingSet(fWorkingSet);
assertTrue(ArrayUtil.equals(new IWorkingSet[] {}, fWorkingSetManager
.getWorkingSets()));
assertArrayEquals(new IWorkingSet[] {}, fWorkingSetManager.getWorkingSets());

fWorkingSetManager.addWorkingSet(fWorkingSet);
IWorkingSet workingSet2 = fWorkingSetManager.createWorkingSet(
WORKING_SET_NAME_2, new IAdaptable[] { fWorkspace.getRoot() });
fWorkingSetManager.addWorkingSet(workingSet2);
fWorkingSetManager.removeWorkingSet(fWorkingSet);
assertTrue(ArrayUtil.equals(new IWorkingSet[] { workingSet2 },
fWorkingSetManager.getWorkingSets()));
assertArrayEquals(new IWorkingSet[] { workingSet2 }, fWorkingSetManager.getWorkingSets());
}

@Test
Expand All @@ -391,9 +380,7 @@ public void testRemoveWorkingSetAfterRename() throws Throwable {
String origName=fWorkingSet.getName();

/* check that workingSetManager contains "fWorkingSet"*/
assertTrue(ArrayUtil.equals(
new IWorkingSet[] { fWorkingSet },
workingSetManager.getWorkingSets()));
assertArrayEquals(new IWorkingSet[] { fWorkingSet }, workingSetManager.getWorkingSets());

fWorkingSet.setName(" ");
assertEquals(" ", fWorkingSet.getName());
Expand All @@ -402,7 +389,7 @@ public void testRemoveWorkingSetAfterRename() throws Throwable {
workingSetManager.removeWorkingSet(fWorkingSet);

/* check that "fWorkingSet" was removed after rename*/
if(!ArrayUtil.equals(new IWorkingSet[] {},
if (!Arrays.equals(new IWorkingSet[] {},
workingSetManager.getWorkingSets())){
/*Test Failure, report after restoring state*/
fWorkingSet.setName(origName);
Expand Down
19 changes: 10 additions & 9 deletions tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkingSetTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2017 IBM Corporation and others.
* Copyright (c) 2000, 2024 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -13,6 +13,10 @@
*******************************************************************************/
package org.eclipse.ui.tests.api;

import static org.junit.Assert.assertArrayEquals;

import java.util.Arrays;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspace;
Expand All @@ -24,7 +28,6 @@
import org.eclipse.ui.IWorkingSetManager;
import org.eclipse.ui.XMLMemento;
import org.eclipse.ui.internal.WorkingSet;
import org.eclipse.ui.tests.harness.util.ArrayUtil;
import org.eclipse.ui.tests.harness.util.FileUtil;
import org.eclipse.ui.tests.harness.util.UITestCase;
import org.eclipse.ui.tests.menus.ObjectContributionClasses.IA;
Expand Down Expand Up @@ -101,7 +104,7 @@ public void testSetElements() throws Throwable {
IFile f1 = FileUtil.createFile("f1.txt", p1);
IAdaptable[] elements = new IAdaptable[] { f1, p1 };
fWorkingSet.setElements(elements);
assertTrue(ArrayUtil.equals(elements, fWorkingSet.getElements()));
assertArrayEquals(elements, fWorkingSet.getElements());

fWorkingSet.setElements(new IAdaptable[] { f1 });
assertEquals(f1, fWorkingSet.getElements()[0]);
Expand Down Expand Up @@ -160,17 +163,16 @@ public void testNoDuplicateWorkingSetName() throws Throwable {
/*
* check that initially workingSetManager contains "fWorkingSet"
*/
assertTrue(ArrayUtil.equals(new IWorkingSet[] { fWorkingSet },
workingSetManager.getWorkingSets()));
assertArrayEquals(new IWorkingSet[] { fWorkingSet }, workingSetManager.getWorkingSets());

IWorkingSet wSet = workingSetManager.createWorkingSet(
WORKING_SET_NAME_2, new IAdaptable[] {});
workingSetManager.addWorkingSet(wSet);

/* check that workingSetManager contains "fWorkingSet" and wSet */
assertTrue(ArrayUtil.equals(new IWorkingSet[] { fWorkingSet, wSet },
assertTrue(Arrays.equals(new IWorkingSet[] { fWorkingSet, wSet },
workingSetManager.getWorkingSets())
|| ArrayUtil.equals(new IWorkingSet[] { wSet, fWorkingSet },
|| Arrays.equals(new IWorkingSet[] { wSet, fWorkingSet },
workingSetManager.getWorkingSets()));

String sameName = fWorkingSet.getName();
Expand Down Expand Up @@ -198,8 +200,7 @@ public void testNoDuplicateWorkingSetNamesDifferentLabels()
/*
* check that initially workingSetManager contains "fWorkingSet"
*/
assertTrue(ArrayUtil.equals(new IWorkingSet[] { fWorkingSet },
workingSetManager.getWorkingSets()));
assertArrayEquals(new IWorkingSet[] { fWorkingSet }, workingSetManager.getWorkingSets());

String sameName = fWorkingSet.getName();
IWorkingSet wSet = workingSetManager.createWorkingSet(sameName,
Expand Down

0 comments on commit 4fbbe1b

Please sign in to comment.