Squash this shit

Author: bhargavg

Fixtures/InvalidLayouts/DirectTestsWithModules1/Package.swift

@@ -0,0 +1,3 @@
+class Foo {
+    var bar: Int = 0
+}

Fixtures/InvalidLayouts/DirectTestsWithModules1/Sources/ModuleA/Foo.swift

@@ -0,0 +1,18 @@
+import XCTest
+
+@testable import ModuleA
+
+class FooTests: XCTestCase {
+    func testSuccess() {
+    }
+}
+
+#if os(Linux)
+extension FooTests: XCTestCaseProvider {
+    var allTests: [(String, () throws -> Void)] {
+        return [
+            ("testSuccess", testSuccess),
+        ]
+    }
+}
+#endif

Fixtures/InvalidLayouts/DirectTestsWithModules1/Tests/FooTests.swift

@@ -0,0 +1,10 @@
+import XCTest
+
+@testable import DirectTestsWithModules1
+@testable import ModuleAtest
+
+XCTMain([
+    FooTests(),
+    BarTests(),
+])
+

Fixtures/InvalidLayouts/DirectTestsWithModules1/Tests/LinuxMain.swift

@@ -0,0 +1,19 @@
+import XCTest
+
+@testable import ModuleA
+
+class BarTests: XCTestCase {
+    func testSuccess() {
+    }
+}
+
+#if os(Linux)
+extension BarTests: XCTestCaseProvider {
+    var allTests: [(String, () throws -> Void)] {
+        return [
+            ("testSuccess", testSuccess),
+        ]
+    }
+}
+#endif
+

Fixtures/InvalidLayouts/DirectTestsWithModules1/Tests/ModuleA/ModuleATests.swift

@@ -0,0 +1,3 @@
+class Foo {
+    var bar: Int = 0
+}

Fixtures/InvalidLayouts/DirectTestsWithModules2/Package.swift

@@ -0,0 +1,19 @@
+import XCTest
+
+@testable import DirectTestsWithModules2
+
+class BarTests: XCTestCase {
+    func testSuccess() {
+    }
+}
+
+#if os(Linux)
+extension BarTests: XCTestCaseProvider {
+    var allTests: [(String, () throws -> Void)] {
+        return [
+            ("testSuccess", testSuccess),
+        ]
+    }
+}
+#endif
+

Fixtures/InvalidLayouts/DirectTestsWithModules2/Sources/Foo.swift

@@ -0,0 +1,16 @@
+import XCTest
+
+class FooTests: XCTestCase {
+    func testSuccess() {
+    }
+}
+
+#if os(Linux)
+extension FooTests: XCTestCaseProvider {
+    var allTests: [(String, () throws -> Void)] {
+        return [
+            ("testSuccess", testSuccess),
+        ]
+    }
+}
+#endif

Fixtures/InvalidLayouts/DirectTestsWithModules2/Tests/DirectTestsWithModules2/BarTests.swift

@@ -0,0 +1,10 @@
+import XCTest
+
+@testable import DirectTests
+@testable import DirectTestsWithModules2
+
+XCTMain([
+    FooTests(),
+    BarTests(),
+])
+

Fixtures/InvalidLayouts/DirectTestsWithModules2/Tests/FooTests.swift

@@ -4,3 +4,13 @@ class FooTests: XCTestCase {
     func testSuccess() {
     }
 }
+
+#if os(Linux)
+extension FooTests: XCTestCaseProvider {
+    var allTests: [(String, () throws -> Void)] {
+        return [
+            ("testSuccess", testSuccess),
+        ]
+    }
+}
+#endif

Fixtures/InvalidLayouts/DirectTestsWithModules2/Tests/LinuxMain.swift

@@ -14,17 +14,19 @@ import Utility
 extension Package {
     func testModules() throws -> [TestModule] {
         let (directories, files) = walk(path, "Tests", recursively: false).partition{ $0.isDirectory }
-        
-        if (directories.count > 0) {
-            return try directories
-                .filter { !excludes.contains($0) }
-                .map { TestModule(basename: $0.basename, sources: try self.sourcify($0)) }
-            
-        } else {
-            let rootTestFiles = files.filter { 
-                !$0.hasSuffix("LinuxMain.swift") && isValidSource($0)
+
+        let testDirectories = directories.filter{ !excludes.contains($0) }
+        let rootTestFiles = files.filter { 
+            !$0.hasSuffix("LinuxMain.swift") && isValidSource($0) && !excludes.contains($0)
+        }
+
+        if (testDirectories.count > 0 && rootTestFiles.count > 0) {
+            throw ModuleError.InvalidLayout(.InvalidLayout)            
+        } else if (testDirectories.count > 0) {
+            return try testDirectories.map { 
+                TestModule(basename: $0.basename, sources: try self.sourcify($0)) 
             }
-            
+        } else {
             if (rootTestFiles.count > 0) {
                 let rootTestSource = Sources(paths: rootTestFiles, root: path)
                 return [TestModule(basename: name, sources: rootTestSource)]

Fixtures/ValidLayouts/SingleModule/DirectTests/Tests/FooTests.swift

@@ -11,6 +11,7 @@
 import XCTest
 import func POSIX.rmdir
 import func POSIX.unlink
+import func POSIX.rename
 
 class InvalidLayoutsTestCase: XCTestCase {
 
@@ -111,4 +112,46 @@ class InvalidLayoutsTestCase: XCTestCase {
             XCTAssertBuilds(prefix)
         }
     }
+    
+    func testDirectTestsWithModules1() {
+        /*
+        Package
+        ├── Sources
+        │   └── ModuleA
+        │       └── Foo.swift
+        └── Tests
+            ├── FooTests.swift  <-- Invalid
+            └── ModuleA
+                └── ModuleATests.swift
+        */
+        
+        fixture(name: "InvalidLayouts/DirectTestsWithModules1") { prefix in
+            
+            XCTAssertBuildFails(prefix)
+            
+            try POSIX.unlink("\(prefix)/Tests/FooTests.swift")
+            XCTAssertBuilds(prefix)
+        }
+    }
+
+    func testDirectTestsWithModules2() {
+        /*
+        Package
+        ├── Sources
+        │   └── Foo.swift
+        └── Tests
+            ├── FooTests.swift      <-- Invalid
+            └── ImplicitModuleName
+                └── ModuleTests.swift
+        */
+        
+        fixture(name: "InvalidLayouts/DirectTestsWithModules1") { prefix in
+            
+            XCTAssertBuildFails(prefix)
+            
+            try POSIX.unlink("\(prefix)/Tests/FooTests.swift")
+            XCTAssertBuilds(prefix)
+        }
+    }
+
 }

Sources/Transmute/Package+testModules.swift

@@ -196,6 +196,7 @@ extension ValidLayoutsTestCase {
             ("testSingleModuleExecutable", testSingleModuleExecutable),
             ("testSingleModuleCustomizedName", testSingleModuleCustomizedName),
             ("testSingleModuleSubfolderWithSwiftSuffix", testSingleModuleSubfolderWithSwiftSuffix),
+            ("testEmptyPackageWithDirectTests", testEmptyPackageWithDirectTests),
             ("testMultipleModulesLibraries", testMultipleModulesLibraries),
             ("testMultipleModulesExecutables", testMultipleModulesExecutables),
             ("testPackageIdentifiers", testPackageIdentifiers),