Skip to content

Commit

Permalink
test refactor
Browse files Browse the repository at this point in the history 
- refactor to tests installing packages on the test environment
- ignored a single test as there is no option to not have a package installed during the process
  • Loading branch information
@dnenov
dnenov committed Jul 16, 2024
1 parent 3d4cedd commit 9416de4
Showing 1 changed file with 50 additions and 53 deletions.
103 changes: 50 additions & 53 deletions test/DynamoCoreWpfTests/PackageManager/PackageManagerUITests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2254,13 +2254,12 @@ public void CancelCommandClearsAllData()
public void AssertPreviewPackageDefaultFolderStructureEqualsPublishLocalPackageResults()
{
var packageName = "SingleFolderPublishPackage";
var pathManager = this.ViewModel.Model.PathManager as PathManager;
var publishPath = Path.Combine(pathManager.DefaultPackagesDirectory, packageName);
var publishPath = Path.Combine(Path.GetTempPath(), packageName);

string nodePath = Path.Combine(TestDirectory, "core", "docbrowser\\pkgs\\SingleFolderPublishPackageDocs");
var nodePath = Path.Combine(TestDirectory, "core", "docbrowser\\pkgs\\SingleFolderPublishPackageDocs");
var allFiles = Directory.GetFiles(nodePath, "*", SearchOption.AllDirectories).ToList();

//now lets publish this package.
// now lets publish this package.
var newPkgVm = new PublishPackageViewModel(this.ViewModel);

newPkgVm.AddAllFilesAfterSelection(allFiles);
Expand All @@ -2269,37 +2268,32 @@ public void AssertPreviewPackageDefaultFolderStructureEqualsPublishLocalPackageR
var previewFiles = previewFilesAndFolders.Where(x => !x.DependencyType.Equals(DependencyType.Folder));
var previewFolders = previewFilesAndFolders.Where(x => x.DependencyType.Equals(DependencyType.Folder));

newPkgVm.Name = "SingleFolderPublishPackage";
newPkgVm.MajorVersion = "0";
newPkgVm.MinorVersion = "0";
newPkgVm.BuildVersion = "1";
newPkgVm.PublishLocallyCommand.Execute();
// Arrange - mockup the whole logic
var pkg = new Package(publishPath, packageName, "1.0.0", "MIT"); // The Package
var files = newPkgVm.BuildPackage(); // We get the files as we would do in the process
var pkgsDir = Path.GetTempPath(); // The folder to install the package into

Assert.IsTrue(Directory.Exists(publishPath));
var fs = new RecordedFileSystem((fn) => files.Contains(fn));
var db = new PackageDirectoryBuilder(fs, MockMaker.Empty<IPathRemapper>());

// Arrange
var createdFiles = Directory.GetFiles(publishPath, "*", SearchOption.AllDirectories).ToList();
var createdFolders = Directory.GetDirectories(publishPath, "*", SearchOption.AllDirectories).ToList();
// Act
db.BuildDirectory(pkg, pkgsDir, files, Enumerable.Empty<string>());

// Assert
Assert.AreEqual(createdFiles.Count(), previewFiles.Count());
Assert.AreEqual(createdFolders.Count(), previewFolders.Count() - 1); // discount one for the root folder is included

// Clean up
Directory.Delete(publishPath, true);
Assert.AreEqual(fs.CopiedFiles.Count(), previewFiles.Count() - 1); // The original pkg.json will be skipped
Assert.AreEqual(fs.DirectoriesCreated.Count(), previewFolders.Count());
}

