Reorganizing the UnitTests folder

hujunfeng · Oct 13, 2015 · 61cf563 · 61cf563
1 parent cdde149
commit 61cf563
Show file tree

Hide file tree

Showing 26 changed files with 69 additions and 137 deletions.
diff --git a/SwiftGen.xcodeproj/project.pbxproj b/SwiftGen.xcodeproj/project.pbxproj
diff --git a/UnitTests/Assets/AssetsTests.swift → UnitTests/TestSuites/AssetsTests.swift b/UnitTests/Assets/AssetsTests.swift → UnitTests/TestSuites/AssetsTests.swift
diff --git a/UnitTests/Colors/ColorsTests.swift → UnitTests/TestSuites/ColorsTests.swift b/UnitTests/Colors/ColorsTests.swift → UnitTests/TestSuites/ColorsTests.swift
@@ -18,7 +18,7 @@ class ColorsTests: XCTestCase {
         enumBuilder.addColorWithName("ArticleBackground", value: "#ffcc0099")
         let result = enumBuilder.build()
 
-        let expected = self.fixtureString("ListDefaults.swift.out")
+        let expected = self.fixtureString("ColorsListDefaults.swift.out")
         XCTDiffStrings(result, expected)
     }
 
@@ -27,7 +27,7 @@ class ColorsTests: XCTestCase {
         try! enumBuilder.parseTextFile(fixturePath("colors.txt"))
         let result = enumBuilder.build()
 
-        let expected = self.fixtureString("FileDefaults.swift.out")
+        let expected = self.fixtureString("ColorsFileDefaults.swift.out")
         XCTDiffStrings(result, expected)
     }
 

diff --git a/UnitTests/L10n/L10nTests.swift → UnitTests/TestSuites/L10nTests.swift b/UnitTests/L10n/L10nTests.swift → UnitTests/TestSuites/L10nTests.swift
@@ -17,7 +17,7 @@ class L10nTests: XCTestCase {
         enumBuilder.addEntry(L10nEnumBuilder.Entry(key: "Greetings", types: .Object, .Int))
         let result = enumBuilder.build()
 
-        let expected = self.fixtureString("EntriesWithDefaults.swift.out")
+        let expected = self.fixtureString("L10nEntriesWithDefaults.swift.out")
         XCTDiffStrings(result, expected)
     }
 
@@ -31,7 +31,7 @@ class L10nTests: XCTestCase {
         }
         let result = enumBuilder.build()
 
-        let expected = self.fixtureString("LinesWithDefaults.swift.out")
+        let expected = self.fixtureString("L10nLinesWithDefaults.swift.out")
         XCTDiffStrings(result, expected)
     }
 
@@ -40,7 +40,7 @@ class L10nTests: XCTestCase {
         try! enumBuilder.parseLocalizableStringsFile(fixturePath("Localizable.strings"))
         let result = enumBuilder.build()
 
-        let expected = self.fixtureString("FileWithDefaults.swift.out")
+        let expected = self.fixtureString("L10nFileWithDefaults.swift.out")
         XCTDiffStrings(result, expected)
     }
 
@@ -49,7 +49,7 @@ class L10nTests: XCTestCase {
         try! enumBuilder.parseLocalizableStringsFile(fixturePath("Localizable.strings"))
         let result = enumBuilder.build(enumName: "XCTLoc")
 
-        let expected = self.fixtureString("FileWithCustomName.swift.out")
+        let expected = self.fixtureString("L10nFileWithCustomName.swift.out")
         XCTDiffStrings(result, expected)
     }
 
@@ -58,7 +58,7 @@ class L10nTests: XCTestCase {
         try! enumBuilder.parseLocalizableStringsFile(fixturePath("Localizable.strings"))
         let result = enumBuilder.build(indentation: .Spaces(3))
 
-        let expected = self.fixtureString("FileWithCustomIndentation.swift.out")
+        let expected = self.fixtureString("L10nFileWithCustomIndentation.swift.out")
         XCTDiffStrings(result, expected)
     }
 

