Fixed classpath entry merging issues with Gradle 4 (found and fixed w…

…ith 4.1)

core/src/main/java/fi/testee/classpath/ClasspathTransform.java

@@ -61,7 +61,7 @@ public static Collection<JavaArchive> transform(final Collection<JavaArchive> in
         // Directory entries transformed if matching
         in.stream()
                 .filter(it -> it instanceof DirectoryJavaArchive)
-                .peek(it -> LOG.trace("Processing directory java archive{}", it))
+                .peek(it -> LOG.trace("Processing directory java archive {}", it))
                 .map(it -> (DirectoryJavaArchive) it)
                 .filter(it -> getBuildDir(it) != null)
                 .collect(Collectors.groupingBy(ClasspathTransform::getBuildDir))
@@ -84,13 +84,15 @@ private static URL getBuildDir(final DirectoryJavaArchive it) {
     }
 
     private static URL getBuildDir(final String path) {
-        final Pattern pattern = Pattern.compile("(.*/build/)[^/]+(/[^/]+/)");
+        final Pattern pattern = Pattern.compile("(.*/build/)(([^/]+)|([^/]+/[^/]+))/((main)|(test))/?");
         final Matcher matcher = pattern.matcher(path);
         if (!matcher.matches()) {
             return null;
         }
+        final String url = matcher.group(1) + "[any]/" + matcher.group(5);
+        LOG.trace("{} -> {}", path, url);
         try {
-            return new URL(matcher.group(1) + "[any]" + matcher.group(2));
+            return new URL(url);
         } catch (final MalformedURLException e) {
             throw new TestEEfiException("Failed to build composite java archive URL", e);
         }

core/src/test/java/fi/testee/classpath/ClasspathTransformTest.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2017 Alex Stockinger
+ *
+ * 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.
+ */
+package fi.testee.classpath;
+
+import org.junit.Test;
+
+import java.io.File;
+
+import static fi.testee.classpath.ClasspathTransform.transform;
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
+
+public class ClasspathTransformTest {
+    @Test
+    public void gradle_3_3() {
+        assertEquals(1, transform(asList(
+                new DirectoryJavaArchive(new File("C:\\dev\\priv\\testee\\core\\build\\classes\\main")),
+                new DirectoryJavaArchive(new File("C:\\dev\\priv\\testee\\core\\build\\resources\\main"))
+        )).size());
+    }
+
+    @Test
+    public void gradle_4_1() {
+        assertEquals(1, transform(asList(
+                new DirectoryJavaArchive(new File("C:\\dev\\priv\\testee\\core\\build\\classes\\java\\main")),
+                new DirectoryJavaArchive(new File("C:\\dev\\priv\\testee\\core\\build\\resources\\main"))
+        )).size());
+    }
+}