From 61bf17193d8d28bb048149182f5b8b12b02ab3da Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Fri, 4 Jun 2010 14:45:18 +0000 Subject: [PATCH] assertEquals should have its first parameter be the expected value. --- .../cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java | 2 +- .../eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java index 46861e3abd5..7329bc542be 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java @@ -814,7 +814,7 @@ public class MIBreakpointsTest extends BaseTestCase { // Ensure that the breakpoint was correctly installed MIBreakpointDMData breakpoint1 = (MIBreakpointDMData) getBreakpoint(ref); assertEquals("BreakpointService problem: breakpoint mismatch (wrong address)", - breakpoint1.getAddresses()[0].getValue(), ADDRESS); + ADDRESS, breakpoint1.getAddresses()[0].getValue()); assertTrue("BreakpointService problem: breakpoint mismatch (wrong condition)", breakpoint1.getCondition().equals(NO_CONDITION)); assertTrue("BreakpointService problem: breakpoint mismatch (wrong ignore count)", diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java index 67bc34922a7..8dd272f9e5e 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java @@ -190,7 +190,7 @@ public class MIRegistersTest extends BaseTestCase { fWait.waitReset(); - assertEquals("Wrong number of registers", regContexts.length, X86_REGS.size()); + assertEquals("Wrong number of registers", X86_REGS.size(), regContexts.length); return(regContexts); } @@ -225,7 +225,7 @@ public class MIRegistersTest extends BaseTestCase { MIStoppedEvent stoppedEvent = getInitialStoppedEvent(); IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); final IRegisterDMContext[] regDMCs = getRegisters(frameDmc); - assertEquals("Wrong number of registers", regDMCs.length, X86_REGS.size()); + assertEquals("Wrong number of registers", X86_REGS.size(), regDMCs.length); } @Test @@ -314,10 +314,10 @@ public class MIRegistersTest extends BaseTestCase { assertTrue("Register Value is not in HEX_FORMAT " ,val.startsWith("0x")); val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.BINARY_FORMAT, 0); - Assert.assertEquals("Register Value is not in BINARY_FORMAT ", val, Integer.toBinaryString(Integer.parseInt(REGISTER_VALUE))); + Assert.assertEquals("Register Value is not in BINARY_FORMAT ", Integer.toBinaryString(Integer.parseInt(REGISTER_VALUE)), val); val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.DECIMAL_FORMAT , 0); - Assert.assertEquals("Register Value is not in DECIMAL_FORMAT", Integer.parseInt(val), Integer.parseInt(REGISTER_VALUE)); + Assert.assertEquals("Register Value is not in DECIMAL_FORMAT", Integer.parseInt(REGISTER_VALUE), Integer.parseInt(val)); val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.OCTAL_FORMAT, 0); assertTrue("Register Value is not in OCTAL_FORMAT " ,val.startsWith("0"));