Skip to content

Commit

Permalink
(WIP) update existing unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@Godin
Godin committed May 3, 2023
1 parent c9135a0 commit ae8f2f2
Showing 1 changed file with 62 additions and 43 deletions.
105 changes: 62 additions & 43 deletions org.jacoco.core.test/src/org/jacoco/core/internal/instr/ProbeInserterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,48 +59,48 @@ public void verify() {
}

@Test
public void probevar_should_be_at_position_0_for_static_method_without_parameters() {
public void probevar_should_be_at_position_1_for_static_method_without_parameters() {
ProbeInserter pi = new ProbeInserter(Opcodes.ACC_STATIC, "m", "()V",
actualVisitor, arrayStrategy);
pi.insertProbe(0);

expectedVisitor.visitVarInsn(Opcodes.ALOAD, 0);
expectedVisitor.visitVarInsn(Opcodes.ALOAD, 1);
expectedVisitor.visitInsn(Opcodes.ICONST_0);
expectedVisitor.visitInsn(Opcodes.ICONST_1);
expectedVisitor.visitInsn(Opcodes.BASTORE);
}

@Test
public void probevar_should_be_at_position_1_for_instance_method_without_parameters() {
public void probevar_should_be_at_position_2_for_instance_method_without_parameters() {
ProbeInserter pi = new ProbeInserter(0, "m", "()V", actualVisitor,
arrayStrategy);
pi.insertProbe(0);

expectedVisitor.visitVarInsn(Opcodes.ALOAD, 1);
expectedVisitor.visitVarInsn(Opcodes.ALOAD, 2);
expectedVisitor.visitInsn(Opcodes.ICONST_0);
expectedVisitor.visitInsn(Opcodes.ICONST_1);
expectedVisitor.visitInsn(Opcodes.BASTORE);
}

@Test
public void probevar_should_be_at_position_4_for_instance_method_with_3_parameters() {
public void probevar_should_be_at_position_5_for_instance_method_with_3_parameters() {
ProbeInserter pi = new ProbeInserter(0, "m", "(IZLjava/lang/Object;)V",
actualVisitor, arrayStrategy);
pi.insertProbe(0);

expectedVisitor.visitVarInsn(Opcodes.ALOAD, 4);
expectedVisitor.visitVarInsn(Opcodes.ALOAD, 5);
expectedVisitor.visitInsn(Opcodes.ICONST_0);
expectedVisitor.visitInsn(Opcodes.ICONST_1);
expectedVisitor.visitInsn(Opcodes.BASTORE);
}

@Test
public void probevar_should_be_at_position_5_for_instance_method_with_2_wide_parameters() {
public void probevar_should_be_at_position_6_for_instance_method_with_2_wide_parameters() {
ProbeInserter pi = new ProbeInserter(0, "m", "(JD)V", actualVisitor,
arrayStrategy);
pi.insertProbe(0);

expectedVisitor.visitVarInsn(Opcodes.ALOAD, 5);
expectedVisitor.visitVarInsn(Opcodes.ALOAD, 6);
expectedVisitor.visitInsn(Opcodes.ICONST_0);
expectedVisitor.visitInsn(Opcodes.ICONST_1);
expectedVisitor.visitInsn(Opcodes.BASTORE);
Expand Down Expand Up @@ -142,9 +142,9 @@ public void visitVarInsn_should_be_called_with_adjusted_variable_positions() {
expectedVisitor.visitVarInsn(Opcodes.ILOAD, 1);
expectedVisitor.visitVarInsn(Opcodes.ILOAD, 2);

// Local variables are shifted by one:
expectedVisitor.visitVarInsn(Opcodes.ISTORE, 4);
expectedVisitor.visitVarInsn(Opcodes.FSTORE, 5);
// Local variables are shifted by two:
expectedVisitor.visitVarInsn(Opcodes.ISTORE, 5);
expectedVisitor.visitVarInsn(Opcodes.FSTORE, 6);
}

@Test
Expand All @@ -162,9 +162,9 @@ public void visitIincInsn_should_be_called_with_adjusted_variable_positions() {
expectedVisitor.visitIincInsn(1, 101);
expectedVisitor.visitIincInsn(2, 102);

// Local variables are shifted by one:
expectedVisitor.visitIincInsn(4, 103);
expectedVisitor.visitIincInsn(5, 104);
// Local variables are shifted by two:
expectedVisitor.visitIincInsn(5, 103);
expectedVisitor.visitIincInsn(6, 104);
}

@Test
Expand All @@ -185,9 +185,9 @@ public void visitLocalVariable_should_be_called_with_adjusted_variable_positions
expectedVisitor.visitLocalVariable(null, null, null, begin, null, 1);
expectedVisitor.visitLocalVariable(null, null, null, begin, null, 2);

// Local variables are shifted by one:
expectedVisitor.visitLocalVariable(null, null, null, null, null, 4);
// Local variables are shifted by two:
expectedVisitor.visitLocalVariable(null, null, null, null, null, 5);
expectedVisitor.visitLocalVariable(null, null, null, null, null, 6);
}

@Test
Expand All @@ -206,10 +206,10 @@ public void should_remap_LocalVariableAnnotation() {

expectedVisitor.visitLabel(start);
expectedVisitor.visitLabel(end);
// Local variables are shifted by one:
// Local variables are shifted by two:
expectedVisitor.visitLocalVariableAnnotation(
TypeReference.LOCAL_VARIABLE, null, new Label[] { start },
new Label[] { end }, new int[] { 3 }, "LNonNull;", false);
new Label[] { end }, new int[] { 4 }, "LNonNull;", false);
}

@Test
Expand All @@ -221,7 +221,7 @@ public void new_stack_size_should_be_big_enought_to_store_probe_array() {

expectedVisitor.visitLabel(new Label());
expectedVisitor.visitLdcInsn("init");
expectedVisitor.visitMaxs(5, 9);
expectedVisitor.visitMaxs(5, 10);
}

@Test
Expand All @@ -233,85 +233,104 @@ public void new_stack_size_should_be_increased_for_probes() {

expectedVisitor.visitLabel(new Label());
expectedVisitor.visitLdcInsn("init");
expectedVisitor.visitMaxs(13, 9);
expectedVisitor.visitMaxs(13, 10);
}

@Test
public void visitFrame_should_insert_probe_variable_between_arguments_and_local_variables() {
public void visitFrame_should_insert_safety_slot_and_probe_variable_between_arguments_and_local_variables() {
ProbeInserter pi = new ProbeInserter(0, "m", "(J)V", actualVisitor,
arrayStrategy);

pi.visitFrame(Opcodes.F_NEW, 3,
new Object[] { "Foo", Opcodes.LONG, "java/lang/String" }, 0,
new Object[0]);

expectedVisitor.visitFrame(Opcodes.F_NEW, 4,
new Object[] { "Foo", Opcodes.LONG, "[Z", "java/lang/String" },
0, new Object[0]);
expectedVisitor.visitFrame(Opcodes.F_NEW, 5, new Object[] { //
"Foo", //
Opcodes.LONG, //
Opcodes.TOP, // safety slot
"[Z", // probe array
"java/lang/String" //
}, 0, new Object[0]);
}

@Test
public void visitFrame_should_only_insert_probe_variable_when_no_other_local_variables_exist() {
public void visitFrame_should_only_insert_safety_slot_and_probe_variable_when_no_other_local_variables_exist() {
ProbeInserter pi = new ProbeInserter(Opcodes.ACC_STATIC, "m", "()V",
actualVisitor, arrayStrategy);

pi.visitFrame(Opcodes.F_NEW, 0, new Object[] {}, 0, new Object[0]);

expectedVisitor.visitFrame(Opcodes.F_NEW, 1, new Object[] { "[Z" }, 0,
new Object[0]);
expectedVisitor.visitFrame(Opcodes.F_NEW, 2, new Object[] { //
Opcodes.TOP, // safety slot
"[Z", // probe array
}, 0, new Object[0]);
}

@Test
public void visitFrame_should_insert_probe_variable_first_when_no_parameters_exist() {
public void visitFrame_should_insert_safety_slot_and_probe_variable_first_when_no_parameters_exist() {
ProbeInserter pi = new ProbeInserter(Opcodes.ACC_STATIC, "m", "()V",
actualVisitor, arrayStrategy);

pi.visitFrame(Opcodes.F_NEW, 2, new Object[] { Opcodes.DOUBLE, "Foo" },
0, new Object[0]);

expectedVisitor.visitFrame(Opcodes.F_NEW, 3,
new Object[] { "[Z", Opcodes.DOUBLE, "Foo" }, 0, new Object[0]);
expectedVisitor.visitFrame(Opcodes.F_NEW, 4, new Object[] { //
Opcodes.TOP, // safety slot
"[Z", // probe array
Opcodes.DOUBLE, //
"Foo" //
}, 0, new Object[0]);
}

@Test
public void visitFrame_should_fill_one_unused_slots_before_probe_variable_with_TOP() {
public void visitFrame_should_fill_2_unused_slots_before_probe_variable_with_TOP_TOP() {
ProbeInserter pi = new ProbeInserter(Opcodes.ACC_STATIC, "m", "(I)V",
actualVisitor, arrayStrategy);

pi.visitFrame(Opcodes.F_NEW, 0, new Object[] {}, 0, new Object[] {});

// The locals in this frame are filled with TOP up to the probe variable
expectedVisitor.visitFrame(Opcodes.F_NEW, 2,
new Object[] { Opcodes.TOP, "[Z", }, 0, new Object[] {});
expectedVisitor.visitFrame(Opcodes.F_NEW, 3, new Object[] { //
Opcodes.TOP, //
Opcodes.TOP, // safety slot
"[Z", // probe array
}, 0, new Object[] {});
}

@Test
public void visitFrame_should_fill_two_unused_slots_before_probe_variable_with_TOP_TOP() {
public void visitFrame_should_fill_3_unused_slots_before_probe_variable_with_TOP_TOP_TOP() {
ProbeInserter pi = new ProbeInserter(Opcodes.ACC_STATIC, "m", "(J)V",
actualVisitor, arrayStrategy);

pi.visitFrame(Opcodes.F_NEW, 0, new Object[] {}, 0, new Object[] {});

// The locals in this frame are filled with TOP up to the probe variable
expectedVisitor.visitFrame(Opcodes.F_NEW, 3,
new Object[] { Opcodes.TOP, Opcodes.TOP, "[Z", }, 0,
new Object[] {});
expectedVisitor.visitFrame(Opcodes.F_NEW, 4, new Object[] { //
Opcodes.TOP, //
Opcodes.TOP, //
Opcodes.TOP, // safety slot
"[Z", // probe array
}, 0, new Object[] {});
}

@Test
public void visitFrame_should_fill_three_unused_slots_before_probe_variable_with_TOP_TOP_TOP() {
public void visitFrame_should_fill_4_unused_slots_before_probe_variable_with_TOP_TOP_TOP_TOP() {
ProbeInserter pi = new ProbeInserter(Opcodes.ACC_STATIC, "m", "(DIJ)V",
actualVisitor, arrayStrategy);

pi.visitFrame(Opcodes.F_NEW, 1, new Object[] { Opcodes.DOUBLE }, 0,
new Object[] {});

// The locals in this frame are filled with TOP up to the probe variable
expectedVisitor
.visitFrame(
Opcodes.F_NEW, 5, new Object[] { Opcodes.DOUBLE,
Opcodes.TOP, Opcodes.TOP, Opcodes.TOP, "[Z", },
0, new Object[] {});
expectedVisitor.visitFrame(Opcodes.F_NEW, 6, new Object[] { //
Opcodes.DOUBLE, //
Opcodes.TOP, //
Opcodes.TOP, //
Opcodes.TOP, //
Opcodes.TOP, // safety slot
"[Z", // probe array
}, 0, new Object[] {});
}

@Test(expected = IllegalArgumentException.class)
Expand Down

0 comments on commit ae8f2f2

Please sign in to comment.