unit test refactoring

FasterXML · Mar 16, 2014 · 9f6638d · 9f6638d
1 parent 9036ebc
commit 9f6638d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 52 deletions.
diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,7 @@ javax.xml.datatype, javax.xml.namespace, javax.xml.parsers
  <dependency>
  <groupId>com.fasterxml.jackson.core</groupId>
  <artifactId>jackson-annotations</artifactId>
- <version>${project.version}</version>
+ <version>2.4.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/MapSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/MapSerializer.java
@@ -7,7 +7,6 @@
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.introspect.Annotated;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonMapFormatVisitor;

diff --git a/...ml/jackson/failing/TestNameConflicts.java → ...n/failing/TestNameConflicts193And327.java b/...ml/jackson/failing/TestNameConflicts.java → ...n/failing/TestNameConflicts193And327.java
@@ -1,10 +1,9 @@
 package com.fasterxml.jackson.failing;
 
 import com.fasterxml.jackson.annotation.*;
-
 import com.fasterxml.jackson.databind.*;
 
-public class TestNameConflicts extends BaseMapTest
+public class TestNameConflicts193And327 extends BaseMapTest
 {
  static class Bean193
  {
@@ -26,10 +25,27 @@ int x()
  return value2;
  }
  }
+
+ /* We should only report an exception for cases where there is
+ * real ambiguity as to how to rename things; but not when everything
+ * has been explicitly defined
+ */
+ // [Issue#327]
+ @JsonPropertyOrder({ "prop1", "prop2" })
+ static class BogusConflictBean
+ {
+ @JsonProperty("prop1")
+ public int a = 2;
+
+ @JsonProperty("prop2")
+ public int getA() {
+ return 1;
+ }
+ }
 
  /*
  /**********************************************************
- /* Unit tests
+ /* Test methods
  /**********************************************************
  */
 
@@ -38,4 +54,11 @@ public void testIssue193() throws Exception
  String json = objectWriter().writeValueAsString(new Bean193(1, 2));
  assertNotNull(json);
  }
+
+ // [Issue#327]
+ public void testNonConflict() throws Exception
+ {
+ String json = objectMapper().writeValueAsString(new BogusConflictBean());
+ assertEquals(aposToQuotes("{'prop1':2,'prop2':1}"), json);
+ } 
 }
diff --git a/src/test/java/com/fasterxml/jackson/failing/TestPropertyConflicts.java b/src/test/java/com/fasterxml/jackson/failing/TestPropertyConflicts.java