mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
[237351] - [resgisters][tests] Registers service unit tests all fail.
This commit is contained in:
parent
cda9077453
commit
cf6a213b68
1 changed files with 30 additions and 53 deletions
|
@ -7,13 +7,13 @@ import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
|
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
|
||||||
import org.eclipse.core.runtime.IStatus;
|
|
||||||
import org.eclipse.core.runtime.Status;
|
|
||||||
import org.eclipse.dd.dsf.concurrent.CountingRequestMonitor;
|
import org.eclipse.dd.dsf.concurrent.CountingRequestMonitor;
|
||||||
import org.eclipse.dd.dsf.concurrent.DataRequestMonitor;
|
import org.eclipse.dd.dsf.concurrent.DataRequestMonitor;
|
||||||
import org.eclipse.dd.dsf.concurrent.ImmediateExecutor;
|
import org.eclipse.dd.dsf.concurrent.ImmediateExecutor;
|
||||||
import org.eclipse.dd.dsf.concurrent.Query;
|
import org.eclipse.dd.dsf.concurrent.Query;
|
||||||
import org.eclipse.dd.dsf.concurrent.RequestMonitor;
|
import org.eclipse.dd.dsf.concurrent.RequestMonitor;
|
||||||
|
import org.eclipse.dd.dsf.datamodel.CompositeDMContext;
|
||||||
|
import org.eclipse.dd.dsf.datamodel.IDMContext;
|
||||||
import org.eclipse.dd.dsf.debug.service.IFormattedValues;
|
import org.eclipse.dd.dsf.debug.service.IFormattedValues;
|
||||||
import org.eclipse.dd.dsf.debug.service.IRegisters;
|
import org.eclipse.dd.dsf.debug.service.IRegisters;
|
||||||
import org.eclipse.dd.dsf.debug.service.IFormattedValues.FormattedValueDMContext;
|
import org.eclipse.dd.dsf.debug.service.IFormattedValues.FormattedValueDMContext;
|
||||||
|
@ -149,24 +149,20 @@ public class MIRegistersTest extends BaseTestCase {
|
||||||
final AsyncCompletionWaitor fWait = new AsyncCompletionWaitor();
|
final AsyncCompletionWaitor fWait = new AsyncCompletionWaitor();
|
||||||
final IRegisterGroupDMContext regGroupsDMC = getRegisterGroup();
|
final IRegisterGroupDMContext regGroupsDMC = getRegisterGroup();
|
||||||
|
|
||||||
final DataRequestMonitor<IRegisterDMContext[]> regDone =
|
|
||||||
new DataRequestMonitor<IRegisterDMContext[]>(fRegService.getExecutor(), null) {
|
|
||||||
@Override
|
|
||||||
protected void handleCompleted() {
|
|
||||||
if (isSuccess()) {
|
|
||||||
fWait.setReturnInfo(getData());
|
|
||||||
}
|
|
||||||
|
|
||||||
fWait.waitFinished(getStatus());
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
fRegService.getExecutor().submit(new Runnable() {
|
fRegService.getExecutor().submit(new Runnable() {
|
||||||
public void run() {
|
public void run() {
|
||||||
// fRegService.getRegisters(regGroupsDMC, frameDmc, regDone);
|
fRegService.getRegisters(
|
||||||
fWait.waitFinished(
|
new CompositeDMContext(new IDMContext[] { regGroupsDMC, frameDmc} ),
|
||||||
new Status(IStatus.ERROR, TestsPlugin.PLUGIN_ID,
|
new DataRequestMonitor<IRegisterDMContext[]>(fRegService.getExecutor(), null) {
|
||||||
"Commented out some code until it can compile", null));
|
@Override
|
||||||
|
protected void handleCompleted() {
|
||||||
|
if (isSuccess()) {
|
||||||
|
fWait.setReturnInfo(getData());
|
||||||
|
}
|
||||||
|
|
||||||
|
fWait.waitFinished(getStatus());
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -298,45 +294,23 @@ public class MIRegistersTest extends BaseTestCase {
|
||||||
|
|
||||||
private static String REGISTER_VALUE = "";
|
private static String REGISTER_VALUE = "";
|
||||||
@Test
|
@Test
|
||||||
public void getModelDataForRegisterDataValueNatural() throws Throwable {
|
public void getModelDataForRegisterDataValueInDifferentNumberFormats() throws Throwable {
|
||||||
IMIExecutionDMContext execDmc = fRunControl.createMIExecutionContext(fGdbControlDmc, 1);
|
IMIExecutionDMContext execDmc = fRunControl.createMIExecutionContext(fGdbControlDmc, 1);
|
||||||
IFrameDMContext frameDmc = SyncUtil.SyncGetStackFrame(execDmc, 0);
|
IFrameDMContext frameDmc = SyncUtil.SyncGetStackFrame(execDmc, 0);
|
||||||
String val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.NATURAL_FORMAT, 0);
|
String val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.NATURAL_FORMAT, 0);
|
||||||
REGISTER_VALUE = val;
|
REGISTER_VALUE = val;
|
||||||
assertTrue("Register Value is not in NATURAL format " , Integer.parseInt(val)== Integer.parseInt(REGISTER_VALUE));
|
assertTrue("Register Value is not in NATURAL format " , Integer.parseInt(val)== Integer.parseInt(REGISTER_VALUE));
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.HEX_FORMAT, 0);
|
||||||
public void getModelDataForRegisterDataValueHex() throws Throwable {
|
|
||||||
IMIExecutionDMContext execDmc = fRunControl.createMIExecutionContext(fGdbControlDmc, 1);
|
|
||||||
IFrameDMContext frameDmc = SyncUtil.SyncGetStackFrame(execDmc, 0);
|
|
||||||
String val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.HEX_FORMAT, 0);
|
|
||||||
assertTrue("Register Value is not in HEX_FORMAT " ,val.startsWith("0x"));
|
assertTrue("Register Value is not in HEX_FORMAT " ,val.startsWith("0x"));
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.BINARY_FORMAT, 0);
|
||||||
public void getModelDataForRegisterDataValueBinary() throws Throwable {
|
Assert.assertEquals("Register Value is not in BINARY_FORMAT ", val, Integer.toBinaryString(Integer.parseInt(REGISTER_VALUE)));
|
||||||
IMIExecutionDMContext execDmc = fRunControl.createMIExecutionContext(fGdbControlDmc, 1);
|
|
||||||
IFrameDMContext frameDmc = SyncUtil.SyncGetStackFrame(execDmc, 0);
|
|
||||||
|
|
||||||
String val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.BINARY_FORMAT, 0);
|
val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.DECIMAL_FORMAT , 0);
|
||||||
assertTrue("Register Value is not in BINARY_FORMAT " , val.equals(Integer.toBinaryString(Integer.parseInt(REGISTER_VALUE))));
|
Assert.assertEquals("Register Value is not in DECIMAL_FORMAT", Integer.parseInt(val), Integer.parseInt(REGISTER_VALUE));
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.OCTAL_FORMAT, 0);
|
||||||
public void getModelDataForRegisterDataValueDecimal() throws Throwable {
|
|
||||||
IMIExecutionDMContext execDmc = fRunControl.createMIExecutionContext(fGdbControlDmc, 1);
|
|
||||||
IFrameDMContext frameDmc = SyncUtil.SyncGetStackFrame(execDmc, 0);
|
|
||||||
|
|
||||||
String val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.DECIMAL_FORMAT , 0);
|
|
||||||
assertTrue("Register Value is not in DECIMAL_FORMAT" ,Integer.parseInt(val) == Integer.parseInt(REGISTER_VALUE));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void getModelDataForRegisterDataValueOctal() throws Throwable {
|
|
||||||
IMIExecutionDMContext execDmc = fRunControl.createMIExecutionContext(fGdbControlDmc, 1);
|
|
||||||
IFrameDMContext frameDmc = SyncUtil.SyncGetStackFrame(execDmc, 0);
|
|
||||||
String val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.OCTAL_FORMAT, 0);
|
|
||||||
assertTrue("Register Value is not in OCTAL_FORMAT " ,val.startsWith("0"));
|
assertTrue("Register Value is not in OCTAL_FORMAT " ,val.startsWith("0"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -393,7 +367,6 @@ public class MIRegistersTest extends BaseTestCase {
|
||||||
private void writeRegister(IFrameDMContext frameDmc, final int regIndex, final String regValue, final String formatId) throws Throwable {
|
private void writeRegister(IFrameDMContext frameDmc, final int regIndex, final String regValue, final String formatId) throws Throwable {
|
||||||
final AsyncCompletionWaitor fWait = new AsyncCompletionWaitor();
|
final AsyncCompletionWaitor fWait = new AsyncCompletionWaitor();
|
||||||
|
|
||||||
// final MIRegisterGroupDMC grpDmc = new MIRegisterGroupDMC( (MIRegisters)fRegService , 0 , "General Registers" ) ;
|
|
||||||
final IRegisterDMContext[] regDMCs = getRegisters(frameDmc);
|
final IRegisterDMContext[] regDMCs = getRegisters(frameDmc);
|
||||||
|
|
||||||
|
|
||||||
|
@ -407,11 +380,15 @@ public class MIRegistersTest extends BaseTestCase {
|
||||||
|
|
||||||
fRegService.getExecutor().submit(new Runnable() {
|
fRegService.getExecutor().submit(new Runnable() {
|
||||||
public void run() {
|
public void run() {
|
||||||
// fRegService.writeRegister(grpDmc, regDMCs[regIndex], regValue,
|
fRegService.writeRegister(
|
||||||
// formatId, writeDone);
|
regDMCs[regIndex],
|
||||||
fWait.waitFinished(
|
regValue, formatId,
|
||||||
new Status(IStatus.ERROR, TestsPlugin.PLUGIN_ID,
|
new RequestMonitor(fRegService.getExecutor(), null) {
|
||||||
"Commented out some code until it can compile", null));
|
@Override
|
||||||
|
protected void handleCompleted() {
|
||||||
|
fWait.waitFinished(getStatus());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Add table
Reference in a new issue