Update more Instruction test instances

redballoonsecurity · Jan 9, 2025 · 67a3f36 · 67a3f36
1 parent 7f25c45
commit 67a3f36
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/ofrak_core/test_ofrak/unit/instruction_modifier/arm32/test_arm32_instruction_modifier.py b/ofrak_core/test_ofrak/unit/instruction_modifier/arm32/test_arm32_instruction_modifier.py
@@ -25,7 +25,6 @@
             (Instruction,),
             (
                 AttributesType[Instruction](
-                    "ldrsh.w r3, [r7,#0x1C]",
                     "ldrsh.w",
                     "r3, [r7,#0x1C]",
                     InstructionSetMode.NONE,
@@ -55,7 +54,6 @@
             (Instruction,),
             (
                 AttributesType[Instruction](
-                    "add r2, r3, 1",
                     "add",
                     "r2, r3, 1",
                     InstructionSetMode.THUMB,
@@ -85,7 +83,6 @@
             (Instruction,),
             (
                 AttributesType[Instruction](
-                    "add r2, r3, 1",
                     "add",
                     "r2, r3, 1",
                     InstructionSetMode.NONE,

diff --git a/ofrak_core/test_ofrak/unit/resource_view/test_view.py b/ofrak_core/test_ofrak/unit/resource_view/test_view.py
@@ -52,7 +52,6 @@ def mock_instruction():
                 0x4,
             ),
             AttributesType[Instruction](
-                "add r1, r2, r3",
                 "add",
                 "r1, r2, r3",
                 InstructionSetMode.NONE,
@@ -67,7 +66,6 @@ def mock_instruction_view():
     return Instruction(
         0x100,
         0x4,
-        "add r1, r2, r3",
         "add",
         "r1, r2, r3",
         InstructionSetMode.NONE,
@@ -212,7 +210,6 @@ async def test_AttributesType():
 
     # With a type parameter, the constructor of an actual attribute is used
     _ = AttributesType[Instruction](
-        "add r1, r2, r3",
         "add",
         "r1, r2, r3",
         InstructionSetMode.NONE,
@@ -232,7 +229,7 @@ async def instr_view(ofrak_context: OFRAKContext):
         b"\x00" * 4,
         (Instruction,),
     )
-    instr_r.add_view(Instruction(0x100, 0x4, "", "", "", InstructionSetMode.NONE))
+    instr_r.add_view(Instruction(0x100, 0x4, "", "", InstructionSetMode.NONE))
     instr_r.add_attributes(
         ProgramAttributes(
             InstructionSet.ARM,
@@ -268,9 +265,7 @@ async def test_modifier_updates_view(instr_view: Instruction):
 
 
 async def test_save_updates_view(instr_view: Instruction):
-    instr_view.resource.add_view(
-        Instruction(0x100, 0x4, "sub r4, r5", "sub", "r4, r5", InstructionSetMode.NONE)
-    )
+    instr_view.resource.add_view(Instruction(0x100, 0x4, "sub", "r4, r5", InstructionSetMode.NONE))
     await instr_view.resource.save()
 
     assert instr_view.mnemonic == "sub"