diff --git a/UnitTests/Storyboard/StoryboardTests.swift → UnitTests/TestSuites/StoryboardTests.swift b/UnitTests/Storyboard/StoryboardTests.swift → UnitTests/TestSuites/StoryboardTests.swift
@@ -22,7 +22,7 @@ class StoryboardTests: XCTestCase {
         enumBuilder.addStoryboardAtPath(self.fixturePath("Message.storyboard"))
         let result = enumBuilder.build()
 
-        let expected = self.fixtureString("MessageWithDefaults.swift.out")
+        let expected = self.fixtureString("StoryboardsMessageWithDefaults.swift.out")
         XCTDiffStrings(result, expected)
     }
 
@@ -31,7 +31,7 @@ class StoryboardTests: XCTestCase {
         enumBuilder.parseDirectory(self.fixturesDir)
         let result = enumBuilder.build()
 
-        let expected = self.fixtureString("AllWithDefaults.swift.out")
+        let expected = self.fixtureString("StoryboardsAllWithDefaults.swift.out")
         XCTDiffStrings(result, expected)
     }
 
@@ -40,7 +40,7 @@ class StoryboardTests: XCTestCase {
         enumBuilder.addStoryboardAtPath(self.fixturePath("Message.storyboard"))
         let result = enumBuilder.build(scenesStructName: "XCTAllScenes", seguesStructName: "XCTAllSegues")
 
-        let expected = self.fixtureString("MessageWithCustomNames.swift.out")
+        let expected = self.fixtureString("StoryboardsMessageWithCustomNames.swift.out")
         XCTDiffStrings(result, expected)
     }
 
@@ -49,7 +49,7 @@ class StoryboardTests: XCTestCase {
         enumBuilder.addStoryboardAtPath(self.fixturePath("Message.storyboard"))
         let result = enumBuilder.build(indentation: .Spaces(3))
 
-        let expected = self.fixtureString("MessageWithCustomIndentation.swift.out")
+        let expected = self.fixtureString("StoryboardsMessageWithCustomIndentation.swift.out")
         XCTDiffStrings(result, expected)
     }
 }
