Skip to content

Refactoring Bootstrapper to introduce better coverage and testing #1603

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

Merged
forki merged 29 commits into from
Apr 17, 2016
Merged

Refactoring Bootstrapper to introduce better coverage and testing #1603

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
1d08ebc
cleanup of unused method
Stift Mar 31, 2016
9aec6af
create tests for CacheDownloadStrategy (bootstrapper)
Stift Mar 31, 2016
084a65b
rearranging files for better overview (bootstrapper)
Stift Mar 31, 2016
f488bcb
added tests for download strategy determination
Stift Apr 3, 2016
a3bc96a
move strategy test
Stift Apr 3, 2016
c128284
create tests for GitHubDownloadStrategy and refactored it
Stift Apr 3, 2016
1a26b19
added test for NugetDownloadStrategy
Stift Apr 4, 2016
6c64848
added tests for NugetApiHelper
Stift Apr 4, 2016
653ea62
added test for SemVer
Stift Apr 4, 2016
63133e9
refactor method with wrong responseStream handling
Stift Apr 4, 2016
2771ae9
Merge remote-tracking branch 'fsprojects/master' into bootstrapUpdate…
Stift Apr 7, 2016
fa39b9e
refactored argument parsing and created test for argument parsing
Stift Apr 7, 2016
f65ac2e
added tests for StartPaketBootstrapping
Stift Apr 8, 2016
54e3bd6
create some additional tests for ArgumentParser
Stift Apr 8, 2016
43bf687
removed fallback logic from CachedDownload strategy as this is alread…
Stift Apr 8, 2016
82fb98d
added test on Name of CacheDownloadStrategyTest
Stift Apr 8, 2016
7f9a01c
improve argument parsing
Stift Apr 11, 2016
4ef6965
Merge commit '0a917114f993b3e3b9917a208c768273b42ee87f' into bootstra…
Stift Apr 11, 2016
cbb9683
fix deprecated assert after nunit3 introduction
Stift Apr 11, 2016
19b601f
refactored console logging to use centrally one implementation and al…
Stift Apr 12, 2016
e00d077
Merge commit 'fbeb48803e5084216f7c4c6505d50ad7a5005d67' into bootstra…
Stift Apr 12, 2016
084d31b
fixing non-compiling tests
Stift Apr 12, 2016
57e0354
add help output to bootstrapper
Stift Apr 12, 2016
9dabe0d
fix bug when downloading latest but prerelease is already in directory
Stift Apr 12, 2016
da63dd9
optimize code
Stift Apr 12, 2016
84f421a
remove unused code
Stift Apr 12, 2016
5c821df
add test for non cached strategy resolving
Stift Apr 12, 2016
60cc032
add --help option to documentation
Stift Apr 12, 2016
dc9e256
removed code commented out and missed to remove
Apr 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixing non-compiling tests
  • Loading branch information
