Improve error message when addon version resolution fails.

forge · Aug 2, 2013 · 46009f4 · 46009f4
1 parent 6353532
commit 46009f4
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/...llian/core/src/main/java/org/jboss/forge/arquillian/ForgeDeploymentScenarioGenerator.java b/...llian/core/src/main/java/org/jboss/forge/arquillian/ForgeDeploymentScenarioGenerator.java
@@ -65,8 +65,10 @@ private Collection<DeploymentDescription> generateDependencyDeployments(Class<?>
                version = resolveVersionFromPOM(classUnderTest, addon.name());
                if (version == null)
                {
-                  throw new IllegalStateException("Could not resolve the version for " + addon.name()
-                           + ". Either specify the version for this test or add it to pom.xml");
+                  throw new IllegalStateException("Could not resolve the version for [" + addon.name()
+                           + "]. Either specify the version for this @" + AddonDependency.class.getSimpleName()
+                           + " in [" + classUnderTest.getName() + "] or add it to pom.xml located at ["
+                           + getPomFileFor(classUnderTest) + "]");
                }
             }
             else
@@ -100,13 +102,7 @@ private String resolveVersionFromPOM(Class<?> classUnderTest, String name)
       if (dependencyMap == null)
       {
          dependencyMap = new HashMap<String, String>();
-         URL resource = classUnderTest.getClassLoader().getResource("");
-         if (resource == null)
-         {
-            throw new IllegalStateException("Could not find the pom.xml for class " + classUnderTest.getName());
-         }
-         String directory = resource.getFile();
-         File pomFile = findBuildDescriptor(directory);
+         File pomFile = getPomFileFor(classUnderTest);
          try
          {
             List<Dependency> dependencies = ProjectHelper.INSTANCE.resolveDependenciesFromPOM(pomFile);
@@ -120,12 +116,25 @@ private String resolveVersionFromPOM(Class<?> classUnderTest, String name)
          }
          catch (Exception e)
          {
+            // TODO log this instead?
             e.printStackTrace();
          }
       }
       return dependencyMap.get(name);
    }
 
+   private File getPomFileFor(Class<?> classUnderTest)
+   {
+      URL resource = classUnderTest.getClassLoader().getResource("");
+      if (resource == null)
+      {
+         throw new IllegalStateException("Could not find the pom.xml for class " + classUnderTest.getName());
+      }
+      String directory = resource.getFile();
+      File pomFile = findBuildDescriptor(directory);
+      return pomFile;
+   }
+
    private File findBuildDescriptor(String classLocation)
    {
       File pom = null;