diff --git a/dev/src/bin/Release/netcoreapp3.1/gtest_gui.dll b/dev/src/bin/Release/netcoreapp3.1/gtest_gui.dll index eff4c80..967bdf1 100644 Binary files a/dev/src/bin/Release/netcoreapp3.1/gtest_gui.dll and b/dev/src/bin/Release/netcoreapp3.1/gtest_gui.dll differ diff --git a/dev/src/bin/Release/netcoreapp3.1/gtest_gui.exe b/dev/src/bin/Release/netcoreapp3.1/gtest_gui.exe index e8ff440..9a739ed 100644 Binary files a/dev/src/bin/Release/netcoreapp3.1/gtest_gui.exe and b/dev/src/bin/Release/netcoreapp3.1/gtest_gui.exe differ diff --git a/dev/src/bin/Release/netframework/gtest_gui.exe b/dev/src/bin/Release/netframework/gtest_gui.exe index 4fb01c6..634c439 100644 Binary files a/dev/src/bin/Release/netframework/gtest_gui.exe and b/dev/src/bin/Release/netframework/gtest_gui.exe differ diff --git a/dev/src/gtest_gui/gtest_gui/Command/TestExecuteAsyncCommand.cs b/dev/src/gtest_gui/gtest_gui/Command/TestExecuteAsyncCommand.cs index 62a49f5..00ac782 100644 --- a/dev/src/gtest_gui/gtest_gui/Command/TestExecuteAsyncCommand.cs +++ b/dev/src/gtest_gui/gtest_gui/Command/TestExecuteAsyncCommand.cs @@ -15,12 +15,24 @@ namespace gtest_gui.Command { public class TestExecuteAsyncCommand : TestExecuteCommand { + /// + /// Run test async. + /// protected TestRunnerAsync _runnerAsync; + /// + /// Content window class. + /// protected CountrySideEngineer.ContentWindow.ContentWindow _contentWindow; - protected CountrySideEngineer.ProgressWindow.ProgressWindow _proressWindow; + /// + /// Progress window class. + /// + protected ProgressWindow _proressWindow; + /// + /// Default constructor. + /// public TestExecuteAsyncCommand() : base() { _runnerAsync = new TestRunnerAsync(); @@ -28,6 +40,10 @@ public TestExecuteAsyncCommand() : base() _proressWindow = new CountrySideEngineer.ProgressWindow.ProgressWindow(); } + /// + /// Constructor with argument. + /// + /// public TestExecuteAsyncCommand(TestRunner runner) : base(runner) { _runnerAsync = new TestRunnerAsync(); @@ -47,8 +63,7 @@ public override object ExecuteCommand(TestCommandArgument cmdArgument) { SetUpTestRunner(cmdArgument); - string testFileName = System.IO.Path.GetFileNameWithoutExtension(cmdArgument.TestInfo.TestFile); - _contentWindow.ViewTitle = testFileName; + _contentWindow.ViewTitle = System.IO.Path.GetFileNameWithoutExtension(cmdArgument.TestInfo.TestFile); _contentWindow.Start(); _proressWindow.Start(_runnerAsync); @@ -99,6 +114,9 @@ protected override void SetUpTestRunner(TestCommandArgument cmdArg) _runnerAsync.TestInfo = cmdArg.TestInfo; } + /// + /// Teardown the test. + /// protected override void TearDownTestRunner() { base.TearDownTestRunner(); diff --git a/dev/src/gtest_gui/gtest_gui/Command/TestExecuteCommand.cs b/dev/src/gtest_gui/gtest_gui/Command/TestExecuteCommand.cs index cc29ff3..cad3095 100644 --- a/dev/src/gtest_gui/gtest_gui/Command/TestExecuteCommand.cs +++ b/dev/src/gtest_gui/gtest_gui/Command/TestExecuteCommand.cs @@ -135,6 +135,9 @@ protected virtual void SetUpTestRunner(TestCommandArgument cmdArg) } } + /// + /// Tear down the test. + /// protected virtual void TearDownTestRunner() { _runner.TestDataReceivedEventHandler -= _logBuilder.OnDataReceived; diff --git a/dev/src/gtest_gui/gtest_gui/Model/TestRunner.cs b/dev/src/gtest_gui/gtest_gui/Model/TestRunner.cs index b38dc66..0ef9011 100644 --- a/dev/src/gtest_gui/gtest_gui/Model/TestRunner.cs +++ b/dev/src/gtest_gui/gtest_gui/Model/TestRunner.cs @@ -110,14 +110,11 @@ public virtual void Run(string path, TestInformation information) /// Path to file. /// Test information. /// Test running process. - protected virtual Process Run(string path, TestItem testItem) + protected virtual void Run(string path, TestItem testItem) { - ProcessStartInfo procStartInfo = GetProcessStartInfo(path, testItem); - Process process = null; - - using (process = new Process()) + using (var process = new Process()) { - process.StartInfo = procStartInfo; + process.StartInfo = GetProcessStartInfo(path, testItem); process.ErrorDataReceived += OnErrorDataReceivedEvent; process.OutputDataReceived += OnOutputDataReceivedEvent; process.Start(); @@ -127,7 +124,6 @@ protected virtual Process Run(string path, TestItem testItem) process.OutputDataReceived -= OnOutputDataReceivedEvent; process.ErrorDataReceived -= OnErrorDataReceivedEvent; } - return process; } /// diff --git a/dev/src/gtest_gui/gtest_gui/gtest_gui.csproj b/dev/src/gtest_gui/gtest_gui/gtest_gui.csproj index be792d0..53681e3 100644 --- a/dev/src/gtest_gui/gtest_gui/gtest_gui.csproj +++ b/dev/src/gtest_gui/gtest_gui/gtest_gui.csproj @@ -4,9 +4,9 @@ WinExe netcoreapp3.1 true - 0.9.1.0 - 0.9.1.0 - 0.9.0.0 + 0.9.2.0 + 0.9.2.0 + 0.9.2.0 CountrySideEngineer ja-JP diff --git a/dev/src/gtest_gui/gtest_gui_dotNet/Properties/AssemblyInfo.cs b/dev/src/gtest_gui/gtest_gui_dotNet/Properties/AssemblyInfo.cs index 81acae5..60d5667 100644 --- a/dev/src/gtest_gui/gtest_gui_dotNet/Properties/AssemblyInfo.cs +++ b/dev/src/gtest_gui/gtest_gui_dotNet/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます // 既定値にすることができます: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.9.1.0")] -[assembly: AssemblyFileVersion("0.9.1.0")] +[assembly: AssemblyVersion("0.9.2.0")] +[assembly: AssemblyFileVersion("0.9.2.0")]