#237 Improving test/method names

processor/src/test/java/org/mapstruct/ap/test/nullcheck/MyBigIntMapper.java

@@ -16,12 +16,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.npe;
+package org.mapstruct.ap.test.nullcheck;
 
 import java.math.BigInteger;
 
 /**
- *
  * @author Sjaak Derksen
  */
 public class MyBigIntMapper {

processor/src/test/java/org/mapstruct/ap/test/nullcheck/MyBigIntWrapper.java

@@ -16,12 +16,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.npe;
+package org.mapstruct.ap.test.nullcheck;
 
 import java.math.BigInteger;
 
 /**
- *
  * @author Sjaak Derksen
  */
 public class MyBigIntWrapper {

processor/src/test/java/org/mapstruct/ap/test/nullcheck/NullCheckTest.java

@@ -16,15 +16,16 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.npe;
+package org.mapstruct.ap.test.nullcheck;
 
-import static org.fest.assertions.Assertions.assertThat;
 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.fest.assertions.Assertions.assertThat;
+
 /**
  * Test for correct handling of null checks.
  *
@@ -40,10 +41,10 @@ import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
     Target.class
 })
 @RunWith(AnnotationProcessorTestRunner.class)
-public class NullPtrCheckTest {
+public class NullCheckTest {
 
-    @IssueKey( "214" )
     @Test(expected = NullPointerException.class)
+    @IssueKey("214")
     public void shouldThrowNullptrWhenCustomMapperIsInvoked() {
 
         Source source = new Source();
@@ -52,9 +53,9 @@ public class NullPtrCheckTest {
         SourceTargetMapper.INSTANCE.sourceToTarget( source );
     }
 
-    @IssueKey( "214" )
     @Test
-    public void shouldSurroundTypeConversionWithNPECheck() {
+    @IssueKey("214")
+    public void shouldSurroundTypeConversionWithNullCheck() {
 
         Source source = new Source();
         source.setSomeObject( new NullObject() );
@@ -65,9 +66,9 @@ public class NullPtrCheckTest {
 
     }
 
-    @IssueKey( "214" )
     @Test
-    public void shouldSurroundArrayListConstructionWithNPECheck() {
+    @IssueKey("214")
+    public void shouldSurroundArrayListConstructionWithNullCheck() {
 
         Source source = new Source();
         source.setSomeObject( new NullObject() );
@@ -77,9 +78,9 @@ public class NullPtrCheckTest {
         assertThat( target.getSomeList() ).isNull();
     }
 
-    @IssueKey( "237" )
     @Test
-    public void shouldMapMappedTypeConversion() {
+    @IssueKey("237")
+    public void shouldSurroundConversionPassedToMappingMethodWithNullCheck() {
 
         Source source = new Source();
         source.setSomeObject( new NullObject() );
@@ -88,5 +89,4 @@ public class NullPtrCheckTest {
         assertThat( target.getSomeList() ).isNull();
         assertThat( target.getSomeInteger() ).isNull();
     }
-
 }

processor/src/test/java/org/mapstruct/ap/test/nullcheck/NullObject.java

@@ -16,10 +16,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.npe;
+package org.mapstruct.ap.test.nullcheck;
 
 /**
- *
  * @author Sjaak Derksen
  */
 public class NullObject {

processor/src/test/java/org/mapstruct/ap/test/nullcheck/NullObjectMapper.java

@@ -16,10 +16,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.npe;
+package org.mapstruct.ap.test.nullcheck;
 
 /**
- *
  * @author Sjaak Derksen
  */
 public class NullObjectMapper {

processor/src/test/java/org/mapstruct/ap/test/nullcheck/Source.java

@@ -16,12 +16,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.npe;
+package org.mapstruct.ap.test.nullcheck;
 
 import java.util.List;
 
 /**
- *
  * @author Sjaak Derksen
  */
 public class Source {

processor/src/test/java/org/mapstruct/ap/test/nullcheck/SourceTargetMapper.java

@@ -16,13 +16,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.npe;
+package org.mapstruct.ap.test.nullcheck;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
 /**
- *
  * @author Sjaak Derksen
  */
 @Mapper(uses = { NullObjectMapper.class, MyBigIntMapper.class })

processor/src/test/java/org/mapstruct/ap/test/nullcheck/Target.java

@@ -16,12 +16,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.npe;
+package org.mapstruct.ap.test.nullcheck;
 
 import java.util.List;
 
 /**
- *
  * @author Sjaak Derksen
  */
 public class Target {
@@ -62,7 +61,4 @@ public class Target {
     public void setSomeInteger(MyBigIntWrapper someInteger) {
         this.someInteger = someInteger;
     }
-
-
-
 }