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

Updated log tests for nested Log.Level enum #61

Merged
merged 1 commit into from
Feb 23, 2016
Merged

Updated log tests for nested Log.Level enum #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/Log.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import Foundation
Log class
*/
public class Log {

/**
LogLevel enumeration
*/
Expand Down
16 changes: 8 additions & 8 deletions Tests/LogTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import XCTest

class LogTests: XCTestCase {

class DummyLogger: Logger {
class DummyLogger: LogDriver {

static var output: String?

func log(level: LogLevel, message: String) {
func log(level: Log.Level, message: String) {
DummyLogger.output = "\(level.description) \(message)"
}
}
Expand All @@ -25,28 +25,28 @@ class LogTests: XCTestCase {
override func setUp() {
DummyLogger.output = nil
Log.driver = DummyLogger()
Log.enabledLevels = LogLevel.all
Log.enabledLevels = Log.Level.all
}

func testCanOverrideDefaultLogger() {
XCTAssertTrue(String(Log.driver).containsString("DummyLogger"), "driver should be DummyLogger")
}

func testAllLevelsEnabledByDefault() {
let levels = LogLevel.all
let levels = Log.Level.all
levels.forEach { level in
XCTAssertTrue(Log.enabledLevels.contains(level))
XCTAssertTrue(Log.enabledLevels.contains(level), "\(level) should be enabled")
}
}

func testCanOverrideDefaultEnabledLevels() {
Log.enabledLevels = [LogLevel.Debug]
Log.enabledLevels = [Log.Level.Debug]
XCTAssertTrue(Log.enabledLevels.count == 1, "only one log level should be enabled")
XCTAssertTrue(Log.enabledLevels.first == LogLevel.Debug, "only Debug logs should be enabled")
XCTAssertTrue(Log.enabledLevels.first == Log.Level.Debug, "only Debug logs should be enabled")
}

func testDisabledLogsDoNoOutput() {
Log.enabledLevels = [LogLevel.Debug]
Log.enabledLevels = [Log.Level.Debug]
Log.error("this should not output")
XCTAssertNil(DummyLogger.output, "disabled level should not output")
}
Expand Down
18 changes: 6 additions & 12 deletions Vapor.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@
34CC59561C7BE3C9007CA680 /* LogTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34CC59551C7BE3C9007CA680 /* LogTests.swift */; };
34CC595A1C7BE405007CA680 /* Log.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34CC59571C7BE405007CA680 /* Log.swift */; };
34CC595B1C7BE405007CA680 /* Log.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34CC59571C7BE405007CA680 /* Log.swift */; };
34CC595C1C7BE405007CA680 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34CC59581C7BE405007CA680 /* Logger.swift */; };
34CC595D1C7BE405007CA680 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34CC59581C7BE405007CA680 /* Logger.swift */; };
34CC595E1C7BE405007CA680 /* LogLevel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34CC59591C7BE405007CA680 /* LogLevel.swift */; };
34CC595F1C7BE405007CA680 /* LogLevel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34CC59591C7BE405007CA680 /* LogLevel.swift */; };
34CC59621C7C5A03007CA680 /* LogDriver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34CC59611C7C5A03007CA680 /* LogDriver.swift */; };
34CC59631C7C5A1B007CA680 /* LogDriver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34CC59611C7C5A03007CA680 /* LogDriver.swift */; };
802030011C77C956009B8655 /* Vapor+Json.swift in Sources */ = {isa = PBXBuildFile; fileRef = 802030001C77C956009B8655 /* Vapor+Json.swift */; };
802030121C78CAC2009B8655 /* Branch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 802030101C78CAC2009B8655 /* Branch.swift */; };
802030131C78CAC2009B8655 /* Branch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 802030101C78CAC2009B8655 /* Branch.swift */; };
Expand Down Expand Up @@ -94,8 +92,7 @@
3492B2EE1C787DD600D8E588 /* RouteTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteTests.swift; sourceTree = "<group>"; };
34CC59551C7BE3C9007CA680 /* LogTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LogTests.swift; sourceTree = "<group>"; };
34CC59571C7BE405007CA680 /* Log.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Log.swift; sourceTree = "<group>"; };
34CC59581C7BE405007CA680 /* Logger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = "<group>"; };
34CC59591C7BE405007CA680 /* LogLevel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LogLevel.swift; sourceTree = "<group>"; };
34CC59611C7C5A03007CA680 /* LogDriver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LogDriver.swift; sourceTree = "<group>"; };
802030001C77C956009B8655 /* Vapor+Json.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Vapor+Json.swift"; sourceTree = "<group>"; };
802030101C78CAC2009B8655 /* Branch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Branch.swift; sourceTree = "<group>"; };
802030161C78CAE1009B8655 /* BranchRouter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BranchRouter.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -169,8 +166,7 @@
isa = PBXGroup;
children = (
34CC59571C7BE405007CA680 /* Log.swift */,
34CC59581C7BE405007CA680 /* Logger.swift */,
34CC59591C7BE405007CA680 /* LogLevel.swift */,
34CC59611C7C5A03007CA680 /* LogDriver.swift */,
);
name = Log;
sourceTree = "<group>";
Expand Down Expand Up @@ -461,11 +457,9 @@
C352E7011C62BC6A00E26467 /* Socket.swift in Sources */,
C3EDEA7D1C683CE100754727 /* SessionMiddleware.swift in Sources */,
C304C8AA1C62FCA300058C92 /* RequestFormExtension.swift in Sources */,
34CC595E1C7BE405007CA680 /* LogLevel.swift in Sources */,
C352E6F31C62BC6A00E26467 /* Request.swift in Sources */,
802053991C7A8C7D009E26E9 /* RequestData+Target.swift in Sources */,
C304C8B51C6306B100058C92 /* RouterDriver.swift in Sources */,
34CC595C1C7BE405007CA680 /* Logger.swift in Sources */,
C3EDEA871C68459300754727 /* Hash.swift in Sources */,
C352E7091C62BC6A00E26467 /* View.swift in Sources */,
288CFC2E1C7AC01A00E4617A /* Application.swift in Sources */,
Expand All @@ -483,6 +477,7 @@
C352E7031C62BC6A00E26467 /* SocketServer.swift in Sources */,
C3EDEA801C68419800754727 /* String+SHA1.swift in Sources */,
C3EDEA7B1C683A6C00754727 /* Middleware.swift in Sources */,
34CC59621C7C5A03007CA680 /* LogDriver.swift in Sources */,
288CFC311C7AC02A00E4617A /* Provider.swift in Sources */,
C352E6FD1C62BC6A00E26467 /* Server.swift in Sources */,
802030171C78CAE1009B8655 /* BranchRouter.swift in Sources */,
Expand All @@ -498,8 +493,6 @@
buildActionMask = 2147483647;
files = (
C352E7021C62BC6A00E26467 /* Socket.swift in Sources */,
34CC595F1C7BE405007CA680 /* LogLevel.swift in Sources */,
34CC595D1C7BE405007CA680 /* Logger.swift in Sources */,
C352E6E81C62BC6A00E26467 /* Controller.swift in Sources */,
C304C8B61C6306B100058C92 /* RouterDriver.swift in Sources */,
C352E6EC1C62BC6A00E26467 /* LinuxFixes.swift in Sources */,
Expand All @@ -521,6 +514,7 @@
C304C8A81C62D65200058C92 /* ServerDriver.swift in Sources */,
C352E70A1C62BC6A00E26467 /* View.swift in Sources */,
C352E7061C62BC6A00E26467 /* StringExtensions.swift in Sources */,
34CC59631C7C5A1B007CA680 /* LogDriver.swift in Sources */,
C377F2F01C696CAB00DABD21 /* RenderDriver.swift in Sources */,
802030181C78CAE1009B8655 /* BranchRouter.swift in Sources */,
288CFC331C7AC05D00E4617A /* Provider.swift in Sources */,
Expand Down