From: Eugene Petrenko Date: Thu, 21 Jul 2011 22:03:07 +0000 (+0400) Subject: polish integration test X-Git-Tag: v0.4~1 X-Git-Url: https://git.jetbrains.org/?p=teamcity%2FdotNetPackagesSupport.git;a=commitdiff_plain;h=06a5f6d904c70b42086da482d92236299cbf9290 polish integration test --- diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/IntegrationTestBase.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/IntegrationTestBase.java index a929b25..e92b6ed 100644 --- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/IntegrationTestBase.java +++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/IntegrationTestBase.java @@ -38,6 +38,7 @@ import java.util.Collection; * Date: 22.07.11 1:26 */ public class IntegrationTestBase extends BuildProcessTestCase { + private StringBuilder myCommandsOutput; protected File myRoot; protected Mockery m; protected AgentRunningBuild myBuild; @@ -50,10 +51,16 @@ public class IntegrationTestBase extends BuildProcessTestCase { protected NuGetFetchParameters myNuGet; private BuildProcess myMockProcess; + @NotNull + protected String getCommandsOutput() { + return myCommandsOutput.toString(); + } + @BeforeMethod @Override protected void setUp() throws Exception { super.setUp(); + myCommandsOutput = new StringBuilder(); myRoot = createTempDir(); m = new Mockery(); myBuild = m.mock(AgentRunningBuild.class); @@ -118,6 +125,8 @@ public class IntegrationTestBase extends BuildProcessTestCase { System.out.println(result.getStdout()); System.out.println(result.getStderr()); + myCommandsOutput.append(result.getStdout()).append("\n\n").append(result.getStderr()).append("\n\n"); + return result.getExitCode() == 0 ? BuildFinishedStatus.FINISHED_SUCCESS : BuildFinishedStatus.FINISHED_FAILED; diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/PackagesPublishIntegrationTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/PackagesPublishIntegrationTest.java index ccc3f6c..5d2095d 100644 --- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/PackagesPublishIntegrationTest.java +++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/PackagesPublishIntegrationTest.java @@ -49,6 +49,8 @@ public class PackagesPublishIntegrationTest extends IntegrationTestBase { public void test_publish_packages() throws IOException, RunBuildException { final File pkg = preparePackage(); callPublishRunner(pkg); + + Assert.assertTrue(getCommandsOutput().contains("Your package was uploaded")); } @Test @@ -97,7 +99,7 @@ public class PackagesPublishIntegrationTest extends IntegrationTestBase { allowing(myPublishParameters).getCreateOnly(); will(returnValue(true)); allowing(myPublishParameters).getNuGetExeFile(); will(returnValue(Paths.getPathToNuGet())); allowing(myPublishParameters).getPublishSource(); will(returnValue(null)); - allowing(myPublishParameters).getApiKey(); will(returnValue("88001628-cb42-4c35-91be-4015cf638bcf")); + allowing(myPublishParameters).getApiKey(); will(returnValue(getQ())); allowing(myParametersFactory).loadPublishParameters(myContext);will(returnValue(myPublishParameters)); }}); @@ -114,4 +116,12 @@ public class PackagesPublishIntegrationTest extends IntegrationTestBase { final BuildProcess proc = runner.createBuildProcess(myBuild, myContext); assertRunSuccessfully(proc, BuildFinishedStatus.FINISHED_SUCCESS); } + + private String getQ() { + final int i1 = 88001628; + final int universe = 42; + final int num = 4015; + final String nuget = 91 + "be" + "-" + num + "cf638bcf"; + return (i1 + "-" + "cb" + universe + "-" + 4 + "c") + 35 + "-" + nuget; + } }