Skip to content

Commit c60a71e

Browse files
committed
Merge branch '2.19'
2 parents 24c74c9 + 3d01889 commit c60a71e

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

avro/src/test/java/tools/jackson/dataformat/avro/failing/FileSerialization319Test.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import tools.jackson.databind.SequenceWriter;
1414
import tools.jackson.dataformat.avro.*;
1515
import tools.jackson.dataformat.avro.schema.AvroSchemaGenerator;
16+
import tools.jackson.dataformat.avro.testutil.failure.JacksonTestFailureExpected;
1617

1718
import static org.junit.jupiter.api.Assertions.assertEquals;
1819
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -22,6 +23,7 @@
2223
public class FileSerialization319Test extends AvroTestBase
2324
{
2425
// [dataformats-binary#319]
26+
@JacksonTestFailureExpected
2527
@Test
2628
public void testFileSerialization() throws Exception
2729
{

avro/src/test/java/tools/jackson/dataformat/avro/failing/POJOEvolution164Test.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.junit.jupiter.api.Test;
44

55
import tools.jackson.dataformat.avro.*;
6+
import tools.jackson.dataformat.avro.testutil.failure.JacksonTestFailureExpected;
67

78
import static org.junit.jupiter.api.Assertions.assertEquals;
89

@@ -15,6 +16,7 @@ static class MyClass {
1516

1617
private final AvroMapper MAPPER = getMapper();
1718

19+
@JacksonTestFailureExpected
1820
@Test
1921
public void testSimpleFieldRemove() throws Exception
2022
{

protobuf/src/test/java/tools/jackson/dataformat/protobuf/failing/GenerateNestedType73Test.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import tools.jackson.dataformat.protobuf.ProtobufMapper;
88
import tools.jackson.dataformat.protobuf.ProtobufTestBase;
99
import tools.jackson.dataformat.protobuf.schema.ProtobufSchema;
10+
import tools.jackson.dataformat.protobuf.testutil.failure.JacksonTestFailureExpected;
1011

1112
import static org.junit.jupiter.api.Assertions.assertNotNull;
1213

@@ -21,6 +22,7 @@ public class GenerateNestedType73Test extends ProtobufTestBase
2122
final ProtobufMapper MAPPER = new ProtobufMapper();
2223

2324
// [dataformats-binary#68]
25+
@JacksonTestFailureExpected
2426
@Test
2527
public void testNestedTypes() throws Exception
2628
{

0 commit comments

Comments
 (0)