Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tests: group generated output files per command & output #598

Merged
merged 3 commits into from
Feb 10, 2019
Merged

Tests: group generated output files per command & output #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79705c6
Move output files into subdirs per template
djbe Feb 9, 2019
8e64166
Update references to output files
djbe Feb 9, 2019
0d0199f
Changelog entry
djbe Feb 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,11 @@ _None_
### Internal Changes

* Refactoring: Reduce globals & rearrange CLI code.
[#586](https://github.com/SwiftGen/SwiftGen/pull/586)
[@AliSoftware](https://github.com/AliSoftware)
[#586](https://github.com/SwiftGen/SwiftGen/pull/586)
* Moved generated test output files into subdirectories per template.
[David Jennes](https://github.com/djbe)
[#598](https://github.com/SwiftGen/SwiftGen/pull/598)

## 6.1.0

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/colors/literals-swift3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ extension ColorName {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/Colors/literals-swift3-context-defaults.swift)
[Full generated code](../../../Tests/Fixtures/Generated/Colors/literals-swift3/defaults.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/colors/literals-swift4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ extension ColorName {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/Colors/literals-swift4-context-defaults.swift)
[Full generated code](../../../Tests/Fixtures/Generated/Colors/literals-swift4/defaults.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/colors/swift3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct ColorName {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/Colors/swift3-context-defaults.swift)
[Full generated code](../../../Tests/Fixtures/Generated/Colors/swift3/defaults.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/colors/swift4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct ColorName {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/Colors/swift4-context-defaults.swift)
[Full generated code](../../../Tests/Fixtures/Generated/Colors/swift4/defaults.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/coredata/swift3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ extension MainEntity {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/CoreData/swift3-context-defaults.swift)
[Full generated code](../../../Tests/Fixtures/Generated/CoreData/swift3/defaults.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/coredata/swift4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ extension MainEntity {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/CoreData/swift4-context-defaults.swift)
[Full generated code](../../../Tests/Fixtures/Generated/CoreData/swift4/defaults.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/fonts/swift3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ enum FontFamily {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/Fonts/swift3-context-defaults.swift)
[Full generated code](../../../Tests/Fixtures/Generated/Fonts/swift3/defaults.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/fonts/swift4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ enum FontFamily {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/Fonts/swift4-context-defaults.swift)
[Full generated code](../../../Tests/Fixtures/Generated/Fonts/swift4/defaults.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/ib/scenes-swift3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ enum StoryboardScene {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/IB-iOS/scenes-swift3-context-all.swift)
[Full generated code](../../../Tests/Fixtures/Generated/IB-iOS/scenes-swift3/all.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/ib/scenes-swift4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ enum StoryboardScene {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/IB-iOS/scenes-swift4-context-all.swift)
[Full generated code](../../../Tests/Fixtures/Generated/IB-iOS/scenes-swift4/all.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/ib/segues-swift3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ enum StoryboardSegue {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/IB-iOS/swift3-context-all.swift)
[Full generated code](../../../Tests/Fixtures/Generated/IB-iOS/swift3/all.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/ib/segues-swift4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ enum StoryboardSegue {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/IB-iOS/swift4-context-all.swift)
[Full generated code](../../../Tests/Fixtures/Generated/IB-iOS/swift4/all.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/json/inline-swift3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ internal enum JSONFiles {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/JSON/inline-swift3-context-all.swift)
[Full generated code](../../../Tests/Fixtures/Generated/JSON/inline-swift3/all.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/json/inline-swift4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ internal enum JSONFiles {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/JSON/inline-swift4-context-all.swift)
[Full generated code](../../../Tests/Fixtures/Generated/JSON/inline-swift4/all.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/json/runtime-swift3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ internal enum JSONFiles {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/JSON/runtime-swift3-context-all.swift)
[Full generated code](../../../Tests/Fixtures/Generated/JSON/runtime-swift3/all.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/json/runtime-swift4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ internal enum JSONFiles {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/JSON/runtime-swift4-context-all.swift)
[Full generated code](../../../Tests/Fixtures/Generated/JSON/runtime-swift4/all.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/plist/inline-swift3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ internal enum PlistFiles {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/Plist/inline-swift3-context-all.swift)
[Full generated code](../../../Tests/Fixtures/Generated/Plist/inline-swift3/all.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/plist/inline-swift4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ internal enum PlistFiles {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/Plist/inline-swift4-context-all.swift)
[Full generated code](../../../Tests/Fixtures/Generated/Plist/inline-swift4/all.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/plist/runtime-swift3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ internal enum PlistFiles {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/Plist/runtime-swift3-context-all.swift)
[Full generated code](../../../Tests/Fixtures/Generated/Plist/runtime-swift3/all.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/plist/runtime-swift4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ internal enum PlistFiles {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/Plist/runtime-swift4-context-all.swift)
[Full generated code](../../../Tests/Fixtures/Generated/Plist/runtime-swift4/all.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/strings/flat-swift3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ enum L10n {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/Strings/flat-swift3-context-localizable.swift)
[Full generated code](../../../Tests/Fixtures/Generated/Strings/flat-swift3/localizable.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/strings/flat-swift4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ enum L10n {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/Strings/flat-swift4-context-localizable.swift)
[Full generated code](../../../Tests/Fixtures/Generated/Strings/flat-swift4/localizable.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/strings/structured-swift3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ enum L10n {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/Strings/structured-swift3-context-localizable.swift)
[Full generated code](../../../Tests/Fixtures/Generated/Strings/structured-swift3/localizable.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/strings/structured-swift4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ enum L10n {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/Strings/structured-swift4-context-localizable.swift)
[Full generated code](../../../Tests/Fixtures/Generated/Strings/structured-swift4/localizable.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/xcassets/swift3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ enum Asset {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/XCAssets/swift3-context-all.swift)
[Full generated code](../../../Tests/Fixtures/Generated/XCAssets/swift3/all.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/xcassets/swift4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ enum Asset {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/XCAssets/swift4-context-all.swift)
[Full generated code](../../../Tests/Fixtures/Generated/XCAssets/swift4/all.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/yaml/inline-swift3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ internal enum YAMLFiles {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/YAML/inline-swift3-context-all.swift)
[Full generated code](../../../Tests/Fixtures/Generated/YAML/inline-swift3/all.swift)

## Usage example

Expand Down
2 changes: 1 addition & 1 deletion Documentation/templates/yaml/inline-swift4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ internal enum YAMLFiles {
}
```

[Full generated code](../../../Tests/Fixtures/Generated/YAML/inline-swift4-context-all.swift)
[Full generated code](../../../Tests/Fixtures/Generated/YAML/inline-swift4/all.swift)

## Usage example

Expand Down
0 ...-swift3-context-defaults-customName.swift → ...literals-swift3/defaults-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...wift3-context-defaults-publicAccess.swift → ...terals-swift3/defaults-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...rs/literals-swift3-context-defaults.swift → ...ted/Colors/literals-swift3/defaults.swift
View file
Open in desktop
File renamed without changes.
0 ...olors/literals-swift3-context-empty.swift → ...erated/Colors/literals-swift3/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...rs/literals-swift3-context-multiple.swift → ...ted/Colors/literals-swift3/multiple.swift
View file
Open in desktop
File renamed without changes.
0 ...-swift4-context-defaults-customName.swift → ...literals-swift4/defaults-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...wift4-context-defaults-publicAccess.swift → ...terals-swift4/defaults-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...rs/literals-swift4-context-defaults.swift → ...ted/Colors/literals-swift4/defaults.swift
View file
Open in desktop
File renamed without changes.
0 ...olors/literals-swift4-context-empty.swift → ...erated/Colors/literals-swift4/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...rs/literals-swift4-context-multiple.swift → ...ted/Colors/literals-swift4/multiple.swift
View file
Open in desktop
File renamed without changes.
0 .../swift3-context-defaults-customName.swift → ...d/Colors/swift3/defaults-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...wift3-context-defaults-publicAccess.swift → ...Colors/swift3/defaults-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...ated/Colors/swift3-context-defaults.swift → ...es/Generated/Colors/swift3/defaults.swift
View file
Open in desktop
File renamed without changes.
0 ...nerated/Colors/swift3-context-empty.swift → ...tures/Generated/Colors/swift3/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...ated/Colors/swift3-context-multiple.swift → ...es/Generated/Colors/swift3/multiple.swift
View file
Open in desktop
File renamed without changes.
0 .../swift4-context-defaults-customName.swift → ...d/Colors/swift4/defaults-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...wift4-context-defaults-publicAccess.swift → ...Colors/swift4/defaults-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...ated/Colors/swift4-context-defaults.swift → ...es/Generated/Colors/swift4/defaults.swift
View file
Open in desktop
File renamed without changes.
0 ...nerated/Colors/swift4-context-empty.swift → ...tures/Generated/Colors/swift4/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...ated/Colors/swift4-context-multiple.swift → ...es/Generated/Colors/swift4/multiple.swift
View file
Open in desktop
File renamed without changes.
0 ...wift3-context-defaults-extraImports.swift → ...reData/swift3/defaults-extraImports.swift
View file
Open in desktop
File renamed without changes.
0 ...3-context-defaults-generateObjcName.swift → ...ta/swift3/defaults-generateObjcName.swift
View file
Open in desktop
File renamed without changes.
0 ...context-defaults-importCoreLocation.swift → .../swift3/defaults-importCoreLocation.swift
View file
Open in desktop
File renamed without changes.
0 ...wift3-context-defaults-publicAccess.swift → ...reData/swift3/defaults-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...ed/CoreData/swift3-context-defaults.swift → .../Generated/CoreData/swift3/defaults.swift
View file
Open in desktop
File renamed without changes.
0 ...rated/CoreData/swift3-context-empty.swift → ...res/Generated/CoreData/swift3/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...wift4-context-defaults-extraImports.swift → ...reData/swift4/defaults-extraImports.swift
View file
Open in desktop
File renamed without changes.
0 ...4-context-defaults-generateObjcName.swift → ...ta/swift4/defaults-generateObjcName.swift
View file
Open in desktop
File renamed without changes.
0 ...context-defaults-importCoreLocation.swift → .../swift4/defaults-importCoreLocation.swift
View file
Open in desktop
File renamed without changes.
0 ...wift4-context-defaults-publicAccess.swift → ...reData/swift4/defaults-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...ed/CoreData/swift4-context-defaults.swift → .../Generated/CoreData/swift4/defaults.swift
View file
Open in desktop
File renamed without changes.
0 ...rated/CoreData/swift4-context-empty.swift → ...res/Generated/CoreData/swift4/empty.swift
View file
Open in desktop
File renamed without changes.
0 .../swift3-context-defaults-customName.swift → ...ed/Fonts/swift3/defaults-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...wift3-context-defaults-preservePath.swift → .../Fonts/swift3/defaults-preservePath.swift
View file
Open in desktop
File renamed without changes.
0 ...wift3-context-defaults-publicAccess.swift → .../Fonts/swift3/defaults-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...rated/Fonts/swift3-context-defaults.swift → ...res/Generated/Fonts/swift3/defaults.swift
View file
Open in desktop
File renamed without changes.
0 ...enerated/Fonts/swift3-context-empty.swift → ...xtures/Generated/Fonts/swift3/empty.swift
View file
Open in desktop
File renamed without changes.
0 .../swift4-context-defaults-customName.swift → ...ed/Fonts/swift4/defaults-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...wift4-context-defaults-preservePath.swift → .../Fonts/swift4/defaults-preservePath.swift
View file
Open in desktop
File renamed without changes.
0 ...wift4-context-defaults-publicAccess.swift → .../Fonts/swift4/defaults-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...rated/Fonts/swift4-context-defaults.swift → ...res/Generated/Fonts/swift4/defaults.swift
View file
Open in desktop
File renamed without changes.
0 ...enerated/Fonts/swift4-context-empty.swift → ...xtures/Generated/Fonts/swift4/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...cenes-swift3-context-all-customName.swift → ...IB-iOS/scenes-swift3/all-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...-ignoreTargetModule-withExtraModule.swift → ...-ignoreTargetModule-withExtraModule.swift
View file
Open in desktop
File renamed without changes.
0 ...ift3-context-all-ignoreTargetModule.swift → ...cenes-swift3/all-ignoreTargetModule.swift
View file
Open in desktop
File renamed without changes.
0 ...-swift3-context-all-noDefinedModule.swift → ...S/scenes-swift3/all-noDefinedModule.swift
View file
Open in desktop
File renamed without changes.
0 ...nes-swift3-context-all-publicAccess.swift → ...-iOS/scenes-swift3/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...-swift3-context-all-withExtraModule.swift → ...S/scenes-swift3/all-withExtraModule.swift
View file
Open in desktop
File renamed without changes.
0 ...ed/IB-iOS/scenes-swift3-context-all.swift → .../Generated/IB-iOS/scenes-swift3/all.swift
View file
Open in desktop
File renamed without changes.
0 .../IB-iOS/scenes-swift3-context-empty.swift → ...enerated/IB-iOS/scenes-swift3/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...cenes-swift4-context-all-customName.swift → ...IB-iOS/scenes-swift4/all-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...-ignoreTargetModule-withExtraModule.swift → ...-ignoreTargetModule-withExtraModule.swift
View file
Open in desktop
File renamed without changes.
0 ...ift4-context-all-ignoreTargetModule.swift → ...cenes-swift4/all-ignoreTargetModule.swift
View file
Open in desktop
File renamed without changes.
0 ...-swift4-context-all-noDefinedModule.swift → ...S/scenes-swift4/all-noDefinedModule.swift
View file
Open in desktop
File renamed without changes.
0 ...nes-swift4-context-all-publicAccess.swift → ...-iOS/scenes-swift4/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...-swift4-context-all-withExtraModule.swift → ...S/scenes-swift4/all-withExtraModule.swift
View file
Open in desktop
File renamed without changes.
0 ...ed/IB-iOS/scenes-swift4-context-all.swift → .../Generated/IB-iOS/scenes-swift4/all.swift
View file
Open in desktop
File renamed without changes.
0 .../IB-iOS/scenes-swift4-context-empty.swift → ...enerated/IB-iOS/scenes-swift4/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...egues-swift3-context-all-customName.swift → ...IB-iOS/segues-swift3/all-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...-ignoreTargetModule-withExtraModule.swift → ...-ignoreTargetModule-withExtraModule.swift
View file
Open in desktop
File renamed without changes.
0 ...ift3-context-all-ignoreTargetModule.swift → ...egues-swift3/all-ignoreTargetModule.swift
View file
Open in desktop
File renamed without changes.
0 ...-swift3-context-all-noDefinedModule.swift → ...S/segues-swift3/all-noDefinedModule.swift
View file
Open in desktop
File renamed without changes.
0 ...ues-swift3-context-all-publicAccess.swift → ...-iOS/segues-swift3/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...-swift3-context-all-withExtraModule.swift → ...S/segues-swift3/all-withExtraModule.swift
View file
Open in desktop
File renamed without changes.
0 ...ed/IB-iOS/segues-swift3-context-all.swift → .../Generated/IB-iOS/segues-swift3/all.swift
View file
Open in desktop
File renamed without changes.
0 .../IB-iOS/segues-swift3-context-empty.swift → ...enerated/IB-iOS/segues-swift3/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...egues-swift4-context-all-customName.swift → ...IB-iOS/segues-swift4/all-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...-ignoreTargetModule-withExtraModule.swift → ...-ignoreTargetModule-withExtraModule.swift
View file
Open in desktop
File renamed without changes.
0 ...ift4-context-all-ignoreTargetModule.swift → ...egues-swift4/all-ignoreTargetModule.swift
View file
Open in desktop
File renamed without changes.
0 ...-swift4-context-all-noDefinedModule.swift → ...S/segues-swift4/all-noDefinedModule.swift
View file
Open in desktop
File renamed without changes.
0 ...ues-swift4-context-all-publicAccess.swift → ...-iOS/segues-swift4/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...-swift4-context-all-withExtraModule.swift → ...S/segues-swift4/all-withExtraModule.swift
View file
Open in desktop
File renamed without changes.
0 ...ed/IB-iOS/segues-swift4-context-all.swift → .../Generated/IB-iOS/segues-swift4/all.swift
View file
Open in desktop
File renamed without changes.
0 .../IB-iOS/segues-swift4-context-empty.swift → ...enerated/IB-iOS/segues-swift4/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...cenes-swift3-context-all-customName.swift → ...-macOS/scenes-swift3/all-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...-ignoreTargetModule-withExtraModule.swift → ...-ignoreTargetModule-withExtraModule.swift
View file
Open in desktop
File renamed without changes.
0 ...ift3-context-all-ignoreTargetModule.swift → ...cenes-swift3/all-ignoreTargetModule.swift
View file
Open in desktop
File renamed without changes.
0 ...-swift3-context-all-noDefinedModule.swift → ...S/scenes-swift3/all-noDefinedModule.swift
View file
Open in desktop
File renamed without changes.
0 ...nes-swift3-context-all-publicAccess.swift → ...acOS/scenes-swift3/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...-swift3-context-all-withExtraModule.swift → ...S/scenes-swift3/all-withExtraModule.swift
View file
Open in desktop
File renamed without changes.
0 .../IB-macOS/scenes-swift3-context-all.swift → ...enerated/IB-macOS/scenes-swift3/all.swift
View file
Open in desktop
File renamed without changes.
0 ...B-macOS/scenes-swift3-context-empty.swift → ...erated/IB-macOS/scenes-swift3/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...cenes-swift4-context-all-customName.swift → ...-macOS/scenes-swift4/all-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...-ignoreTargetModule-withExtraModule.swift → ...-ignoreTargetModule-withExtraModule.swift
View file
Open in desktop
File renamed without changes.
0 ...ift4-context-all-ignoreTargetModule.swift → ...cenes-swift4/all-ignoreTargetModule.swift
View file
Open in desktop
File renamed without changes.
0 ...-swift4-context-all-noDefinedModule.swift → ...S/scenes-swift4/all-noDefinedModule.swift
View file
Open in desktop
File renamed without changes.
0 ...nes-swift4-context-all-publicAccess.swift → ...acOS/scenes-swift4/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...-swift4-context-all-withExtraModule.swift → ...S/scenes-swift4/all-withExtraModule.swift
View file
Open in desktop
File renamed without changes.
0 .../IB-macOS/scenes-swift4-context-all.swift → ...enerated/IB-macOS/scenes-swift4/all.swift
View file
Open in desktop
File renamed without changes.
0 ...B-macOS/scenes-swift4-context-empty.swift → ...erated/IB-macOS/scenes-swift4/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...egues-swift3-context-all-customName.swift → ...-macOS/segues-swift3/all-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...-ignoreTargetModule-withExtraModule.swift → ...-ignoreTargetModule-withExtraModule.swift
View file
Open in desktop
File renamed without changes.
0 ...ift3-context-all-ignoreTargetModule.swift → ...egues-swift3/all-ignoreTargetModule.swift
View file
Open in desktop
File renamed without changes.
0 ...-swift3-context-all-noDefinedModule.swift → ...S/segues-swift3/all-noDefinedModule.swift
View file
Open in desktop
File renamed without changes.
0 ...ues-swift3-context-all-publicAccess.swift → ...acOS/segues-swift3/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...-swift3-context-all-withExtraModule.swift → ...S/segues-swift3/all-withExtraModule.swift
View file
Open in desktop
File renamed without changes.
0 .../IB-macOS/segues-swift3-context-all.swift → ...enerated/IB-macOS/segues-swift3/all.swift
View file
Open in desktop
File renamed without changes.
0 ...B-macOS/segues-swift3-context-empty.swift → ...erated/IB-macOS/segues-swift3/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...egues-swift4-context-all-customName.swift → ...-macOS/segues-swift4/all-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...-ignoreTargetModule-withExtraModule.swift → ...-ignoreTargetModule-withExtraModule.swift
View file
Open in desktop
File renamed without changes.
0 ...ift4-context-all-ignoreTargetModule.swift → ...egues-swift4/all-ignoreTargetModule.swift
View file
Open in desktop
File renamed without changes.
0 ...-swift4-context-all-noDefinedModule.swift → ...S/segues-swift4/all-noDefinedModule.swift
View file
Open in desktop
File renamed without changes.
0 ...ues-swift4-context-all-publicAccess.swift → ...acOS/segues-swift4/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...-swift4-context-all-withExtraModule.swift → ...S/segues-swift4/all-withExtraModule.swift
View file
Open in desktop
File renamed without changes.
0 .../IB-macOS/segues-swift4-context-all.swift → ...enerated/IB-macOS/segues-swift4/all.swift
View file
Open in desktop
File renamed without changes.
0 ...B-macOS/segues-swift4-context-empty.swift → ...erated/IB-macOS/segues-swift4/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...nline-swift3-context-all-customName.swift → ...d/JSON/inline-swift3/all-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...ine-swift3-context-all-publicAccess.swift → ...JSON/inline-swift3/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...ated/JSON/inline-swift3-context-all.swift → ...es/Generated/JSON/inline-swift3/all.swift
View file
Open in desktop
File renamed without changes.
0 ...ed/JSON/inline-swift3-context-empty.swift → .../Generated/JSON/inline-swift3/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...nline-swift4-context-all-customName.swift → ...d/JSON/inline-swift4/all-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...ine-swift4-context-all-publicAccess.swift → ...JSON/inline-swift4/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...ated/JSON/inline-swift4-context-all.swift → ...es/Generated/JSON/inline-swift4/all.swift
View file
Open in desktop
File renamed without changes.
0 ...ed/JSON/inline-swift4-context-empty.swift → .../Generated/JSON/inline-swift4/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...ntime-swift3-context-all-customname.swift → .../JSON/runtime-swift3/all-customname.swift
View file
Open in desktop
File renamed without changes.
0 ...ime-swift3-context-all-preservePath.swift → ...SON/runtime-swift3/all-preservePath.swift
View file
Open in desktop
File renamed without changes.
0 ...ime-swift3-context-all-publicAccess.swift → ...SON/runtime-swift3/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...ted/JSON/runtime-swift3-context-all.swift → ...s/Generated/JSON/runtime-swift3/all.swift
View file
Open in desktop
File renamed without changes.
0 ...d/JSON/runtime-swift3-context-empty.swift → ...Generated/JSON/runtime-swift3/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...ntime-swift4-context-all-customname.swift → .../JSON/runtime-swift4/all-customname.swift
View file
Open in desktop
File renamed without changes.
0 ...ime-swift4-context-all-preservePath.swift → ...SON/runtime-swift4/all-preservePath.swift
View file
Open in desktop
File renamed without changes.
0 ...ime-swift4-context-all-publicAccess.swift → ...SON/runtime-swift4/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...ted/JSON/runtime-swift4-context-all.swift → ...s/Generated/JSON/runtime-swift4/all.swift
View file
Open in desktop
File renamed without changes.
0 ...d/JSON/runtime-swift4-context-empty.swift → ...Generated/JSON/runtime-swift4/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...nline-swift3-context-all-customname.swift → .../Plist/inline-swift3/all-customname.swift
View file
Open in desktop
File renamed without changes.
0 ...ine-swift3-context-all-publicAccess.swift → ...list/inline-swift3/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...ted/Plist/inline-swift3-context-all.swift → ...s/Generated/Plist/inline-swift3/all.swift
View file
Open in desktop
File renamed without changes.
0 ...d/Plist/inline-swift3-context-empty.swift → ...Generated/Plist/inline-swift3/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...nline-swift4-context-all-customname.swift → .../Plist/inline-swift4/all-customname.swift
View file
Open in desktop
File renamed without changes.
0 ...ine-swift4-context-all-publicAccess.swift → ...list/inline-swift4/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...ted/Plist/inline-swift4-context-all.swift → ...s/Generated/Plist/inline-swift4/all.swift
View file
Open in desktop
File renamed without changes.
0 ...d/Plist/inline-swift4-context-empty.swift → ...Generated/Plist/inline-swift4/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...ntime-swift3-context-all-customName.swift → ...Plist/runtime-swift3/all-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...ime-swift3-context-all-preservePath.swift → ...ist/runtime-swift3/all-preservePath.swift
View file
Open in desktop
File renamed without changes.
0 ...ime-swift3-context-all-publicAccess.swift → ...ist/runtime-swift3/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...ed/Plist/runtime-swift3-context-all.swift → .../Generated/Plist/runtime-swift3/all.swift
View file
Open in desktop
File renamed without changes.
0 .../Plist/runtime-swift3-context-empty.swift → ...enerated/Plist/runtime-swift3/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...ntime-swift4-context-all-customName.swift → ...Plist/runtime-swift4/all-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...ime-swift4-context-all-preservePath.swift → ...ist/runtime-swift4/all-preservePath.swift
View file
Open in desktop
File renamed without changes.
0 ...ime-swift4-context-all-publicAccess.swift → ...ist/runtime-swift4/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...ed/Plist/runtime-swift4-context-all.swift → .../Generated/Plist/runtime-swift4/all.swift
View file
Open in desktop
File renamed without changes.
0 .../Plist/runtime-swift4-context-empty.swift → ...enerated/Plist/runtime-swift4/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...d/Strings/flat-swift3-context-empty.swift → ...Generated/Strings/flat-swift3/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...ift3-context-localizable-customName.swift → .../flat-swift3/localizable-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...ift3-context-localizable-noComments.swift → .../flat-swift3/localizable-noComments.swift
View file
Open in desktop
File renamed without changes.
0 ...t3-context-localizable-publicAccess.swift → ...lat-swift3/localizable-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...ngs/flat-swift3-context-localizable.swift → ...ted/Strings/flat-swift3/localizable.swift
View file
Open in desktop
File renamed without changes.
0 ...trings/flat-swift3-context-multiple.swift → ...erated/Strings/flat-swift3/multiple.swift
View file
Open in desktop
File renamed without changes.
0 ...d/Strings/flat-swift4-context-empty.swift → ...Generated/Strings/flat-swift4/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...ift4-context-localizable-customName.swift → .../flat-swift4/localizable-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...ift4-context-localizable-noComments.swift → .../flat-swift4/localizable-noComments.swift
View file
Open in desktop
File renamed without changes.
0 ...t4-context-localizable-publicAccess.swift → ...lat-swift4/localizable-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...ngs/flat-swift4-context-localizable.swift → ...ted/Strings/flat-swift4/localizable.swift
View file
Open in desktop
File renamed without changes.
0 ...trings/flat-swift4-context-multiple.swift → ...erated/Strings/flat-swift4/multiple.swift
View file
Open in desktop
File renamed without changes.
0 ...ngs/structured-swift3-context-empty.swift → ...ted/Strings/structured-swift3/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...ift3-context-localizable-customName.swift → ...tured-swift3/localizable-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...ift3-context-localizable-noComments.swift → ...tured-swift3/localizable-noComments.swift
View file
Open in desktop
File renamed without changes.
0 ...t3-context-localizable-publicAccess.swift → ...red-swift3/localizable-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...ructured-swift3-context-localizable.swift → ...rings/structured-swift3/localizable.swift
View file
Open in desktop
File renamed without changes.
0 .../structured-swift3-context-multiple.swift → .../Strings/structured-swift3/multiple.swift
View file
Open in desktop
File renamed without changes.
0 ...ngs/structured-swift4-context-empty.swift → ...ted/Strings/structured-swift4/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...ift4-context-localizable-customName.swift → ...tured-swift4/localizable-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...ift4-context-localizable-noComments.swift → ...tured-swift4/localizable-noComments.swift
View file
Open in desktop
File renamed without changes.
0 ...t4-context-localizable-publicAccess.swift → ...red-swift4/localizable-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...ructured-swift4-context-localizable.swift → ...rings/structured-swift4/localizable.swift
View file
Open in desktop
File renamed without changes.
0 .../structured-swift4-context-multiple.swift → .../Strings/structured-swift4/multiple.swift
View file
Open in desktop
File renamed without changes.
0 ...Assets/swift3-context-all-allValues.swift → ...rated/XCAssets/swift3/all-allValues.swift
View file
Open in desktop
File renamed without changes.
0 ...ssets/swift3-context-all-customName.swift → ...ated/XCAssets/swift3/all-customName.swift
View file
Open in desktop
File renamed without changes.
0 .../swift3-context-all-forceNamespaces.swift → ...XCAssets/swift3/all-forceNamespaces.swift
View file
Open in desktop
File renamed without changes.
0 ...ets/swift3-context-all-publicAccess.swift → ...ed/XCAssets/swift3/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...nerated/XCAssets/swift3-context-all.swift → ...tures/Generated/XCAssets/swift3/all.swift
View file
Open in desktop
File renamed without changes.
0 ...rated/XCAssets/swift3-context-empty.swift → ...res/Generated/XCAssets/swift3/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...Assets/swift4-context-all-allValues.swift → ...rated/XCAssets/swift4/all-allValues.swift
View file
Open in desktop
File renamed without changes.
0 ...ssets/swift4-context-all-customName.swift → ...ated/XCAssets/swift4/all-customName.swift
View file
Open in desktop
File renamed without changes.
0 .../swift4-context-all-forceNamespaces.swift → ...XCAssets/swift4/all-forceNamespaces.swift
View file
Open in desktop
File renamed without changes.
0 ...ets/swift4-context-all-publicAccess.swift → ...ed/XCAssets/swift4/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...nerated/XCAssets/swift4-context-all.swift → ...tures/Generated/XCAssets/swift4/all.swift
View file
Open in desktop
File renamed without changes.
0 ...rated/XCAssets/swift4-context-empty.swift → ...res/Generated/XCAssets/swift4/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...nline-swift3-context-all-customName.swift → ...d/YAML/inline-swift3/all-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...ine-swift3-context-all-publicAccess.swift → ...YAML/inline-swift3/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...ated/YAML/inline-swift3-context-all.swift → ...es/Generated/YAML/inline-swift3/all.swift
View file
Open in desktop
File renamed without changes.
0 ...ed/YAML/inline-swift3-context-empty.swift → .../Generated/YAML/inline-swift3/empty.swift
View file
Open in desktop
File renamed without changes.
0 ...nline-swift4-context-all-customName.swift → ...d/YAML/inline-swift4/all-customName.swift
View file
Open in desktop
File renamed without changes.
0 ...ine-swift4-context-all-publicAccess.swift → ...YAML/inline-swift4/all-publicAccess.swift
View file
Open in desktop
File renamed without changes.
0 ...ated/YAML/inline-swift4-context-all.swift → ...es/Generated/YAML/inline-swift4/all.swift
View file
Open in desktop
File renamed without changes.
0 ...ed/YAML/inline-swift4-context-empty.swift → .../Generated/YAML/inline-swift4/empty.swift
View file
Open in desktop
File renamed without changes.
11 changes: 6 additions & 5 deletions Tests/TemplatesTests/TestsHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ class Fixtures {
return string(for: name, subDirectory: "templates/\(sub.rawValue.lowercased())")
}

static func output(for name: String, sub: Directory) -> String {
return string(for: name, subDirectory: "Generated/\(sub.rawValue)")
static func output(template: String, variation: String, sub: Directory) -> String {
return string(for: variation, subDirectory: "Generated/\(sub.rawValue)/\(template)")
}

private static func string(for name: String, subDirectory: String) -> String {
Expand Down Expand Up @@ -182,7 +182,7 @@ extension XCTestCase {
}

for (index, (context: context, suffix: suffix)) in variations.enumerated() {
let outputFile = "\(templateName)-context-\(contextName)\(suffix).swift"
let outputFile = "\(contextName)\(suffix).swift"
if variations.count > 1 { print(" - Variation #\(index)... (expecting: \(outputFile))") }

let result: String
Expand All @@ -194,14 +194,15 @@ extension XCTestCase {

// check if we should generate or not
if ProcessInfo().environment["GENERATE_OUTPUT"] == "YES" {
let target = Path(#file).parent().parent() + "Fixtures/Generated" + outputDir.rawValue + outputFile
let target = Path(#file).parent().parent() + "Fixtures/Generated" + outputDir.rawValue +
templateName + outputFile
do {
try target.write(result)
} catch {
fatalError("Unable to write output file \(target)")
}
} else {
let expected = Fixtures.output(for: outputFile, sub: outputDir)
let expected = Fixtures.output(template: templateName, variation: outputFile, sub: outputDir)
XCTDiffStrings(result, expected, file: file, line: line)
}
}
Expand Down