From dfa0e6109428427c51f6caf1cfcdd2e40ffa8535 Mon Sep 17 00:00:00 2001
From: Andreas Schmid <service@aaschmid.de>
Date: Mon, 7 Jul 2014 21:16:50 +0200
Subject: [PATCH] inlined annotation for dataprovider using FrameworkMethod
 (#28)

---
 .../DataProviderJavaAcceptanceTest.java       | 25 +++++++++++++++----
 .../java/junit/dataprovider/ExternalFile.java | 21 ----------------
 2 files changed, 20 insertions(+), 26 deletions(-)
 delete mode 100644 src/test/java/com/tngtech/test/java/junit/dataprovider/ExternalFile.java

diff --git a/src/test/java/com/tngtech/test/java/junit/dataprovider/DataProviderJavaAcceptanceTest.java b/src/test/java/com/tngtech/test/java/junit/dataprovider/DataProviderJavaAcceptanceTest.java
index 3d86c50f..8b6c1475 100644
--- a/src/test/java/com/tngtech/test/java/junit/dataprovider/DataProviderJavaAcceptanceTest.java
+++ b/src/test/java/com/tngtech/test/java/junit/dataprovider/DataProviderJavaAcceptanceTest.java
@@ -3,6 +3,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.File;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -213,17 +217,14 @@ public void testStringLength2(String str, int expectedLength) {
             "1, DOWN",
             "3, FLOOR",
         })
-    // @formatter:off
+    // @formatter:on
     public void testOldModeToRoundingMode(int oldMode, RoundingMode expected) {
         // Expect:
         assertThat(RoundingMode.valueOf(oldMode)).isEqualTo(expected);
     }
 
     @Test
-    @DataProvider({
-            "null",
-            "",
-        })
+    @DataProvider({ "null", "", })
     public void testIsEmptyString2(String str) {
         // When:
         boolean isEmpty = (str == null) ? true : str.isEmpty();
@@ -232,9 +233,23 @@ public void testIsEmptyString2(String str) {
         assertThat(isEmpty).isTrue();
     }
 
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface ExternalFile {
+        public enum Format {
+            CSV,
+            XML,
+            XLS;
+        }
+
+        Format format();
+        String value();
+    }
+
     @DataProvider
     public static Object[][] loadFromExternalFile(FrameworkMethod testMethod) {
         String testDataFile = testMethod.getAnnotation(ExternalFile.class).value();
+        // Load the data from the external file here ...
         return new Object[][] { { testDataFile } };
     }
 
diff --git a/src/test/java/com/tngtech/test/java/junit/dataprovider/ExternalFile.java b/src/test/java/com/tngtech/test/java/junit/dataprovider/ExternalFile.java
deleted file mode 100644
index 04d11ecc..00000000
--- a/src/test/java/com/tngtech/test/java/junit/dataprovider/ExternalFile.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.tngtech.test.java.junit.dataprovider;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface ExternalFile {
-
-    public enum Format {
-        CSV,
-        XML,
-        XLS
-    }
-
-    Format format();
-
-    String value();
-}