Skip to content

Commit

Permalink
Re-throw underlying exceptions in OpenFromClipboardTests #27 (#279)
Browse files Browse the repository at this point in the history 
Replace call to Display::syncExec with call to Display::syncCall in the
private method getJavaElementMatches. snycCall does not hide exceptions,
it re-throws them to the calling thread (which helps debugging).

Don't catch exceptions in the helper class "Accessor", re-throw them so
the calling tests can show a more meaningful stack-trace when they fail.
  • Loading branch information
@fedejeanne
fedejeanne authored Jul 9, 2023
1 parent f6310db commit fba705b
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 143 deletions.
168 changes: 35 additions & 133 deletions org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/Accessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,13 @@ public Accessor(Object instance, Class<?> clazz) {
* @param classLoader
* the class loader to use i.e. <code>getClass().getClassLoader()</code>
*/
public Accessor(Object instance, String className, ClassLoader classLoader) {
public Accessor(Object instance, String className, ClassLoader classLoader) throws ClassNotFoundException {
Assert.isNotNull(instance);
Assert.isNotNull(className);
Assert.isNotNull(classLoader);
fInstance = instance;
try {
fClass = Class.forName(className, true, classLoader);
} catch (ClassNotFoundException e) {
fail();
} catch (ExceptionInInitializerError e) {
fail();
}

fClass = Class.forName(className, true, classLoader);
}

/**
Expand All @@ -89,7 +84,7 @@ public Accessor(Object instance, String className, ClassLoader classLoader) {
* @param constructorArgs
* the constructor arguments which must all be instance of Object
*/
public Accessor(String className, ClassLoader classLoader, Object[] constructorArgs) {
public Accessor(String className, ClassLoader classLoader, Object[] constructorArgs) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException, ClassNotFoundException {
this(className, classLoader, getTypes(constructorArgs), constructorArgs);
}

Expand All @@ -105,35 +100,14 @@ public Accessor(String className, ClassLoader classLoader, Object[] constructorA
* @param constructorArgs
* the constructor arguments
*/
public Accessor(String className, ClassLoader classLoader, Class<?>[] constructorTypes, Object[] constructorArgs) {
try {
fClass = Class.forName(className, true, classLoader);
} catch (ClassNotFoundException e) {
fail();
} catch (ExceptionInInitializerError e) {
fail();
}
Constructor<?> constructor = null;
try {
constructor = fClass.getDeclaredConstructor(constructorTypes);
} catch (SecurityException e2) {
fail();
} catch (NoSuchMethodException e2) {
fail();
}
public Accessor(String className, ClassLoader classLoader, Class<?>[] constructorTypes, Object[] constructorArgs) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException, ClassNotFoundException {
fClass = Class.forName(className, true, classLoader);

Constructor<?> constructor = fClass.getDeclaredConstructor(constructorTypes);

Assert.isNotNull(constructor);
constructor.setAccessible(true);
try {
fInstance = constructor.newInstance(constructorArgs);
} catch (IllegalArgumentException e) {
fail();
} catch (InvocationTargetException e) {
fail();
} catch (InstantiationException e) {
fail();
} catch (IllegalAccessException e) {
fail();
}
fInstance = constructor.newInstance(constructorArgs);
}

/**
Expand All @@ -147,14 +121,8 @@ public Accessor(String className, ClassLoader classLoader, Class<?>[] constructo
* @param classLoader
* the class loader to use i.e. <code>getClass().getClassLoader()</code>
*/
public Accessor(String className, ClassLoader classLoader) {
try {
fClass = Class.forName(className, true, classLoader);
} catch (ClassNotFoundException e) {
fail();
} catch (ExceptionInInitializerError e) {
fail();
}
public Accessor(String className, ClassLoader classLoader) throws ClassNotFoundException {
fClass = Class.forName(className, true, classLoader);
}

/**
Expand All @@ -174,8 +142,8 @@ public Accessor(Class<?> clazz) {
/**
* Invokes the method with the given method name and arguments.
* <p>
* In order to get the type information from the given arguments all those arguments must be
* instance of Object. Use {@link #invoke(String, Class[], Object[])} if this is not the case.
* In order to get the type information from the given arguments all those arguments must be instance of Object. Use
* {@link #invoke(String, Class[], Object[])} if this is not the case.
* </p>
*
* @param methodName
Expand All @@ -184,7 +152,7 @@ public Accessor(Class<?> clazz) {
* the method arguments which must all be instance of Object
* @return the method return value
*/
public Object invoke(String methodName, Object[] arguments) {
public Object invoke(String methodName, Object[] arguments) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
return invoke(methodName, getTypes(arguments), arguments);
}

Expand All @@ -197,29 +165,14 @@ public Object invoke(String methodName, Object[] arguments) {
* the argument types
* @param arguments
* the method arguments
* @return the method return value
*/
public Object invoke(String methodName, Class<?>[] types, Object[] arguments) {
public Object invoke(String methodName, Class<?>[] types, Object[] arguments) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
Method method = null;
try {
method = fClass.getDeclaredMethod(methodName, types);
} catch (SecurityException e) {
fail();
} catch (NoSuchMethodException ex) {
fail();
}
method = fClass.getDeclaredMethod(methodName, types);

Assert.isNotNull(method);
method.setAccessible(true);
try {
return method.invoke(fInstance, arguments);
} catch (IllegalArgumentException e) {
fail();
} catch (InvocationTargetException e) {
fail();
} catch (IllegalAccessException e) {
fail();
}
return null;
return method.invoke(fInstance, arguments);
}

/**
Expand All @@ -230,15 +183,9 @@ public Object invoke(String methodName, Class<?>[] types, Object[] arguments) {
* @param value
* the value to assign to the field
*/
public void set(String fieldName, Object value) {
public void set(String fieldName, Object value) throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException {
Field field = getField(fieldName);
try {
field.set(fInstance, value);
} catch (IllegalArgumentException e) {
fail();
} catch (IllegalAccessException e) {
fail();
}
field.set(fInstance, value);
}

/**
Expand All @@ -249,15 +196,9 @@ public void set(String fieldName, Object value) {
* @param value
* the value to assign to the field
*/
public void set(String fieldName, boolean value) {
public void set(String fieldName, boolean value) throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException {
Field field = getField(fieldName);
try {
field.setBoolean(fInstance, value);
} catch (IllegalArgumentException e) {
fail();
} catch (IllegalAccessException e) {
fail();
}
field.setBoolean(fInstance, value);
}

/**
Expand All @@ -268,15 +209,9 @@ public void set(String fieldName, boolean value) {
* @param value
* the value to assign to the field
*/
public void set(String fieldName, int value) {
public void set(String fieldName, int value) throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException {
Field field = getField(fieldName);
try {
field.setInt(fInstance, value);
} catch (IllegalArgumentException e) {
fail();
} catch (IllegalAccessException e) {
fail();
}
field.setInt(fInstance, value);
}

/**
Expand All @@ -286,17 +221,9 @@ public void set(String fieldName, int value) {
* the field name
* @return the value of the field
*/
public Object get(String fieldName) {
public Object get(String fieldName) throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException {
Field field = getField(fieldName);
try {
return field.get(fInstance);
} catch (IllegalArgumentException e) {
fail();
} catch (IllegalAccessException e) {
fail();
}
// Unreachable code
return null;
return field.get(fInstance);
}

/**
Expand All @@ -306,17 +233,9 @@ public Object get(String fieldName) {
* the field name
* @return the value of the field
*/
public boolean getBoolean(String fieldName) {
public boolean getBoolean(String fieldName) throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException {
Field field = getField(fieldName);
try {
return field.getBoolean(fInstance);
} catch (IllegalArgumentException e) {
fail();
} catch (IllegalAccessException e) {
fail();
}
// Unreachable code
return false;
return field.getBoolean(fInstance);
}

/**
Expand All @@ -326,35 +245,21 @@ public boolean getBoolean(String fieldName) {
* the field name
* @return the value of the field
*/
public int getInt(String fieldName) {
public int getInt(String fieldName) throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException {
Field field = getField(fieldName);
try {
return field.getInt(fInstance);
} catch (IllegalArgumentException e) {
fail();
} catch (IllegalAccessException e) {
fail();
}
// Unreachable code
return 0;
return field.getInt(fInstance);
}

public Field getField(String fieldName) {
Field field = null;
try {
field = fClass.getDeclaredField(fieldName);
} catch (SecurityException e) {
fail();
} catch (NoSuchFieldException e) {
fail();
}
public Field getField(String fieldName) throws NoSuchFieldException, SecurityException {
Field field = fClass.getDeclaredField(fieldName);
field.setAccessible(true);
return field;
}

private static Class<?>[] getTypes(Object[] objects) {
if (objects == null)
if (objects == null) {
return null;
}

int length = objects.length;
Class<?>[] classes = new Class[length];
Expand All @@ -365,7 +270,4 @@ private static Class<?>[] getTypes(Object[] objects) {
return classes;
}

private void fail() {
Assert.isTrue(false);
}
}
16 changes: 6 additions & 10 deletions org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,20 +133,16 @@ public void tearDown() throws Exception {
JavaProjectHelper.removeSourceContainer(fJProject, "src");
}

private int getMatachingPattern(String s) {
private int getMatachingPattern(String s) throws Exception {
Object returnValue = fAccessor.invoke("getMatchingPattern", new Object[] { s });
return ((Integer) returnValue).intValue();
}

private List<?> getJavaElementMatches(final String textData) {
private List<?> getJavaElementMatches(final String textData) throws Exception {
JavaModelManager.getIndexManager().waitForIndex(false, null);
final List<?> matches = new ArrayList<>();
Display.getDefault().syncExec(new Runnable() {
@Override
public void run() {
fAccessor.invoke("getJavaElementMatches", new Class[] { String.class, List.class }, new Object[] { textData, matches });
}
});
Display.getDefault().syncCall(() -> fAccessor.invoke("getJavaElementMatches", new Class[] { String.class, List.class }, new Object[] {
textData, matches }));
return matches;
}

Expand Down Expand Up @@ -624,13 +620,13 @@ public void testStackElement_2() throws Exception {

// invalid pattern tests
@Test
public void testInvalidPattern_1() {
public void testInvalidPattern_1() throws Exception {
String s = "(Collection)";
assertEquals(INVALID, getMatachingPattern(s));
}

@Test
public void testInvalidPattern_2() {
public void testInvalidPattern_2() throws Exception {
String s = "()";
assertEquals(INVALID, getMatachingPattern(s));
}
Expand Down

0 comments on commit fba705b

Please sign in to comment.