Update unit test, now that bundler is a library

dotnet · Apr 12, 2019 · 512fb85 · 512fb85
1 parent ed673ce
commit 512fb85
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/test/HostActivationTests/BundledAppWithSubDirs.cs b/src/test/HostActivationTests/BundledAppWithSubDirs.cs
@@ -29,23 +29,20 @@ private void Bundle_And_Run_App_With_Subdirs_Succeeds()
             // once associated changes in SDK repo are checked in.
             string singleFileDir = Path.Combine(fixture.TestProject.ProjectDirectory, "oneExe");
             Directory.CreateDirectory(singleFileDir);
-            string bundleDll = Path.Combine(sharedTestState.RepoDirectories.Artifacts,
-                                            "Microsoft.NET.Build.Bundle",
-                                            "netcoreapp2.0",
-                                            "Microsoft.NET.Build.Bundle.dll");
-            string[] bundleArgs = { "--source", fixture.TestProject.OutputDirectory,
-                                    "--apphost", hostName,
-                                    "--output", singleFileDir };
+            var bundler = new Microsoft.NET.HostModel.Bundle.Bundler(hostName, singleFileDir);
+            string singleFile = bundler.GenerateBundle(fixture.TestProject.OutputDirectory);
 
-            fixture.SdkDotnet.Exec(bundleDll, bundleArgs)
+            // Run the bundled app (extract files)
+            Command.Create(singleFile)
                 .CaptureStdErr()
                 .CaptureStdOut()
                 .Execute()
                 .Should()
-                .Pass();
+                .Pass()
+                .And
+                .HaveStdOutContaining("Wow! We now say hello to the big world and you.");
 
-            // Run the bundled app
-            string singleFile = Path.Combine(singleFileDir, hostName);
+            // Run the bundled app again (reuse extracted files)
             Command.Create(singleFile)
                 .CaptureStdErr()
                 .CaptureStdOut()

diff --git a/src/test/HostActivationTests/HostActivationTests.csproj b/src/test/HostActivationTests/HostActivationTests.csproj
@@ -14,6 +14,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\TestUtils\TestUtils.csproj" />
+    <!-- This project reference should be removed once SDK changes to bundle via publish are available -->
+    <ProjectReference Include="..\..\managed\Microsoft.NET.HostModel\Microsoft.NET.HostModel.csproj" />
   </ItemGroup>
 
   <ItemGroup>