Fixed test setup, added ServiceLoader based load mechanism for

implementations to be tested.

Author: atsticks

src/test/java/org/javamoney/tck/JSR354TestConfiguration.java

@@ -1,32 +1,44 @@
 /*
- * Copyright (c) 2012, 2013, Werner Keil, Credit Suisse (Anatole Tresch).
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- * 
- * 
- * Contributors: Anatole Tresch - initial version.
+ * Copyright (c) 2012, 2013, Werner Keil, Credit Suisse (Anatole Tresch). Licensed under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License. Contributors: Anatole Tresch - initial version.
  */
 package org.javamoney.tck;
 
-import java.lang.reflect.AccessibleObject;
 import java.util.Collection;
+import java.util.ServiceLoader;
 
-public interface JSR354TestConfiguration {
+import javax.money.CurrencyUnit;
+import javax.money.MonetaryAmount;
+import javax.money.spi.MonetaryAmountFactoryProviderSpi;
 
-	Collection<Class> getExceptionClasses();
+/**
+ * Libraries that implement this JSR and want to be tested with this TCK must implement this
+ * interface and register it using the {@link ServiceLoader}.
+ * 
+ * @author Anatole Tresch
+ */
+public interface JSR354TestConfiguration {
 
+	/**
+	 * Return a collection with all {@link MonetaryAmount} classes that are implemented. The list
+	 * must not be empty and should contain <b>every</b> amount class implemented.<br/>
+	 * This enables the TCK to check in addition to the basic implementation compliance, if
+	 * according {@link MonetaryAmountFactoryProviderSpi} are registered/available correctly.
+	 * 
+	 * @return a collection with all implemented amount classes, not null.
+	 */
 	Collection<Class> getAmountClasses();
 
+	/**
+	 * List a collection of {@link CurrencyUnit} implementation.<br/>
+	 * This enables the TCK to check the basic implementation compliance, 
+	 * @return
+	 */
 	Collection<Class> getCurrencyClasses();
 
 }

src/test/java/org/javamoney/tck/TCKTestSetup.java

@@ -2,46 +2,61 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
-
-import org.javamoney.moneta.FastMoney;
-import org.javamoney.moneta.Money;
+import java.util.ServiceLoader;
 
 public final class TCKTestSetup {
 
-	private static JSRTestSetup TEST_SETUP = new JSRTestSetup();
+	private static JSR354TestConfiguration TEST_CONFIG = loadTestConfiguration();
 
 	private TCKTestSetup() {
 	}
 
+	private static JSR354TestConfiguration loadTestConfiguration() {
+		try {
+			return ServiceLoader.load(JSR354TestConfiguration.class).iterator()
+					.next();
+		} catch (Exception e) {
+			try {
+				Class.forName("org.javamoney.moneta.Money");
+				return new JSRTestSetup();
+			} catch (Exception e2) {
+				throw new IllegalStateException("No valid implementation of "
+						+ JSR354TestConfiguration.class.getName()
+						+ " is registered with the ServiceLoader.");
+			}
+		}
+	}
+
 	public static JSR354TestConfiguration getTestConfiguration() {
-		// TODO load dynamicylly
-		return TEST_SETUP;
+		return TEST_CONFIG;
 	}
 
 	private static final class JSRTestSetup implements JSR354TestConfiguration {
 
-		@Override
-		public Collection<Class> getExceptionClasses() {
-			return Collections.emptySet();
-			// return Arrays
-			// .asList(new Class[] { CurrencyMismatchException.class,
-			// UnknownCurrencyException.class });
-		}
-
 		@Override
 		public Collection<Class> getAmountClasses() {
-			return Arrays
-					.asList(new Class[] { Money.class, FastMoney.class });
+			try {
+				return Arrays
+						.asList(new Class[] {
+								Class.forName("org.javamoney.moneta.Money"),
+								Class.forName("org.javamoney.moneta.FastMoney") });
+			} catch (ClassNotFoundException e) {
+				throw new IllegalStateException("No valid implementation of "
+						+ JSR354TestConfiguration.class.getName()
+						+ " is registered with the ServiceLoader.");
+			}
 		}
 
 		@Override
 		public Collection<Class> getCurrencyClasses() {
 			try {
 				return Arrays
-						.asList(new Class[] { Class.forName("org.javamoney.moneta.impl.JDKCurrencyAdapter") });
+						.asList(new Class[] { Class
+								.forName("org.javamoney.moneta.internal.JDKCurrencyAdapter") });
 			} catch (ClassNotFoundException e) {
-				return Collections.emptySet();
+				throw new IllegalStateException("No valid implementation of "
+						+ JSR354TestConfiguration.class.getName()
+						+ " is registered with the ServiceLoader.");
 			}
 		}
 

src/test/java/org/javamoney/tck/tests/ExceptionsTest.java

@@ -20,18 +20,6 @@ public void testTestSetup() {
 		assertNotNull(TCKTestSetup.getTestConfiguration());
 	}
 
-	@SpecAssertion(
-		section = "0",
-		id = "EnsurePackageSetup")
-	@Test
-	public void testExceptionClassesSetup() {
-		assertTrue(
-				"Implementation Packages not registered.",
-				TCKTestSetup.getTestConfiguration().getExceptionClasses() != null);
-		assertFalse("Implementation Packages not registered.",
-				TCKTestSetup.getTestConfiguration().getExceptionClasses()
-						.isEmpty());
-	}
 
 	@SpecAssertion(
 		section = "0",