mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-20 15:35:24 +02:00
Code Issues Wiki Activity

Make MIExpressionsTest.testUpdateOfPointer use SyncUtil

Browse source 
Modify MIExpressionsTest.testUpdateOfPointer so that it only uses
synchronous methods.  There is no change of behavior intended, the test
should do pretty much the same thing as before, but should be a bit more
readable.

One difference is that we don't need to re-create the
IExpressionDMContext objects when we want to re-evaluate the
expressions (after stepping the 2nd time).  We can just call
getExpressionValue on the again, which will trigger a -var-update.

Change-Id: I09bb914b097888bf3146df0096eb9d824441ffa8
Signed-off-by: Simon Marchi <simon.marchi@polymtl.ca>
This commit is contained in:
Simon Marchi 2017-01-27 16:39:27 -05:00 • committed by Marc Khouzam
parent 277a96f7b7
commit 808df2490b
2 changed files with 58 additions and 228 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java
View file

@ -494,6 +494,32 @@ public class SyncUtil {
return fSession.getExecutor().submit(callable).get();
}
public static IExpressionDMContext[] getSubExpressions(final IExpressionDMContext dmc)
throws InterruptedException, ExecutionException {
Query<IExpressionDMContext[]> query = new Query<IExpressionDMContext[]>() {
@Override
protected void execute(DataRequestMonitor<IExpressionDMContext[]> rm) {
fExpressions.getSubExpressions(dmc, rm);
}
};
fSession.getExecutor().execute(query);
return query.get();
}
/*
* Like getSubExpressions, but for cases where we know there will be only
* one child.
*/
public static IExpressionDMContext getSubExpression(final IExpressionDMContext dmc)
throws InterruptedException, ExecutionException {
IExpressionDMContext[] subExpressions = SyncUtil.getSubExpressions(dmc);
assertEquals(1, subExpressions.length);
return subExpressions[0];
}
public static String getExpressionValue(final IExpressionDMContext exprDmc, final String format)
throws Throwable {
Query<String> query = new Query<String>() {

258
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java
View file

@ -11,7 +11,9 @@
*******************************************************************************/
package org.eclipse.cdt.tests.dsf.gdb.tests;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@ -2577,242 +2579,44 @@ public class MIExpressionsTest extends BaseParametrizedTestCase {
*/
@Test
public void testUpdateOfPointer() throws Throwable {
SyncUtil.runToLocation("testUpdateOfPointer");
MIStoppedEvent stoppedEvent = SyncUtil.step(3, StepType.STEP_OVER);
final IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0);
SyncUtil.runToLocation("testUpdateOfPointer");
MIStoppedEvent stoppedEvent = SyncUtil.step(3, StepType.STEP_OVER);
IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0);
final String firstValue = "1";
final String secondValue = "2";
final String thirdValue = "3";
/* Create expression for the structure. */
IExpressionDMContext structDmc = SyncUtil.createExpression(frameDmc, "z");
final AsyncCompletionWaitor wait = new AsyncCompletionWaitor();
/* Create sub-expressions for the structure field. */
IExpressionDMContext[] fieldsDmc = SyncUtil.getSubExpressions(structDmc);
assertThat(fieldsDmc.length, is(2));
fExpService.getExecutor().submit(new Runnable() {
@Override
public void run() {
/* Get the value of the integer. */
String integerValue = SyncUtil.getExpressionValue(fieldsDmc[0], IFormattedValues.NATURAL_FORMAT);
assertThat(integerValue, is("1"));
IExpressionDMContext parentDmc = fExpService.createExpression(frameDmc, "z");
/* Get the value of the integer pointer. */
String pointerFirstValue = SyncUtil.getExpressionValue(fieldsDmc[1], IFormattedValues.NATURAL_FORMAT);
fExpService.getSubExpressions(
parentDmc,
new DataRequestMonitor<IExpressionDMContext[]>(fExpService.getExecutor(), null) {
@Override
protected void handleCompleted() {
if (!isSuccess()) {
wait.waitFinished(getStatus());
} else if (getData().length != 2) {
wait.waitFinished(new Status(IStatus.ERROR, TestsPlugin.PLUGIN_ID,
"Failed getting children; expecting 2 got " + getData().length, null));
} else {
// check that we have the proper value for both children
globalExpressionCtx1 = getData()[0];
globalExpressionCtx2 = getData()[1];
/* Get the value pointed by the pointer field. */
IExpressionDMContext pointeeDmc = SyncUtil.getSubExpression(fieldsDmc[1]);
String pointeeActualValue = SyncUtil.getExpressionValue(pointeeDmc, IFormattedValues.NATURAL_FORMAT);
assertThat(pointeeActualValue, is("1"));
// Get the value of the first child
wait.increment();
fExpService.getFormattedExpressionValue(
fExpService.getFormattedValueContext(globalExpressionCtx1, IFormattedValues.NATURAL_FORMAT),
new DataRequestMonitor<FormattedValueDMData>(fExpService.getExecutor(), null) {
@Override
protected void handleCompleted() {
if (!isSuccess()) {
wait.waitFinished(getStatus());
} else if (getData().getFormattedValue().equals(firstValue)) {
wait.waitFinished();
} else {
wait.waitFinished(new Status(IStatus.ERROR, TestsPlugin.PLUGIN_ID,
"Failed evaluating " + globalExpressionCtx1.getExpression() + ", got " + getData().getFormattedValue()
+ " instead of " + firstValue, null));
}
}
});
/* Now, step to change the values of all the children. */
SyncUtil.step(2, StepType.STEP_OVER);
// Get the value of the second child
wait.increment();
fExpService.getFormattedExpressionValue(
fExpService.getFormattedValueContext(globalExpressionCtx2, IFormattedValues.NATURAL_FORMAT),
new DataRequestMonitor<FormattedValueDMData>(fExpService.getExecutor(), null) {
@Override
protected void handleCompleted() {
if (!isSuccess()) {
wait.waitFinished(getStatus());
} else {
wait.setReturnInfo(getData().getFormattedValue());
wait.waitFinished();
}
}
});
}
}
});
}
});
/* Get the value of the integer. */
integerValue = SyncUtil.getExpressionValue(fieldsDmc[0], IFormattedValues.NATURAL_FORMAT);
assertThat(integerValue, is("2"));
wait.waitUntilDone(AsyncCompletionWaitor.WAIT_FOREVER);
assertTrue(wait.getMessage(), wait.isOK());
final String pointerValue = (String)wait.getReturnInfo();
wait.waitReset();
/* Get the value of the integer pointer. It should have changed from
last time. */
String pointerSecondValue = SyncUtil.getExpressionValue(fieldsDmc[1], IFormattedValues.NATURAL_FORMAT);
assertThat(pointerSecondValue, is(not(equalTo(pointerFirstValue))));
fExpService.getExecutor().submit(new Runnable() {
@Override
public void run() {
// also get the child of the pointer
fExpService.getSubExpressions(
globalExpressionCtx2,
new DataRequestMonitor<IExpressionDMContext[]>(fExpService.getExecutor(), null) {
@Override
protected void handleCompleted() {
if (!isSuccess()) {
wait.waitFinished(getStatus());
} else if (getData().length != 1) {
wait.waitFinished(new Status(IStatus.ERROR, TestsPlugin.PLUGIN_ID,
"Failed getting children; expecting 1 got " + getData().length, null));
} else {
// Get the value of the child of the pointer
globalExpressionCtx2 = getData()[0];
fExpService.getFormattedExpressionValue(
fExpService.getFormattedValueContext(globalExpressionCtx2, IFormattedValues.NATURAL_FORMAT),
new DataRequestMonitor<FormattedValueDMData>(fExpService.getExecutor(), null) {
@Override
protected void handleCompleted() {
if (!isSuccess()) {
wait.waitFinished(getStatus());
} else if (getData().getFormattedValue().equals(firstValue)) {
wait.waitFinished();
} else {
wait.waitFinished(new Status(IStatus.ERROR, TestsPlugin.PLUGIN_ID,
"Failed evaluating " + globalExpressionCtx2.getExpression() + ", got " + getData().getFormattedValue()
+ " instead of " + firstValue, null));
}
}
});
}
}
});
}
});
wait.waitUntilDone(AsyncCompletionWaitor.WAIT_FOREVER);
assertTrue(wait.getMessage(), wait.isOK());
wait.waitReset();
// Now step to change the values of all the children
stoppedEvent = SyncUtil.step(2, StepType.STEP_OVER);
final IFrameDMContext frameDmc2 = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0);
fExpService.getExecutor().submit(new Runnable() {
@Override
public void run() {
IExpressionDMContext parentDmc = fExpService.createExpression(frameDmc2, "z");
fExpService.getSubExpressions(
parentDmc,
new DataRequestMonitor<IExpressionDMContext[]>(fExpService.getExecutor(), null) {
@Override
protected void handleCompleted() {
if (!isSuccess()) {
wait.waitFinished(getStatus());
} else if (getData().length != 2) {
wait.waitFinished(new Status(IStatus.ERROR, TestsPlugin.PLUGIN_ID,
"Failed getting children; expecting 2 got " + getData().length, null));
} else {
// check that we have the proper value for both children
globalExpressionCtx1 = getData()[0];
globalExpressionCtx2 = getData()[1];
// Get the value of the first child
wait.increment();
fExpService.getFormattedExpressionValue(
fExpService.getFormattedValueContext(globalExpressionCtx1, IFormattedValues.NATURAL_FORMAT),
new DataRequestMonitor<FormattedValueDMData>(fExpService.getExecutor(), null) {
@Override
protected void handleCompleted() {
if (!isSuccess()) {
wait.waitFinished(getStatus());
} else if (getData().getFormattedValue().equals(secondValue)) {
wait.waitFinished();
} else {
wait.waitFinished(new Status(IStatus.ERROR, TestsPlugin.PLUGIN_ID,
"Failed evaluating " + globalExpressionCtx1.getExpression() + ", got " + getData().getFormattedValue()
+ " instead of " + secondValue, null));
}
}
});
// Get the value of the second child
wait.increment();
fExpService.getFormattedExpressionValue(
fExpService.getFormattedValueContext(globalExpressionCtx2, IFormattedValues.NATURAL_FORMAT),
new DataRequestMonitor<FormattedValueDMData>(fExpService.getExecutor(), null) {
@Override
protected void handleCompleted() {
if (!isSuccess()) {
wait.waitFinished(getStatus());
} else if (!getData().getFormattedValue().equals(pointerValue)) {
// The value should have changed
wait.waitFinished();
} else {
wait.waitFinished(new Status(IStatus.ERROR, TestsPlugin.PLUGIN_ID,
"Failed evaluating " + globalExpressionCtx2.getExpression() + ", got " + getData().getFormattedValue()
+ " instead of some other value", null));
}
}
});
}
}
});
}
});
wait.waitUntilDone(AsyncCompletionWaitor.WAIT_FOREVER);
assertTrue(wait.getMessage(), wait.isOK());
wait.waitReset();
fExpService.getExecutor().submit(new Runnable() {
@Override
public void run() {
// also get the child of the pointer
fExpService.getSubExpressions(
globalExpressionCtx2,
new DataRequestMonitor<IExpressionDMContext[]>(fExpService.getExecutor(), null) {
@Override
protected void handleCompleted() {
if (!isSuccess()) {
wait.waitFinished(getStatus());
} else if (getData().length != 1) {
wait.waitFinished(new Status(IStatus.ERROR, TestsPlugin.PLUGIN_ID,
"Failed getting children; expecting 1 got " + getData().length, null));
} else {
// Get the value of the child of the pointer
globalExpressionCtx2 = getData()[0];
fExpService.getFormattedExpressionValue(
fExpService.getFormattedValueContext(globalExpressionCtx2, IFormattedValues.NATURAL_FORMAT),
new DataRequestMonitor<FormattedValueDMData>(fExpService.getExecutor(), null) {
@Override
protected void handleCompleted() {
if (!isSuccess()) {
wait.waitFinished(getStatus());
} else if (getData().getFormattedValue().equals(thirdValue)) {
wait.waitFinished();
} else {
wait.waitFinished(new Status(IStatus.ERROR, TestsPlugin.PLUGIN_ID,
"Failed evaluating " + globalExpressionCtx2.getExpression() + ", got " + getData().getFormattedValue()
+ " instead of " + thirdValue, null));
}
}
});
}
}
});
}
});
wait.waitUntilDone(AsyncCompletionWaitor.WAIT_FOREVER);
assertTrue(wait.getMessage(), wait.isOK());
wait.waitReset();
/* Get the value pointed by the pointer field. */
pointeeActualValue = SyncUtil.getExpressionValue(pointeeDmc, IFormattedValues.NATURAL_FORMAT);
assertThat(pointeeActualValue, is("3"));
}
/**