diff --git a/.../expected/AssetsEntriesDefaults.swift.out → .../expected/AssetsEntriesDefaults.swift.out b/.../expected/AssetsEntriesDefaults.swift.out → .../expected/AssetsEntriesDefaults.swift.out
diff --git a/...ets/expected/AssetsFileDefaults.swift.out → ...sts/expected/AssetsFileDefaults.swift.out b/...ets/expected/AssetsFileDefaults.swift.out → ...sts/expected/AssetsFileDefaults.swift.out
diff --git a/...ts/Colors/expected/FileDefaults.swift.out → ...sts/expected/ColorsFileDefaults.swift.out b/...ts/Colors/expected/FileDefaults.swift.out → ...sts/expected/ColorsFileDefaults.swift.out
diff --git a/...ts/Colors/expected/ListDefaults.swift.out → ...sts/expected/ColorsListDefaults.swift.out b/...ts/Colors/expected/ListDefaults.swift.out → ...sts/expected/ColorsListDefaults.swift.out
diff --git a/...0n/expected/EntriesWithDefaults.swift.out → ...xpected/L10nEntriesWithDefaults.swift.out b/...0n/expected/EntriesWithDefaults.swift.out → ...xpected/L10nEntriesWithDefaults.swift.out
diff --git a/...ected/FileWithCustomIndentation.swift.out → ...d/L10nFileWithCustomIndentation.swift.out b/...ected/FileWithCustomIndentation.swift.out → ...d/L10nFileWithCustomIndentation.swift.out
diff --git a/...10n/expected/FileWithCustomName.swift.out → ...expected/L10nFileWithCustomName.swift.out b/...10n/expected/FileWithCustomName.swift.out → ...expected/L10nFileWithCustomName.swift.out
diff --git a/.../L10n/expected/FileWithDefaults.swift.out → ...s/expected/L10nFileWithDefaults.swift.out b/.../L10n/expected/FileWithDefaults.swift.out → ...s/expected/L10nFileWithDefaults.swift.out
diff --git a/...L10n/expected/LinesWithDefaults.swift.out → .../expected/L10nLinesWithDefaults.swift.out b/...L10n/expected/LinesWithDefaults.swift.out → .../expected/L10nLinesWithDefaults.swift.out
diff --git a/...yboard/expected/AllWithDefaults.swift.out → ...cted/StoryboardsAllWithDefaults.swift.out b/...yboard/expected/AllWithDefaults.swift.out → ...cted/StoryboardsAllWithDefaults.swift.out
diff --git a/...ed/MessageWithCustomIndentation.swift.out → ...rdsMessageWithCustomIndentation.swift.out b/...ed/MessageWithCustomIndentation.swift.out → ...rdsMessageWithCustomIndentation.swift.out
diff --git a/...expected/MessageWithCustomNames.swift.out → ...oryboardsMessageWithCustomNames.swift.out b/...expected/MessageWithCustomNames.swift.out → ...oryboardsMessageWithCustomNames.swift.out
diff --git a/...rd/expected/MessageWithDefaults.swift.out → .../StoryboardsMessageWithDefaults.swift.out b/...rd/expected/MessageWithDefaults.swift.out → .../StoryboardsMessageWithDefaults.swift.out
diff --git a/...es.xcassets/Apple.imageset/Apple-icon.png → ...es.xcassets/Apple.imageset/Apple-icon.png b/...es.xcassets/Apple.imageset/Apple-icon.png → ...es.xcassets/Apple.imageset/Apple-icon.png
diff --git a/...ges.xcassets/Apple.imageset/Contents.json → ...ges.xcassets/Apple.imageset/Contents.json b/...ges.xcassets/Apple.imageset/Contents.json → ...ges.xcassets/Apple.imageset/Contents.json
diff --git a/....xcassets/Banana.imageset/Banana-icon.png → ....xcassets/Banana.imageset/Banana-icon.png b/....xcassets/Banana.imageset/Banana-icon.png → ....xcassets/Banana.imageset/Banana-icon.png
diff --git a/...es.xcassets/Banana.imageset/Contents.json → ...es.xcassets/Banana.imageset/Contents.json b/...es.xcassets/Banana.imageset/Contents.json → ...es.xcassets/Banana.imageset/Contents.json
diff --git a/UnitTests/L10n/fixtures/Localizable.strings → UnitTests/fixtures/Localizable.strings b/UnitTests/L10n/fixtures/Localizable.strings → UnitTests/fixtures/Localizable.strings
diff --git a/...ts/Storyboard/fixtures/Message.storyboard → UnitTests/fixtures/Message.storyboard b/...ts/Storyboard/fixtures/Message.storyboard → UnitTests/fixtures/Message.storyboard
diff --git a/...sts/Storyboard/fixtures/Wizard.storyboard → UnitTests/fixtures/Wizard.storyboard b/...sts/Storyboard/fixtures/Wizard.storyboard → UnitTests/fixtures/Wizard.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="txY-Mc-CKa">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="txY-Mc-CKa">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
@@ -15,6 +15,7 @@
                     <view key="view" contentMode="scaleToFill" id="wQH-MG-v6Y">
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                 </viewController>
@@ -33,6 +34,7 @@
                     <view key="view" contentMode="scaleToFill" id="N1u-m6-6Oc">
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                 </viewController>
@@ -51,6 +53,7 @@
                     <view key="view" contentMode="scaleToFill" id="rJE-c0-6Bp">
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                 </viewController>
@@ -69,6 +72,7 @@
                     <view key="view" contentMode="scaleToFill" id="kbD-ft-yfE">
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                 </viewController>

diff --git a/UnitTests/Colors/fixtures/colors.txt → UnitTests/fixtures/colors.txt b/UnitTests/Colors/fixtures/colors.txt → UnitTests/fixtures/colors.txt