@Stift
Stift committed Apr 12, 2016
commit 084d31bed627d46eef0777a5b7d64028e549f1d9
32 changes: 16 additions & 16 deletions tests/Paket.Bootstrapper.Tests/DownloadStrategies/CacheDownloadStrategyTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ public void Name()
public void GetLatestVersion_NonPrerelease()
{
//arrange
mockEffectiveStrategy.Setup(x => x.GetLatestVersion(true, false)).Returns("any");
mockEffectiveStrategy.Setup(x => x.GetLatestVersion(true)).Returns("any");

//act
var result = sut.GetLatestVersion(true, false);
var result = sut.GetLatestVersion(true);

//assert
Assert.That(result, Is.EqualTo("any"));
Expand All @@ -72,13 +72,13 @@ public void GetLatestVersion_NonPrerelease()
public void GetLatestVersion_EffectiveStrategyFails_UseFallback()
{
//arrange
mockEffectiveStrategy.Setup(x => x.GetLatestVersion(true, false)).Throws<WebException>().Verifiable();
mockEffectiveStrategy.Setup(x => x.GetLatestVersion(true)).Throws<WebException>().Verifiable();
var mockFallback = new Mock<IDownloadStrategy>();
mockEffectiveStrategy.SetupGet(x => x.FallbackStrategy).Returns(mockFallback.Object);
mockDirectoryProxy.Setup(x => x.GetDirectories(It.IsAny<string>())).Returns(new[] { "1.0" });

//act
var result = sut.GetLatestVersion(true, false);
var result = sut.GetLatestVersion(true);

//assert
Assert.That(result, Is.EqualTo("1.0"));
Expand All @@ -89,11 +89,11 @@ public void GetLatestVersion_EffectiveStrategyFails_UseFallback()
public void GetLatestVersion_NoFallBackStrategy_UseBestCachedVersion()
{
//arrange
mockEffectiveStrategy.Setup(x => x.GetLatestVersion(true, false)).Throws<WebException>().Verifiable();
mockEffectiveStrategy.Setup(x => x.GetLatestVersion(true)).Throws<WebException>().Verifiable();
mockDirectoryProxy.Setup(x => x.GetDirectories(It.IsAny<string>())).Returns(new[] {"2.1", "2.2"});

//act
var result = sut.GetLatestVersion(true, false);
var result = sut.GetLatestVersion(true);

//assert
Assert.That(result, Is.EqualTo("2.2"));
Expand All @@ -104,11 +104,11 @@ public void GetLatestVersion_NoFallBackStrategy_UseBestCachedVersion()
public void GetLatestVersion_NoFallBackStrategy_UseBestCachedVersion_CanHandleWrongSubdirectories()
{
//arrange
mockEffectiveStrategy.Setup(x => x.GetLatestVersion(true, false)).Throws<WebException>().Verifiable();
mockEffectiveStrategy.Setup(x => x.GetLatestVersion(true)).Throws<WebException>().Verifiable();
mockDirectoryProxy.Setup(x => x.GetDirectories(It.IsAny<string>())).Returns(new[] { "2.1", "2.2", "wrongVersion" });

//act
var result = sut.GetLatestVersion(true, false);
var result = sut.GetLatestVersion(true);

//assert
Assert.That(result, Is.EqualTo("2.2"));
Expand All @@ -118,11 +118,11 @@ public void GetLatestVersion_NoFallBackStrategy_UseBestCachedVersion_CanHandleWr
public void GetLatestVersion_NoFallBackStrategy_UseBestCachedVersion_IgnorePrereleaseSubFolder()
{
//arrange
mockEffectiveStrategy.Setup(x => x.GetLatestVersion(true, false)).Throws<WebException>().Verifiable();
mockEffectiveStrategy.Setup(x => x.GetLatestVersion(true)).Throws<WebException>().Verifiable();
mockDirectoryProxy.Setup(x => x.GetDirectories(It.IsAny<string>())).Returns(new[] { "2.1", "2.2", "2.3-alpha" });

//act
var result = sut.GetLatestVersion(true, false);
var result = sut.GetLatestVersion(true);

//assert
Assert.That(result, Is.EqualTo("2.2"));
Expand All @@ -135,10 +135,10 @@ public void DownloadVersion_UseCachedVersion()
mockFileProxy.Setup(x => x.Exists(It.IsAny<string>())).Returns(true);

//act
sut.DownloadVersion("any", "any", true);
sut.DownloadVersion("any", "any");

//assert
mockEffectiveStrategy.Verify(x => x.DownloadVersion(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Never);
mockEffectiveStrategy.Verify(x => x.DownloadVersion(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
mockFileProxy.Verify(x => x.Copy(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()));
}

Expand All @@ -149,10 +149,10 @@ public void DownloadVersion_DownloadFromFallback()
mockFileProxy.Setup(x => x.Exists(It.IsAny<string>())).Returns(false);

//act
sut.DownloadVersion("any", "any", true);
sut.DownloadVersion("any", "any");

//assert
mockEffectiveStrategy.Verify(x => x.DownloadVersion("any", "any", true));
mockEffectiveStrategy.Verify(x => x.DownloadVersion("any", "any"));
mockFileProxy.Verify(x => x.Copy(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()));
}

Expand All @@ -161,10 +161,10 @@ public void SelfUpdate()
{
//arrange
//act
sut.SelfUpdate("any", true);
sut.SelfUpdate("any");

//assert
mockEffectiveStrategy.Verify(x => x.SelfUpdate("any", true));
mockEffectiveStrategy.Verify(x => x.SelfUpdate("any"));
}

}
Expand Down
8 changes: 4 additions & 4 deletions tests/Paket.Bootstrapper.Tests/DownloadStrategies/GitHubDownloadStrategyTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public void GetLatestVersion()
mockWebProxy.Setup(x => x.DownloadString(GitHubDownloadStrategy.Constants.PaketReleasesLatestUrl)).Returns("<title>Release 2.57.1 · fsprojects/Paket</title>").Verifiable();

//act
var result = sut.GetLatestVersion(true, false);
var result = sut.GetLatestVersion(true);

//assert
Assert.That(result, Is.EqualTo("2.57.1"));
Expand All @@ -45,7 +45,7 @@ public void GetLatestVersion_Prerelease()
mockWebProxy.Setup(x => x.DownloadString(GitHubDownloadStrategy.Constants.PaketReleasesUrl)).Returns("Paket/tree/2.57.2-pre\"Paket/tree/2.57.1\"").Verifiable();

//act
var result = sut.GetLatestVersion(false, false);
var result = sut.GetLatestVersion(false);

//assert
Assert.That(result, Is.EqualTo("2.57.2-pre"));
Expand All @@ -66,7 +66,7 @@ public void DownloadVersion()
mockFileProxy.Setup(x => x.Create(tempFileName)).Returns(new MemoryStream(buffer));

//act
sut.DownloadVersion("2.57.1", "paketExeLocation", false);
sut.DownloadVersion("2.57.1", "paketExeLocation");

//assert
mockWebProxy.Verify();
Expand All @@ -92,7 +92,7 @@ public void SelfUpdate()
mockFileProxy.Setup(x => x.GetLocalFileVersion(It.IsAny<string>())).Returns("2.52.1");

//act
sut.SelfUpdate("2.57.1", false);
sut.SelfUpdate("2.57.1");

//assert
mockWebProxy.Verify();
Expand Down
40 changes: 20 additions & 20 deletions tests/Paket.Bootstrapper.Tests/DownloadStrategies/NugetDownloadStrategyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void DefaultApi_GetLatestVersion_NoPrerelease()
mockWebRequestProxy.Setup(x => x.DownloadString(It.IsAny<string>())).Returns("[\"2.57.1\",\"2.57.0\"]");

//act
var version = sut.GetLatestVersion(true, false);
var version = sut.GetLatestVersion(true);

//assert
Assert.That(version, Is.EqualTo("2.57.1"));
Expand All @@ -57,7 +57,7 @@ public void DefaultApi_GetLatestVersion_WithPrerelease_ChoosePrelease()
mockWebRequestProxy.Setup(x => x.DownloadString(It.IsAny<string>())).Returns("[\"2.57.1-pre\",\"2.57.0\"]");

//act
var version = sut.GetLatestVersion(false, false);
var version = sut.GetLatestVersion(false);

//assert
Assert.That(version, Is.EqualTo("2.57.1-pre"));
Expand All @@ -71,8 +71,8 @@ public void DefaultApi_GetLatestVersion_TwoDifferentResults()
mockWebRequestProxy.Setup(x => x.DownloadString(It.IsAny<string>())).Returns("[\"2.57.1-pre\",\"2.57.0\"]");

//act
var version = sut.GetLatestVersion(false, false);
var version2 = sut.GetLatestVersion(true, false);
var version = sut.GetLatestVersion(false);
var version2 = sut.GetLatestVersion(true);

//assert
Assert.That(version, Is.Not.EqualTo(version2));
Expand All @@ -86,7 +86,7 @@ public void DefaultApi_GetLatestVersion_WithPrerelease_ChooseLatest()
mockWebRequestProxy.Setup(x => x.DownloadString(It.IsAny<string>())).Returns("[\"2.57.2\",\"2.57.1-pre\",\"2.57.0\"]");

//act
var version = sut.GetLatestVersion(true, false);
var version = sut.GetLatestVersion(true);

//assert
Assert.That(version, Is.EqualTo("2.57.2"));
Expand All @@ -99,7 +99,7 @@ public void DefaultApi_DownloadVersion()
CreateSystemUnderTestWithDefaultApi();

//act
sut.DownloadVersion(null, "paket", false);
sut.DownloadVersion(null, "paket");

//assert
mockWebRequestProxy.Verify(x => x.DownloadFile("https://www.nuget.org/api/v2/package/Paket", It.IsAny<string>()));
Expand All @@ -115,7 +115,7 @@ public void DefaultApi_DownloadSpecificVersion()
CreateSystemUnderTestWithDefaultApi();

//act
sut.DownloadVersion("2.57.0", "paket", false);
sut.DownloadVersion("2.57.0", "paket");

//assert
mockWebRequestProxy.Verify(x => x.DownloadFile("https://www.nuget.org/api/v2/package/Paket/2.57.0", It.IsAny<string>()));
Expand All @@ -130,7 +130,7 @@ public void DefaultApi_SelfUpdate_VersionIsEqual_DoNothing()
mockFileProxy.Setup(x => x.GetLocalFileVersion(It.IsAny<string>())).Returns("2.57.1");

//act
sut.SelfUpdate("2.57.1", false);
sut.SelfUpdate("2.57.1");

//assert
mockWebRequestProxy.Verify(x => x.DownloadFile(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
Expand All @@ -144,7 +144,7 @@ public void DefaultApi_SelfUpdate()
mockFileProxy.Setup(x => x.GetLocalFileVersion(It.IsAny<string>())).Returns("2.57.0");

//act
sut.SelfUpdate("2.57.1", false);
sut.SelfUpdate("2.57.1");

//assert
mockDirProxy.Verify(x => x.CreateDirectory(It.Is<string>(s => s.StartsWith("folder"))));
Expand All @@ -162,7 +162,7 @@ public void DefaultApi_SelfUpdate_FailsWhenNullIsSpecified()
mockFileProxy.Setup(x => x.GetLocalFileVersion(It.IsAny<string>())).Returns("2.57.0");

//act
Assert.Throws<ArgumentNullException>(() => sut.SelfUpdate(null, false));
Assert.Throws<ArgumentNullException>(() => sut.SelfUpdate(null));

//assert
mockWebRequestProxy.Verify(x => x.DownloadFile(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
Expand All @@ -178,7 +178,7 @@ public void NugetFolder_GetLatestVersion_NoPrerelease()
.Returns(new[] { "paket.2.57.0.nupkg", "paket.2.57.1.nupkg" });

//act
var version = sut.GetLatestVersion(true, false);
var version = sut.GetLatestVersion(true);

//assert
Assert.That(version, Is.EqualTo("2.57.1"));
Expand All @@ -194,7 +194,7 @@ public void NugetFolder_GetLatestVersion_WithPrerelease_ChoosePrelease()
.Returns(new[] { "paket.2.57.1-pre.nupkg", "paket.2.57.0.nupkg" });

//act
var version = sut.GetLatestVersion(false, false);
var version = sut.GetLatestVersion(false);

//assert
Assert.That(version, Is.EqualTo("2.57.1-pre"));
Expand All @@ -210,8 +210,8 @@ public void NugetFolder_GetLatestVersion_TwoDifferentResults()
.Returns(new[] { "paket.2.57.1-pre.nupkg", "paket.2.57.0.nupkg" });

//act
var version = sut.GetLatestVersion(false, false);
var version2 = sut.GetLatestVersion(true, false);
var version = sut.GetLatestVersion(false);
var version2 = sut.GetLatestVersion(true);

//assert
Assert.That(version, Is.Not.EqualTo(version2));
Expand All @@ -227,7 +227,7 @@ public void NugetFolder_GetLatestVersion_WithPrerelease_ChooseLatest()
.Returns(new[] { "paket.2.57.2.nupkg", "2.57.1-pre.nupkg", "paket.2.57.0.nupkg" });

//act
var version = sut.GetLatestVersion(true, false);
var version = sut.GetLatestVersion(true);

//assert
Assert.That(version, Is.EqualTo("2.57.2"));
Expand All @@ -243,7 +243,7 @@ public void NugetFolder_DownloadVersion_NoVersionSpecified_GetsLatestVersion()
.Returns(new[] { "paket.111.nupkg" });

//act
sut.DownloadVersion(null, "paket", false);
sut.DownloadVersion(null, "paket");

//assert
mockFileProxy.Verify(x => x.Copy(It.Is<string>(s => s.StartsWith("anyNugetFolder") && s.EndsWith("paket.111.nupkg")), It.Is<string>(s => s.StartsWith("folder") && s.EndsWith("paket.latest.nupkg")), false));
Expand All @@ -260,7 +260,7 @@ public void NugetFolder_DownloadSpecificVersion()
CreateSystemUnderTestWithNugetFolder();

//act
sut.DownloadVersion("2.57.0", "paket", false);
sut.DownloadVersion("2.57.0", "paket");

//assert
mockFileProxy.Verify(x => x.Copy(It.Is<string>(s => s.StartsWith("anyNugetFolder") && s.EndsWith("paket.2.57.0.nupkg")), It.Is<string>(s => s.StartsWith("folder") && s.EndsWith("paket.2.57.0.nupkg")), false));
Expand All @@ -275,7 +275,7 @@ public void NugetFolder_SelfUpdate_VersionIsEqual_DoNothing()
mockFileProxy.Setup(x => x.GetLocalFileVersion(It.IsAny<string>())).Returns("2.57.1");

//act
sut.SelfUpdate("2.57.1", false);
sut.SelfUpdate("2.57.1");

//assert
mockFileProxy.Verify(x => x.Copy(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Never);
Expand All @@ -289,7 +289,7 @@ public void NugetFolder_SelfUpdate()
mockFileProxy.Setup(x => x.GetLocalFileVersion(It.IsAny<string>())).Returns("2.57.0");

//act
sut.SelfUpdate("2.57.1", false);
sut.SelfUpdate("2.57.1");

//assert
mockFileProxy.Verify(x => x.Copy(It.Is<string>(s => s.StartsWith("anyNugetFolder") && s.EndsWith("paket.bootstrapper.2.57.1.nupkg")), It.Is<string>(s => s.StartsWith("folder") && s.EndsWith("paket.bootstrapper.2.57.1.nupkg")), false));
Expand All @@ -308,7 +308,7 @@ public void NugetFolder_SelfUpdate_FailsWhenNullIsSpecified()
mockFileProxy.Setup(x => x.GetLocalFileVersion(It.IsAny<string>())).Returns("2.57.0");

//act
Assert.Throws<ArgumentNullException>(() => sut.SelfUpdate(null, false));
Assert.Throws<ArgumentNullException>(() => sut.SelfUpdate(null));

//assert
mockFileProxy.Verify(x => x.Copy(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Never);
Expand Down
Loading