Cleanup after rebase

mike011 · Mar 27, 2019 · 38277b7 · 38277b7
1 parent 423f300
commit 38277b7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/Source/SwiftLintFramework/Rules/FileTypesOrderRule.swift b/Source/SwiftLintFramework/Rules/FileTypesOrderRule.swift
@@ -2,7 +2,7 @@ import Foundation
 import SourceKittenFramework
 
 // swiftlint:disable:next type_body_length
-public struct FileTypesOrderRule: ConfigurationProviderRule, OptInRule {
+public struct FileTypesOrderRule: ConfigurationProviderRule, OptInRule, AutomaticTestableRule {
     private typealias FileTypeOffset = (fileType: FileType, offset: Int)
 
     public var configuration = FileTypesOrderConfiguration()

diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
@@ -468,6 +468,12 @@ extension FileNameRuleTests {
     ]
 }
 
+extension FileTypesOrderRuleTests {
+    static var allTests: [(String, (FileTypesOrderRuleTests) -> () throws -> Void)] = [
+        ("testWithDefaultConfiguration", testWithDefaultConfiguration)
+    ]
+}
+
 extension FirstWhereRuleTests {
     static var allTests: [(String, (FirstWhereRuleTests) -> () throws -> Void)] = [
         ("testWithDefaultConfiguration", testWithDefaultConfiguration)
@@ -1281,6 +1287,12 @@ extension TypeBodyLengthRuleTests {
     ]
 }
 
+extension TypeContentsOrderRuleTests {
+    static var allTests: [(String, (TypeContentsOrderRuleTests) -> () throws -> Void)] = [
+        ("testWithDefaultConfiguration", testWithDefaultConfiguration)
+    ]
+}
+
 extension TypeNameRuleTests {
     static var allTests: [(String, (TypeNameRuleTests) -> () throws -> Void)] = [
         ("testTypeName", testTypeName),
@@ -1528,6 +1540,7 @@ XCTMain([
     testCase(FileHeaderRuleTests.allTests),
     testCase(FileLengthRuleTests.allTests),
     testCase(FileNameRuleTests.allTests),
+    testCase(FileTypesOrderRuleTests.allTests),
     testCase(FirstWhereRuleTests.allTests),
     testCase(ForWhereRuleTests.allTests),
     testCase(ForceCastRuleTests.allTests),
@@ -1636,6 +1649,7 @@ XCTMain([
     testCase(TrailingSemicolonRuleTests.allTests),
     testCase(TrailingWhitespaceTests.allTests),
     testCase(TypeBodyLengthRuleTests.allTests),
+    testCase(TypeContentsOrderRuleTests.allTests),
     testCase(TypeNameRuleTests.allTests),
     testCase(UnavailableFunctionRuleTests.allTests),
     testCase(UnneededBreakInSwitchRuleTests.allTests),

diff --git a/Tests/SwiftLintFrameworkTests/AutomaticRuleTests.generated.swift b/Tests/SwiftLintFrameworkTests/AutomaticRuleTests.generated.swift
@@ -198,6 +198,12 @@ class FatalErrorMessageRuleTests: XCTestCase {
     }
 }
 
+class FileTypesOrderRuleTests: XCTestCase {
+    func testWithDefaultConfiguration() {
+        verifyRule(FileTypesOrderRule.description)
+    }
+}
+
 class FirstWhereRuleTests: XCTestCase {
     func testWithDefaultConfiguration() {
         verifyRule(FirstWhereRule.description)
@@ -648,6 +654,12 @@ class TypeBodyLengthRuleTests: XCTestCase {
     }
 }
 
+class TypeContentsOrderRuleTests: XCTestCase {
+    func testWithDefaultConfiguration() {
+        verifyRule(TypeContentsOrderRule.description)
+    }
+}
+
 class UnavailableFunctionRuleTests: XCTestCase {
     func testWithDefaultConfiguration() {
         verifyRule(UnavailableFunctionRule.description)