Merge pull request #474 from CocoaLumberjack/unit_tests

Unit Tests
CocoaLumberjack · Mar 13, 2015 · ed97927 · ed97927
2 parents bf3e2a1 + c88dfa8
commit ed97927
Show file tree

Hide file tree

Showing 12 changed files with 796 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,11 @@ script:
     - xctool -project Framework/Desktop/Lumberjack.xcodeproj -scheme 'FmwkTest'
     - xctool -project Framework/Mobile/Lumberjack.xcodeproj -scheme 'LibTest' -configuration Release -sdk iphonesimulator -arch i386 build
     - xctool -project Framework/Desktop/Lumberjack.xcodeproj -scheme 'CocoaLumberjack'
-#comment    - xctool -project Framework/Desktop/Lumberjack.xcodeproj -scheme 'CocoaLumberjack' -configuration Release -sdk iphonesimulator -arch i386 build
+    - xctool -project Framework/Desktop/Lumberjack.xcodeproj -scheme 'CocoaLumberjack' -configuration Release -sdk iphonesimulator -arch i386 build
+
+    - pod install --project-directory=Tests
+    - xctool -workspace Framework/Lumberjack.xcworkspace -scheme 'iOS Tests' -sdk iphonesimulator -arch i386 test
+    - xctool -workspace Framework/Lumberjack.xcworkspace -scheme 'OS X Tests' test
 
     - cd Demos
     - pod install --project-directory=ContextFilter

diff --git a/Framework/Desktop/Lumberjack.xcodeproj/xcshareddata/xcschemes/CocoaLumberjack.xcscheme b/Framework/Desktop/Lumberjack.xcodeproj/xcshareddata/xcschemes/CocoaLumberjack.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0600"
+   LastUpgradeVersion = "0610"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Framework/Desktop/Lumberjack.xcodeproj/xcshareddata/xcschemes/FmwkTest.xcscheme b/Framework/Desktop/Lumberjack.xcodeproj/xcshareddata/xcschemes/FmwkTest.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0600"
+   LastUpgradeVersion = "0610"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Framework/Lumberjack.xcworkspace/contents.xcworkspacedata b/Framework/Lumberjack.xcworkspace/contents.xcworkspacedata
diff --git a/Framework/Mobile/Lumberjack.xcodeproj/xcshareddata/xcschemes/LibTest.xcscheme b/Framework/Mobile/Lumberjack.xcodeproj/xcshareddata/xcschemes/LibTest.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0600"
+   LastUpgradeVersion = "0610"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Framework/Mobile/Lumberjack.xcodeproj/xcshareddata/xcschemes/Lumberjack (Mobile).xcscheme b/Framework/Mobile/Lumberjack.xcodeproj/xcshareddata/xcschemes/Lumberjack (Mobile).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0600"
+   LastUpgradeVersion = "0610"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"