Skip to content

Commit

Permalink
fix flaky test testNoneAccessWithXmlElements
Browse files Browse the repository at this point in the history
  • Loading branch information
RayZhang001 authored and cowtowncoder committed Sep 4, 2021
1 parent 446025b commit b17064b
Show file tree
Hide file tree
Showing 37 changed files with 81 additions and 74 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.fasterxml.jackson.databind.json.JsonMapper;
import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;

public abstract class BaseJaxbTest
public abstract class ModuleTestBase
extends junit.framework.TestCase
{
public static class NoCheckSubTypeValidator
Expand All @@ -25,7 +25,7 @@ public Validity validateBaseType(MapperConfig<?> config, JavaType baseType) {
}
}

protected BaseJaxbTest() { }
protected ModuleTestBase() { }

/*
/**********************************************************************
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector;

public class TestVersions extends BaseJaxbTest
public class TestVersions extends ModuleTestBase
{
public void testVersions()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

/**
* Tests for verifying JAXB adapter handling for {@link java.util.Map}
* types.
*/
public class TestAdaptedMapType extends BaseJaxbTest
public class TestAdaptedMapType extends ModuleTestBase
{
static class ObjectContainingAMap
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@

import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

/**
* Unit tests for checking that JAXB type adapters work (to some
* degree, anyway).
*/
public class TestAdapters extends BaseJaxbTest
public class TestAdapters extends ModuleTestBase
{
public static class SillyAdapter extends XmlAdapter<String, Date>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;
import com.fasterxml.jackson.module.jakarta.xmlbind.introspect.TestJaxbAnnotationIntrospector.KeyValuePair;

/**
* Unit tests to check that {@link XmlAdapter}s also work with
* container types (Lists, Maps)
*/
public class TestAdaptersForContainers extends BaseJaxbTest
public class TestAdaptersForContainers extends ModuleTestBase
{
// Support for Maps

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

/**
* Failing unit tests related to Adapter handling.
*/
public class TestIdentityAdapters extends BaseJaxbTest
public class TestIdentityAdapters extends ModuleTestBase
{
// [Issue-10]: Infinite recursion in "self" adapters
public static class IdentityAdapter extends XmlAdapter<IdentityAdapterBean, IdentityAdapterBean> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

public class TestUnwrapping extends BaseJaxbTest
public class TestUnwrapping extends ModuleTestBase
{
@XmlRootElement
static class Bean<R>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

// for [modules-base#46]: XmlId semantics can not be supported by Jackson/JAXB-annotation-mapper
public class TestXmlID3 extends BaseJaxbTest
public class TestXmlID3 extends ModuleTestBase
{
static class HasID
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

/**
* Simple testing to verify that XmlID and XMLIDREF handling works
* to degree we can make it work.
*/
public class TestXmlID extends BaseJaxbTest
public class TestXmlID extends ModuleTestBase
{
// From sample used in [http://blog.bdoughan.com/2010/10/jaxb-and-shared-references-xmlid-and.html]
@XmlRootElement
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

public class TestXmlID2 extends BaseJaxbTest
public class TestXmlID2 extends ModuleTestBase
{
@XmlRootElement(name = "department")
@XmlAccessorType(XmlAccessType.FIELD)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

import com.fasterxml.jackson.databind.*;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

/**
* Unit test(s) written for [JACKSON-303]; we should be able to detect setter
* even though it is not annotated, because there is matching annotated getter.
*/
public class TestAccessType extends BaseJaxbTest
public class TestAccessType extends ModuleTestBase
{
@XmlRootElement(name = "model")
@XmlAccessorType(XmlAccessType.NONE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

/**
* Unit test(s) to verify that annotations from super classes and
* interfaces are properly used (for example, wrt [JACKSON-450])
*/
public class TestAnnotationPriority extends BaseJaxbTest
public class TestAnnotationPriority extends ModuleTestBase
{
/*
/**********************************************************
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

/**
* Simple testing that <code>AnnotationIntrospector.Pair</code> works as
Expand All @@ -26,7 +26,7 @@
* @author Tatu Saloranta
*/
public class TestIntrospectorPair
extends BaseJaxbTest
extends ModuleTestBase
{
final static AnnotationIntrospector _jacksonAI = new JacksonAnnotationIntrospector();
final static AnnotationIntrospector _jaxbAI = new JakartaXmlBindAnnotationIntrospector(TypeFactory.defaultInstance());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@

import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

/**
* Tests for verifying that JAXB annotation based introspector
* implementation works as expected
*/
public class TestJaxbAnnotationIntrospector
extends BaseJaxbTest
extends ModuleTestBase
{
/*
/****************************************************
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@

import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

/**
* Tests for verifying auto-detection settings with JAXB annotations.
*
* @author Tatu Saloranta
*/
public class TestJaxbAutoDetect extends BaseJaxbTest
public class TestJaxbAutoDetect extends ModuleTestBase
{
/*
/**********************************************************
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

import com.fasterxml.jackson.databind.*;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

public class TestJaxbFieldAccess extends BaseJaxbTest
public class TestJaxbFieldAccess extends ModuleTestBase
{
/*
/**********************************************************
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

public class TestPropertyOrdering
extends BaseJaxbTest
extends ModuleTestBase
{
@XmlType(propOrder = {"cparty", "contacts"})
@XmlAccessorOrder(XmlAccessOrder.ALPHABETICAL)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

import com.fasterxml.jackson.databind.*;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

public class TestPropertyVisibility
extends BaseJaxbTest
extends ModuleTestBase
{
@XmlAccessorType(XmlAccessType.NONE)
protected static class Bean354
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

import com.fasterxml.jackson.databind.*;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

public class TestXmlValue extends BaseJaxbTest
public class TestXmlValue extends ModuleTestBase
{
static class WithXmlValueNoOverride
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import com.fasterxml.jackson.databind.deser.BeanDeserializer;
import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

public class TestDeserializerCaching extends BaseJaxbTest
public class TestDeserializerCaching extends ModuleTestBase
{
/*
/**********************************************************
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
import com.fasterxml.jackson.databind.MapperFeature;
import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

/**
* Unit tests to verify handling of @XmlElementWrapper annotation.
*/
public class TestElementWrapper extends BaseJaxbTest
public class TestElementWrapper extends ModuleTestBase
{
/*
/**********************************************************
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

public class TestEnums extends BaseJaxbTest
public class TestEnums extends ModuleTestBase
{
enum Plain { A, B; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector;
import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

/**
* Unit tests to ensure that handling of writing of null properties (or not)
* works when using JAXB annotation introspector.
*/
public class TestJaxbNullProperties
extends BaseJaxbTest
extends ModuleTestBase
{
/*
/**********************************************************
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

public class TestRootName extends BaseJaxbTest
public class TestRootName extends ModuleTestBase
{
/*
/**********************************************************
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.jsonschema.JsonSchema;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

/**
* Test(s) to see that JAXB annotations-based information is properly
Expand All @@ -16,7 +16,7 @@
* @author tatu
*/
@SuppressWarnings("deprecation")
public class TestSchemaGeneration extends BaseJaxbTest
public class TestSchemaGeneration extends ModuleTestBase
{
@XmlAccessorType(XmlAccessType.FIELD)
protected static class Person {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

public class TestSerializationInclusion extends BaseJaxbTest
public class TestSerializationInclusion extends ModuleTestBase
{
static class Data {
private final List<Object> stuff = new java.util.ArrayList<Object>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest;
import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase;

public class TestXmlAnyElementWithElementRef
extends BaseJaxbTest
extends ModuleTestBase
{
static class Bean {
@XmlAnyElement(lax=true)
Expand Down
Loading

0 comments on commit b17064b

Please sign in to comment.