Merge branch 'master' into enhancements/repository-watcher-refactor-rollup

Author: StanleyGoldman

docs/contributing/how-to-test.md

@@ -0,0 +1,10 @@
+
+Unit and Integration tests for Unity can be found under `src/tests/`.
+
+## Testing requirements
+Tests currently run with NUnit 2.6.4.
+
+## Running tests
+Tests can be run after building the Unity project. To run the tests execute `test.cmd` on Windows or `test.sh` on Mac.
+
+We use [Appveyor](https://ci.appveyor.com/project/github-windows/unity/build/tests) as the CI for this project to run tests, but it is also necessary to run tests locally when making code changes.

src/GitHub.Api/Helpers/Constants.cs

@@ -9,7 +9,7 @@ static class Constants
         public const string UsageFile = "usage.json";
         public const string GitInstallPathKey = "GitInstallPath";
         public const string TraceLoggingKey = "EnableTraceLogging";
-        public const string Iso8601Format = "o";
+        public const string Iso8601Format = "yyyy-MM-ddTHH\\:mm\\:ss.fffffffzzz";
 
         public static readonly Version MinimumGitVersion = new Version(2, 11, 0);
         public static readonly Version MinimumGitLfsVersion = new Version(2, 3, 4);

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs

@@ -51,8 +51,12 @@ public override void OnEnable()
             userSettingsView.OnEnable();
             AttachHandlers(Repository);
 
-            Repository.CheckCurrentRemoteChangedEvent(lastCurrentRemoteChangedEvent);
-            Repository.CheckLocksChangedEvent(lastLocksChangedEvent);
+            if (Repository != null)
+            {
+                Repository.CheckCurrentRemoteChangedEvent(lastCurrentRemoteChangedEvent);
+                Repository.CheckLocksChangedEvent(lastLocksChangedEvent);
+            }
+
             metricsHasChanged = true;
         }
 

test.cmd

@@ -0,0 +1,24 @@
+@echo off
+setlocal
+
+set Config=Debug
+if not %1.==. (
+  set Config=%1
+)
+
+set Exclude=''
+if not %2.==. (
+  set Exclude=%2
+)
+
+:: make sure at Unity project root directory
+set NunitDirectory=packages\NUnit.Runners.2.6.4\tools
+echo %NunitDirectory%
+set ConsoleRunner=%NunitDirectory%\nunit-console.exe
+echo %ConsoleRunner%
+
+:: run tests
+echo Running "build\IntegrationTests\IntegrationTests.dll" "build\IntegrationTests\TestUtils.dll" "build\TaskSystemIntegrationTests\TaskSystemIntegrationTests.dll" "build\UnitTests\TestUtils.dll" "build\UnitTests\UnitTests.dll" "src\tests\TestUtils\bin\%Config%\TestUtils.dll" /exclude=%Exclude%
+call %ConsoleRunner% "build\IntegrationTests\IntegrationTests.dll" "build\IntegrationTests\TestUtils.dll" "build\TaskSystemIntegrationTests\TaskSystemIntegrationTests.dll" "build\UnitTests\TestUtils.dll" "build\UnitTests\UnitTests.dll" "src\tests\TestUtils\bin\%Config%\TestUtils.dll" /exclude=%Exclude%
+
+endlocal

test.sh

@@ -0,0 +1,15 @@
+#!/bin/sh -eu
+Configuration="Debug"
+if [ $# -gt 0 ]; then
+	Configuration=$1
+fi
+
+Exclude=""
+if [ $# -gt 1 ]; then
+	Exclude="/exclude=$2"
+fi
+
+NunitDirectory="packages\NUnit.Runners.2.6.4\tools"
+ConsoleRunner="$NunitDirectory\nunit-console.exe"
+
+$ConsoleRunner "build\IntegrationTests\IntegrationTests.dll" "build\IntegrationTests\TestUtils.dll" "build\TaskSystemIntegrationTests\TaskSystemIntegrationTests.dll" "build\UnitTests\TestUtils.dll" "build\UnitTests\UnitTests.dll" "src\tests\TestUtils\bin\\$Configuration\TestUtils.dll" $Exclude