Skip to content

Commit ca7d858

Browse files
author
Joshua Miller
committed
# This is a combination of 3 commits.
# This is the 1st commit message: Finish casing changes; initial travis-ci config # The commit message #2 will be skipped: # fix remnants; initial travis.ci config # The commit message #3 will be skipped: # new tests?
1 parent 955ac70 commit ca7d858

34 files changed

Lines changed: 726 additions & 508 deletions

‎.travis.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
language: csharp
2+
mono: none
3+
dotnet: 2.0.0
4+
5+
install:
6+
- curl -L -o nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
7+
- dotnet restore
8+
9+
script:
10+
- dotnet build -c Debug
11+
- dotnet test Jenkins.Net.Tests/Jenkins.Net.Tests.csproj -c Debug --no-build --filter Category=Unit
12+
13+
deploy:
14+
skip_cleanup: true
15+
provider: script
16+
script:
17+
- dotnet pack Jenkins.Net/Jenkins.Net.csproj -c Debug --no-build
18+
- nuget push Jenkins.Net/bin/Jenkins.Net.*.nupkg -Source "$NUGET_SOURCE" -ApiKey "$NUGET_APIKEY"
19+
on:
20+
branch: master

‎Jenkins.NET.Publishing/Jenkins.NET.Publishing.csproj‎

Lines changed: 0 additions & 111 deletions
This file was deleted.

‎Jenkins.NET.Publishing/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎Jenkins.NET.Publishing/app.config‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎Jenkins.NET.Publishing/packages.config‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎Jenkins.NET.Tests/IntegrationTests/ClientTests.cs‎

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using JenkinsNET.Tests.Internal;
33
using System;
44
using Xunit;
5-
5+
using Assert = Xunit.Assert;
66
#if NET_ASYNC
77
using System.Threading.Tasks;
88
#endif
@@ -103,5 +103,44 @@ public async Task RunAsync()
103103
output.WriteLine($"Duration: {duration}");
104104
}
105105
#endif
106+
107+
[Fact]
108+
[Trait("Category", "Integration")]
109+
public void GetConsoleText()
110+
{
111+
var jobRunner = DefaultRunner.Create(output, quiet: true);
112+
113+
output.WriteLine("Running job...");
114+
var build = jobRunner.Run(jobName);
115+
output.WriteLine("Job complete.");
116+
117+
Assert.Equal("SUCCESS", build.Result);
118+
Assert.True(jobRunner.BuildNumber.HasValue);
119+
120+
var text = jobRunner.Client.Builds.GetConsoleText(jobName, jobRunner.BuildNumber.Value.ToString());
121+
output.WriteLine(text);
122+
123+
Assert.Contains("[Hello World!]", text);
124+
}
125+
126+
[Fact]
127+
[Trait("Category", "Integration")]
128+
public void GetConsoleHtml()
129+
{
130+
var jobRunner = DefaultRunner.Create(output, quiet: true);
131+
132+
output.WriteLine("Running job...");
133+
var build = jobRunner.Run(jobName);
134+
output.WriteLine("Job complete.");
135+
136+
Assert.Equal("SUCCESS", build.Result);
137+
Assert.True(jobRunner.BuildNumber.HasValue);
138+
139+
var text = jobRunner.Client.Builds.GetConsoleHtml(jobName, jobRunner.BuildNumber.Value.ToString());
140+
output.WriteLine(text);
141+
142+
Assert.Contains("<html>", text);
143+
Assert.Contains("[Hello World!]", text);
144+
}
106145
}
107146
}

‎Jenkins.NET.Tests/Internal/DefaultRunner.cs‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,29 @@ namespace JenkinsNET.Tests.Internal
1212
internal static class DefaultRunner
1313
{
1414
#if NETCORE
15-
public static JenkinsJobRunner Create(ITestOutputHelper writer, JenkinsClient client = null)
15+
public static JenkinsJobRunner Create(ITestOutputHelper writer, JenkinsClient client = null, bool quiet = false)
1616
#else
17-
public static JenkinsJobRunner Create(TextWriter writer, JenkinsClient client = null)
17+
public static JenkinsJobRunner Create(TextWriter writer, JenkinsClient client = null, bool quiet = false)
1818
#endif
1919
{
2020
client = client ?? DefaultClient.Create();
2121

2222
var jobRunner = new JenkinsJobRunner(client) {
23-
MonitorConsoleOutput = true,
23+
MonitorConsoleOutput = !quiet,
2424
};
2525

26-
jobRunner.StatusChanged += () => {
27-
writer.WriteLine($"[{DateTime.Now}] Status: '{jobRunner.Status}'");
28-
};
26+
if (!quiet) {
27+
jobRunner.StatusChanged += () => {
28+
writer.WriteLine($"[{DateTime.Now}] Status: '{jobRunner.Status}'");
29+
};
2930

30-
#if NETCORE
31-
// Write method not available!
32-
jobRunner.ConsoleOutputChanged += writer.WriteLine;
33-
#else
34-
jobRunner.ConsoleOutputChanged += writer.Write;
35-
#endif
31+
#if NETCORE
32+
// Write method not available!
33+
jobRunner.ConsoleOutputChanged += writer.WriteLine;
34+
#else
35+
jobRunner.ConsoleOutputChanged += writer.Write;
36+
#endif
37+
}
3638

3739
return jobRunner;
3840
}

‎Jenkins.NET.sln‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27004.2006
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.28809.33
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jenkins.Net.Publishing", "Jenkins.Net.Publishing\Jenkins.Net.Publishing.csproj", "{3FA23981-FAAB-4E6B-AE63-B82AA837E50F}"
7-
EndProject
86
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jenkins.Net", "Jenkins.Net\Jenkins.Net.csproj", "{98AA153A-A40F-4C93-80DF-6B5848FB580F}"
97
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jenkins.Net.Tests", "Jenkins.Net.Tests\Jenkins.Net.Tests.csproj", "{C39D7FDD-F85E-4FEF-8E30-A23B04DD1787}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jenkins.Net.Tests", "Jenkins.Net.Tests\Jenkins.Net.Tests.csproj", "{C39D7FDD-F85E-4FEF-8E30-A23B04DD1787}"
119
EndProject
1210
Global
1311
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1412
Debug|Any CPU = Debug|Any CPU
1513
Release|Any CPU = Release|Any CPU
1614
EndGlobalSection
1715
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18-
{3FA23981-FAAB-4E6B-AE63-B82AA837E50F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19-
{3FA23981-FAAB-4E6B-AE63-B82AA837E50F}.Debug|Any CPU.Build.0 = Debug|Any CPU
20-
{3FA23981-FAAB-4E6B-AE63-B82AA837E50F}.Release|Any CPU.ActiveCfg = Release|Any CPU
21-
{3FA23981-FAAB-4E6B-AE63-B82AA837E50F}.Release|Any CPU.Build.0 = Release|Any CPU
2216
{98AA153A-A40F-4C93-80DF-6B5848FB580F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2317
{98AA153A-A40F-4C93-80DF-6B5848FB580F}.Debug|Any CPU.Build.0 = Debug|Any CPU
2418
{98AA153A-A40F-4C93-80DF-6B5848FB580F}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎Jenkins.Net.Publishing/Jenkins.NET.Publishing.json‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)