[Test]
public void AssertPreviewPackageRetainFolderStructureEqualsPublishLocalPackageResults()
{
var packageName = "SingleFolderPublishPackage";
var pathManager = this.ViewModel.Model.PathManager as PathManager;
var publishPath = Path.Combine(pathManager.DefaultPackagesDirectory, packageName);
var publishPath = Path.Combine(Path.GetTempPath(), packageName);

string nodePath = Path.Combine(TestDirectory, "core", "docbrowser\\pkgs\\SingleFolderPublishPackageDocs");
var nodePath = Path.Combine(TestDirectory, "core", "docbrowser\\pkgs\\SingleFolderPublishPackageDocs");
var allFiles = Directory.GetFiles(nodePath, "*", SearchOption.AllDirectories).ToList();

//now lets publish this package.
// now lets publish this package.
var newPkgVm = new PublishPackageViewModel(this.ViewModel);
newPkgVm.RetainFolderStructureOverride = true;
newPkgVm.AddAllFilesAfterSelection(allFiles);
Expand All @@ -2308,21 +2302,26 @@ public void AssertPreviewPackageRetainFolderStructureEqualsPublishLocalPackageRe
var previewFiles = previewFilesAndFolders.Where(x => !x.DependencyType.Equals(DependencyType.Folder));
var previewFolders = previewFilesAndFolders.Where(x => x.DependencyType.Equals(DependencyType.Folder));

newPkgVm.Name = "SingleFolderPublishPackage";
newPkgVm.MajorVersion = "0";
newPkgVm.MinorVersion = "0";
newPkgVm.BuildVersion = "1";
newPkgVm.PublishLocallyCommand.Execute();
// Arrange - mockup the whole logic
var pkg = new Package(publishPath, packageName, "1.0.0", "MIT"); // The Package
var files = newPkgVm.BuildPackage(); // We get the files as we would do in the process
var updatedFiles = newPkgVm.UpdateFilesForRetainFolderStructure(files); // We update the files as we would do in the process
var pkgsDir = Path.GetTempPath(); // The folder to install the package into
var roots = newPkgVm.GetCommonPaths(files.ToArray()); // We use the same function the process is using to create the roots

var fs = new RecordedFileSystem((fn) => updatedFiles.SelectMany(files => files).ToList().Any((x) => ComparePaths(x, fn)));
var db = new PackageDirectoryBuilder(fs, MockMaker.Empty<IPathRemapper>());

// Act
db.BuildRetainDirectory(pkg, pkgsDir, roots, updatedFiles, Enumerable.Empty<string>());

Assert.IsTrue(Directory.Exists(publishPath));

// Arrange
var createdFiles = Directory.GetFiles(publishPath, "*", SearchOption.AllDirectories).ToList();
var createdFolders = Directory.GetDirectories(publishPath, "*", SearchOption.AllDirectories).ToList();

// Assert
Assert.AreEqual(createdFiles.Count(), previewFiles.Count());
Assert.AreEqual(0, createdFolders.Count()); // When single root, no nested folders should be created
Assert.AreEqual(fs.CopiedFiles.Count(), previewFiles.Count());
Assert.AreEqual(0, createdFolders.Count());

// Clean up
Directory.Delete(publishPath, true);
Expand All @@ -2332,14 +2331,11 @@ public void AssertPreviewPackageRetainFolderStructureEqualsPublishLocalPackageRe
public void AssertPreviewPackageRetainFolderStructureEqualsPublishLocalPackageResultsForNestedFolders()
{
var packageName = "NestedPackage";
var pathManager = this.ViewModel.Model.PathManager as PathManager;
var publishPath = Path.Combine(pathManager.DefaultPackagesDirectory, packageName);

string nodePath = Path.Combine(TestDirectory, "pkgs", packageName);
var publishPath = Path.Combine(Path.GetTempPath(), packageName);
var nodePath = Path.Combine(TestDirectory, "pkgs", packageName);
var allFiles = Directory.GetFiles(nodePath, "*", SearchOption.AllDirectories).ToList();
var allFolders = Directory.GetDirectories(nodePath, "*", SearchOption.AllDirectories).ToList();

//now lets publish this package.
// now lets publish this package.
var newPkgVm = new PublishPackageViewModel(this.ViewModel);
newPkgVm.RetainFolderStructureOverride = true;
newPkgVm.AddAllFilesAfterSelection(allFiles);
Expand All @@ -2348,32 +2344,36 @@ public void AssertPreviewPackageRetainFolderStructureEqualsPublishLocalPackageRe
var previewFiles = previewFilesAndFolders.Where(x => !x.DependencyType.Equals(DependencyType.Folder));
var previewFolders = previewFilesAndFolders.Where(x => x.DependencyType.Equals(DependencyType.Folder));

newPkgVm.Name = packageName;
newPkgVm.MajorVersion = "0";
newPkgVm.MinorVersion = "0";
newPkgVm.BuildVersion = "1";
newPkgVm.PublishLocallyCommand.Execute();
// Arrange - mockup the whole logic
var pkg = new Package(publishPath, packageName, "1.0.0", "MIT"); // The Package
var files = newPkgVm.BuildPackage(); // We get the files as we would do in the process
var updatedFiles = newPkgVm.UpdateFilesForRetainFolderStructure(files); // We update the files as we would do in the process
var pkgsDir = Path.GetTempPath(); // The folder to install the package into
var roots = newPkgVm.GetCommonPaths(files.ToArray()); // We use the same function the process is using to create the roots

var fs = new RecordedFileSystem((fn) => updatedFiles.SelectMany(files => files).ToList().Any((x) => ComparePaths(x, fn)));
var db = new PackageDirectoryBuilder(fs, MockMaker.Empty<IPathRemapper>());

// Act
db.BuildRetainDirectory(pkg, pkgsDir, roots, updatedFiles, Enumerable.Empty<string>());

Assert.IsTrue(Directory.Exists(publishPath));

// Arrange
var createdFiles = Directory.GetFiles(publishPath, "*", SearchOption.AllDirectories).ToList();
var createdFolders = Directory.GetDirectories(publishPath, "*", SearchOption.AllDirectories).ToList();

// Assert
Assert.AreEqual(createdFiles.Count(), previewFiles.Count());
Assert.AreEqual(3, createdFolders.Count());
Assert.AreEqual(fs.CopiedFiles.Count(), previewFiles.Count());
Assert.AreEqual(3, createdFolders.Count());

// Clean up
Directory.Delete(publishPath, true);
}

[Test]
[Ignore("This is testing a very obvious side effect of the publish routine, it's not worth installing a package for it. + no clean up.")]
public void AssertPublishLocalHandleType()
{
var packageName = "SingleFolderPublishPackage";
var pathManager = this.ViewModel.Model.PathManager as PathManager;
var publishPath = Path.Combine(pathManager.DefaultPackagesDirectory, packageName);

string nodePath = Path.Combine(TestDirectory, "core", "docbrowser\\pkgs\\SingleFolderPublishPackageDocs");
var allFiles = Directory.GetFiles(nodePath, "*", SearchOption.AllDirectories).ToList();
Expand All @@ -2395,18 +2395,15 @@ public void AssertPublishLocalHandleType()

// Assert
Assert.AreEqual(PackageUploadHandle.UploadType.Local, newPkgVm.UploadType);

// Clean up
Directory.Delete(publishPath, true);
}

[Test]
public void AssertPublishNewPackageVersion_SuccessfulForLoadedPackages()
{
var packageName = "Package";
var pathManager = this.ViewModel.Model.PathManager as PathManager;
var publishPath = Path.Combine(pathManager.DefaultPackagesDirectory, packageName);
var pkgLoader = GetPackageLoader();
var publishPath = Path.Combine(Path.GetTempPath(), packageName);
Directory.CreateDirectory(publishPath);

// Load a package
string packageLocation = Path.Combine(GetTestDirectory(ExecutingDirectory), "pkgs", packageName);
Expand Down

0 comments on commit 9416de4

Please sign in to comment.