From b9f86fe6ac05a3a11e6c05dece8cc08da9c50094 Mon Sep 17 00:00:00 2001
From: Filip Hrisafov <filip.hrisafov@gmail.com>
Date: Sun, 23 Feb 2020 17:10:00 +0100
Subject: [PATCH] #2018 Add test case with properties with underscore verifying
 that it is working as expected

---
 .../ap/test/bugs/_2018/Issue2018Mapper.java   | 22 +++++++++++
 .../ap/test/bugs/_2018/Issue2018Test.java     | 38 +++++++++++++++++++
 .../mapstruct/ap/test/bugs/_2018/Source.java  | 22 +++++++++++
 .../mapstruct/ap/test/bugs/_2018/Target.java  | 22 +++++++++++
 4 files changed, 104 insertions(+)
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2018/Issue2018Mapper.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2018/Issue2018Test.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2018/Source.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2018/Target.java

diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2018/Issue2018Mapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2018/Issue2018Mapper.java
new file mode 100644
index 000000000..b75450ce2
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2018/Issue2018Mapper.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2018;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author Filip Hrisafov
+ */
+@Mapper
+public interface Issue2018Mapper {
+
+    Issue2018Mapper INSTANCE = Mappers.getMapper( Issue2018Mapper.class );
+
+    @Mapping(target = "some_value", source = "someValue")
+    Target map(Source source);
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2018/Issue2018Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2018/Issue2018Test.java
new file mode 100644
index 000000000..21893e067
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2018/Issue2018Test.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2018;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mapstruct.ap.testutil.IssueKey;
+import org.mapstruct.ap.testutil.WithClasses;
+import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Filip Hrisafov
+ */
+@IssueKey("2018")
+@RunWith(AnnotationProcessorTestRunner.class)
+@WithClasses({
+    Issue2018Mapper.class,
+    Source.class,
+    Target.class
+})
+public class Issue2018Test {
+
+    @Test
+    public void shouldGenerateCorrectCode() {
+        Source source = new Source();
+        source.setSomeValue( "value" );
+
+        Target target = Issue2018Mapper.INSTANCE.map( source );
+
+        assertThat( target ).isNotNull();
+        assertThat( target.getSome_value() ).isEqualTo( "value" );
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2018/Source.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2018/Source.java
new file mode 100644
index 000000000..767952da1
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2018/Source.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2018;
+
+/**
+ * @author Filip Hrisafov
+ */
+public class Source {
+
+    private String someValue;
+
+    public String getSomeValue() {
+        return someValue;
+    }
+
+    public void setSomeValue(String someValue) {
+        this.someValue = someValue;
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2018/Target.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2018/Target.java
new file mode 100644
index 000000000..582acfbeb
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2018/Target.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2018;
+
+/**
+ * @author Filip Hrisafov
+ */
+public class Target {
+
+    private String some_value;
+
+    public String getSome_value() {
+        return some_value;
+    }
+
+    public void setSome_value(String some_value) {
+        this.some_value = some_value;
+    }
+}