Merge branch '2.10'

Author: cowtowncoder

parameter-names/src/test/java/com/fasterxml/jackson/module/paramnames/CreatorWithNamingStrategy74Test.java

@@ -0,0 +1,48 @@
+package com.fasterxml.jackson.module.paramnames;
+
+import static org.assertj.core.api.BDDAssertions.then;
+
+import com.fasterxml.jackson.annotation.*;
+
+import com.fasterxml.jackson.databind.*;
+
+import org.junit.Test;
+
+// for [java8-modules#74]
+public class CreatorWithNamingStrategy74Test
+    extends ModuleTestBase
+{
+    static class ClassWithTwoProperties {
+        public final int a;
+        public final int b;
+
+        public ClassWithTwoProperties(@JsonProperty("a") int a, @JsonProperty("b") int b) {
+            this.a = a;
+            this.b = b;
+        }
+    }
+
+    @Test
+    public void testPrivateConstructorWithAnnotations() throws Exception {
+        verifyObjectDeserializationWithNamingStrategy(
+                PropertyNamingStrategy.SNAKE_CASE,
+                "{\"a\":1, \"b\": 2}",
+                new ClassWithTwoProperties(1, 2));
+    }
+
+    private void verifyObjectDeserializationWithNamingStrategy(
+            final PropertyNamingStrategy propertyNamingStrategy, final String json, Object expected)
+            throws Exception {
+        // given
+        ObjectMapper objectMapper = newMapper()
+                        .setPropertyNamingStrategy(propertyNamingStrategy)
+                        .setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE)
+                        .setVisibility(PropertyAccessor.CREATOR, JsonAutoDetect.Visibility.ANY)
+                        .setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
+
+        // when
+        Object actual = objectMapper.readValue(json, expected.getClass());
+
+        then(actual).isEqualToComparingFieldByField(expected);
+    }
+}