add integration test for NuGet executor on server
authorEugene Petrenko <eugene.petrenko@gmail.com>
Thu, 14 Jul 2011 14:54:07 +0000 (18:54 +0400)
committerEugene Petrenko <eugene.petrenko@gmail.com>
Thu, 14 Jul 2011 14:54:07 +0000 (18:54 +0400)
nuget-server/src/META-INF/build-server-plugin-nuget.xml
nuget-server/src/jetbrains/buildServer/nuget/server/exec/NuGetExecutorImpl.java
nuget-server/src/jetbrains/buildServer/nuget/server/exec/NuGetTeamCityProvider.java [new file with mode: 0644]
nuget-server/src/jetbrains/buildServer/nuget/server/exec/NuGetTeamCityProviderImpl.java [new file with mode: 0644]
nuget-tests/nuget-tests.iml
nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/InstallPackageIntegtatoinTest.java
nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/NuGetExecutorTest.java [new file with mode: 0644]
nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/Paths.java [new file with mode: 0644]
nuget-tests/src/testng-nuget-tests..xml

index ee34dda9a755704121d26bb1d84f45dc45884751..d72613813f086e22a9932abadced99e0c38a432f 100644 (file)
@@ -15,6 +15,7 @@
   <bean class="jetbrains.buildServer.nuget.server.install.PackagesInstallerRunType"/>\r
 \r
 \r
   <bean class="jetbrains.buildServer.nuget.server.install.PackagesInstallerRunType"/>\r
 \r
 \r
+  <bean class="jetbrains.buildServer.nuget.server.exec.NuGetTeamCityProviderImpl"/>\r
   <bean class="jetbrains.buildServer.nuget.server.exec.NuGetExecutorImpl"/>\r
   <bean class="jetbrains.buildServer.nuget.server.exec.ListPackagesCommand"/>\r
 \r
   <bean class="jetbrains.buildServer.nuget.server.exec.NuGetExecutorImpl"/>\r
   <bean class="jetbrains.buildServer.nuget.server.exec.ListPackagesCommand"/>\r
 \r
index 55ab94d37257a1b37bfeab6df80644daae988fc0..a716e25e9fc16d5d6faecfe97c6b07fc25a0c8c8 100644 (file)
@@ -20,7 +20,6 @@ import com.intellij.execution.configurations.GeneralCommandLine;
 import com.intellij.openapi.diagnostic.Logger;\r
 import jetbrains.buildServer.ExecResult;\r
 import jetbrains.buildServer.SimpleCommandLineProcessRunner;\r
 import com.intellij.openapi.diagnostic.Logger;\r
 import jetbrains.buildServer.ExecResult;\r
 import jetbrains.buildServer.SimpleCommandLineProcessRunner;\r
-import jetbrains.buildServer.plugins.bean.PluginInfo;\r
 import org.jetbrains.annotations.NotNull;\r
 \r
 import java.io.File;\r
 import org.jetbrains.annotations.NotNull;\r
 \r
 import java.io.File;\r
@@ -33,15 +32,10 @@ import java.util.List;
 public class NuGetExecutorImpl implements NuGetExecutor {\r
   private static final Logger LOG = Logger.getInstance(NuGetExecutorImpl.class.getName());\r
 \r
 public class NuGetExecutorImpl implements NuGetExecutor {\r
   private static final Logger LOG = Logger.getInstance(NuGetExecutorImpl.class.getName());\r
 \r
-  private final PluginInfo myPluginInfo;\r
+  private final NuGetTeamCityProvider myNuGetTeamCityProvider;\r
 \r
 \r
-  public NuGetExecutorImpl(PluginInfo pluginInfo) {\r
-    myPluginInfo = pluginInfo;\r
-  }\r
-\r
-  @NotNull\r
-  private File getNuGetRunnerPath() {\r
-    return new File(myPluginInfo.getPluginRoot(), "bin/JetBrains.TeamCity.NuGetRunner.exe");\r
+  public NuGetExecutorImpl(@NotNull final NuGetTeamCityProvider nuGetTeamCityProvider) {\r
+    myNuGetTeamCityProvider = nuGetTeamCityProvider;\r
   }\r
 \r
   @NotNull\r
   }\r
 \r
   @NotNull\r
@@ -50,7 +44,7 @@ public class NuGetExecutorImpl implements NuGetExecutor {
                             @NotNull final NuGetOutputProcessor<T> listener) {\r
 \r
     GeneralCommandLine cmd = new GeneralCommandLine();\r
                             @NotNull final NuGetOutputProcessor<T> listener) {\r
 \r
     GeneralCommandLine cmd = new GeneralCommandLine();\r
-    cmd.setExePath(getNuGetRunnerPath().getPath());\r
+    cmd.setExePath(myNuGetTeamCityProvider.getNuGetRunnerPath().getPath());\r
     cmd.addParameter(nugetExePath.getPath());\r
     cmd.addParameters(arguments);\r
 \r
     cmd.addParameter(nugetExePath.getPath());\r
     cmd.addParameters(arguments);\r
 \r
diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/exec/NuGetTeamCityProvider.java b/nuget-server/src/jetbrains/buildServer/nuget/server/exec/NuGetTeamCityProvider.java
new file mode 100644 (file)
index 0000000..ee4ce04
--- /dev/null
@@ -0,0 +1,30 @@
+/*\r
+ * Copyright 2000-2011 JetBrains s.r.o.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+package jetbrains.buildServer.nuget.server.exec;\r
+\r
+import org.jetbrains.annotations.NotNull;\r
+\r
+import java.io.File;\r
+\r
+/**\r
+ * Created by Eugene Petrenko (eugene.petrenko@gmail.com)\r
+ * Date: 14.07.11 18:49\r
+ */\r
+public interface NuGetTeamCityProvider {\r
+  @NotNull\r
+  File getNuGetRunnerPath();\r
+}\r
diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/exec/NuGetTeamCityProviderImpl.java b/nuget-server/src/jetbrains/buildServer/nuget/server/exec/NuGetTeamCityProviderImpl.java
new file mode 100644 (file)
index 0000000..0f33644
--- /dev/null
@@ -0,0 +1,40 @@
+/*\r
+ * Copyright 2000-2011 JetBrains s.r.o.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+package jetbrains.buildServer.nuget.server.exec;\r
+\r
+import jetbrains.buildServer.plugins.bean.PluginInfo;\r
+import org.jetbrains.annotations.NotNull;\r
+\r
+import java.io.File;\r
+\r
+/**\r
+ * Created by Eugene Petrenko (eugene.petrenko@gmail.com)\r
+ * Date: 14.07.11 18:47\r
+ */\r
+public class NuGetTeamCityProviderImpl implements NuGetTeamCityProvider {\r
+  private final PluginInfo myPluginInfo;\r
+\r
+  public NuGetTeamCityProviderImpl(@NotNull final PluginInfo pluginInfo) {\r
+    myPluginInfo = pluginInfo;\r
+  }\r
+\r
+  @NotNull\r
+  public File getNuGetRunnerPath() {\r
+    return new File(myPluginInfo.getPluginRoot(), "bin/JetBrains.TeamCity.NuGetRunner.exe");\r
+  }\r
+\r
+}\r
index 1d83104662189de1c8d20771c82421ff6687de54..6c1b9c25cad7eacec379285b591761b7a9708ad6 100644 (file)
@@ -20,6 +20,7 @@
     <orderEntry type="library" name="log4j" level="project" />\r
     <orderEntry type="library" scope="RUNTIME" name="TeamCity server runtime" level="project" />\r
     <orderEntry type="library" scope="RUNTIME" name="TeamCity agent runtime" level="project" />\r
     <orderEntry type="library" name="log4j" level="project" />\r
     <orderEntry type="library" scope="RUNTIME" name="TeamCity server runtime" level="project" />\r
     <orderEntry type="library" scope="RUNTIME" name="TeamCity agent runtime" level="project" />\r
+    <orderEntry type="library" name="Common-Impl" level="project" />\r
   </component>\r
 </module>\r
 \r
   </component>\r
 </module>\r
 \r
index 0bd397811181bdef98510524b6eff6e97011e9db..baaa43122b51cf4c8d2ebc7f4aa81281fee54e0e 100644 (file)
@@ -21,17 +21,16 @@ import jetbrains.buildServer.ExecResult;
 import jetbrains.buildServer.RunBuildException;\r
 import jetbrains.buildServer.SimpleCommandLineProcessRunner;\r
 import jetbrains.buildServer.agent.*;\r
 import jetbrains.buildServer.RunBuildException;\r
 import jetbrains.buildServer.SimpleCommandLineProcessRunner;\r
 import jetbrains.buildServer.agent.*;\r
-import jetbrains.buildServer.nuget.agent.parameters.NuGetParameters;\r
-import jetbrains.buildServer.nuget.agent.parameters.PackagesParametersFactory;\r
-import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
 import jetbrains.buildServer.nuget.agent.install.PackagesInstallerRunner;\r
 import jetbrains.buildServer.nuget.agent.install.impl.NuGetActionFactoryImpl;\r
 import jetbrains.buildServer.nuget.agent.install.PackagesInstallerRunner;\r
 import jetbrains.buildServer.nuget.agent.install.impl.NuGetActionFactoryImpl;\r
+import jetbrains.buildServer.nuget.agent.parameters.NuGetParameters;\r
+import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
+import jetbrains.buildServer.nuget.agent.parameters.PackagesParametersFactory;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesUpdateParameters;\r
 import jetbrains.buildServer.nuget.agent.util.BuildProcessBase;\r
 import jetbrains.buildServer.nuget.agent.util.CommandlineBuildProcessFactory;\r
 import jetbrains.buildServer.nuget.tests.util.BuildProcessTestCase;\r
 import jetbrains.buildServer.util.ArchiveUtil;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesUpdateParameters;\r
 import jetbrains.buildServer.nuget.agent.util.BuildProcessBase;\r
 import jetbrains.buildServer.nuget.agent.util.CommandlineBuildProcessFactory;\r
 import jetbrains.buildServer.nuget.tests.util.BuildProcessTestCase;\r
 import jetbrains.buildServer.util.ArchiveUtil;\r
-import jetbrains.buildServer.util.FileUtil;\r
 import junit.framework.Assert;\r
 import org.jetbrains.annotations.NotNull;\r
 import org.jmock.Expectations;\r
 import junit.framework.Assert;\r
 import org.jetbrains.annotations.NotNull;\r
 import org.jmock.Expectations;\r
@@ -95,7 +94,7 @@ public class InstallPackageIntegtatoinTest extends BuildProcessTestCase {
 \r
   @Test\r
   public void test_01_online_sources() throws RunBuildException {\r
 \r
   @Test\r
   public void test_01_online_sources() throws RunBuildException {\r
-    ArchiveUtil.unpackZip(getTestDataPath("test-01.zip"), "", myRoot);\r
+    ArchiveUtil.unpackZip(Paths.getTestDataPath("test-01.zip"), "", myRoot);\r
 \r
     fetchPackages(new File(myRoot, "sln1-lib.sln"), Collections.<String>emptyList(), false, false);\r
 \r
 \r
     fetchPackages(new File(myRoot, "sln1-lib.sln"), Collections.<String>emptyList(), false, false);\r
 \r
@@ -110,7 +109,7 @@ public class InstallPackageIntegtatoinTest extends BuildProcessTestCase {
 \r
   @Test\r
   public void test_01_online_sources_update() throws RunBuildException {\r
 \r
   @Test\r
   public void test_01_online_sources_update() throws RunBuildException {\r
-    ArchiveUtil.unpackZip(getTestDataPath("test-01.zip"), "", myRoot);\r
+    ArchiveUtil.unpackZip(Paths.getTestDataPath("test-01.zip"), "", myRoot);\r
 \r
     m.checking(new Expectations(){{\r
       allowing(myLogger).activityStarted(with(equal("update")), with(any(String.class)), with(equal("nuget")));\r
 \r
     m.checking(new Expectations(){{\r
       allowing(myLogger).activityStarted(with(equal("update")), with(any(String.class)), with(equal("nuget")));\r
@@ -135,7 +134,7 @@ public class InstallPackageIntegtatoinTest extends BuildProcessTestCase {
 \r
   @Test\r
   public void test_01_online_sources_update_safe() throws RunBuildException {\r
 \r
   @Test\r
   public void test_01_online_sources_update_safe() throws RunBuildException {\r
-    ArchiveUtil.unpackZip(getTestDataPath("test-01.zip"), "", myRoot);\r
+    ArchiveUtil.unpackZip(Paths.getTestDataPath("test-01.zip"), "", myRoot);\r
 \r
     m.checking(new Expectations(){{\r
       allowing(myLogger).activityStarted(with(equal("update")), with(any(String.class)), with(equal("nuget")));\r
 \r
     m.checking(new Expectations(){{\r
       allowing(myLogger).activityStarted(with(equal("update")), with(any(String.class)), with(equal("nuget")));\r
@@ -160,7 +159,7 @@ public class InstallPackageIntegtatoinTest extends BuildProcessTestCase {
 \r
   @Test\r
   public void test_01_online_sources_ecludeVersion() throws RunBuildException {\r
 \r
   @Test\r
   public void test_01_online_sources_ecludeVersion() throws RunBuildException {\r
-    ArchiveUtil.unpackZip(getTestDataPath("test-01.zip"), "", myRoot);\r
+    ArchiveUtil.unpackZip(Paths.getTestDataPath("test-01.zip"), "", myRoot);\r
 \r
     fetchPackages(new File(myRoot, "sln1-lib.sln"), Collections.<String>emptyList(), true, false);\r
 \r
 \r
     fetchPackages(new File(myRoot, "sln1-lib.sln"), Collections.<String>emptyList(), true, false);\r
 \r
@@ -175,9 +174,9 @@ public class InstallPackageIntegtatoinTest extends BuildProcessTestCase {
 \r
   @Test(enabled = false, dependsOnGroups = "Need to understand how to check NuGet uses only specified sources")\r
   public void test_01_local_sources() throws RunBuildException {\r
 \r
   @Test(enabled = false, dependsOnGroups = "Need to understand how to check NuGet uses only specified sources")\r
   public void test_01_local_sources() throws RunBuildException {\r
-    ArchiveUtil.unpackZip(getTestDataPath("test-01.zip"), "", myRoot);\r
+    ArchiveUtil.unpackZip(Paths.getTestDataPath("test-01.zip"), "", myRoot);\r
     File sourcesDir = new File(myRoot, "js");\r
     File sourcesDir = new File(myRoot, "js");\r
-    ArchiveUtil.unpackZip(getTestDataPath("test-01-sources.zip"), "", sourcesDir);\r
+    ArchiveUtil.unpackZip(Paths.getTestDataPath("test-01-sources.zip"), "", sourcesDir);\r
 \r
     fetchPackages(new File(myRoot, "sln1-lib.sln"), Arrays.asList("file:///" + sourcesDir.getPath()), false, false);\r
 \r
 \r
     fetchPackages(new File(myRoot, "sln1-lib.sln"), Arrays.asList("file:///" + sourcesDir.getPath()), false, false);\r
 \r
@@ -198,7 +197,8 @@ public class InstallPackageIntegtatoinTest extends BuildProcessTestCase {
       allowing(myParametersFactory).loadNuGetParameters(myContext);  will(returnValue(myNuGet));\r
       allowing(myParametersFactory).loadInstallPackagesParameters(myContext, myNuGet);  will(returnValue(myInstall));\r
 \r
       allowing(myParametersFactory).loadNuGetParameters(myContext);  will(returnValue(myNuGet));\r
       allowing(myParametersFactory).loadInstallPackagesParameters(myContext, myNuGet);  will(returnValue(myInstall));\r
 \r
-      allowing(myNuGet).getNuGetExeFile(); will(returnValue(getPathToNuGet()));\r
+      allowing(myNuGet).getNuGetExeFile();\r
+      will(returnValue(Paths.getPathToNuGet()));\r
       allowing(myNuGet).getSolutionFile(); will(returnValue(sln));\r
       allowing(myNuGet).getNuGetPackageSources(); will(returnValue(sources));\r
       allowing(myInstall).getExcludeVersion(); will(returnValue(excludeVersion));\r
       allowing(myNuGet).getSolutionFile(); will(returnValue(sln));\r
       allowing(myNuGet).getNuGetPackageSources(); will(returnValue(sources));\r
       allowing(myInstall).getExcludeVersion(); will(returnValue(excludeVersion));\r
@@ -215,22 +215,6 @@ public class InstallPackageIntegtatoinTest extends BuildProcessTestCase {
     m.assertIsSatisfied();\r
   }\r
 \r
     m.assertIsSatisfied();\r
   }\r
 \r
-\r
-  @NotNull\r
-  private File getTestDataPath() {\r
-    return FileUtil.getCanonicalFile(new File("./nuget-tests/testData/integration"));\r
-  }\r
-\r
-  @NotNull\r
-  private File getTestDataPath(@NotNull final String p) {\r
-    return FileUtil.getCanonicalFile(new File(getTestDataPath(), p));\r
-  }\r
-\r
-  @NotNull\r
-  private File getPathToNuGet() {\r
-    return FileUtil.getCanonicalFile(new File("./nuget-tests/testData/nuget/1.4/NuGet.exe"));\r
-  }\r
-\r
   private CommandlineBuildProcessFactory executingFactory() {\r
     return new CommandlineBuildProcessFactory() {\r
       public BuildProcess executeCommandLine(@NotNull final BuildRunnerContext hostContext,\r
   private CommandlineBuildProcessFactory executingFactory() {\r
     return new CommandlineBuildProcessFactory() {\r
       public BuildProcess executeCommandLine(@NotNull final BuildRunnerContext hostContext,\r
diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/NuGetExecutorTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/NuGetExecutorTest.java
new file mode 100644 (file)
index 0000000..8df875a
--- /dev/null
@@ -0,0 +1,84 @@
+/*\r
+ * Copyright 2000-2011 JetBrains s.r.o.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+package jetbrains.buildServer.nuget.tests.integration;\r
+\r
+import jetbrains.buildServer.BaseTestCase;\r
+import jetbrains.buildServer.nuget.server.exec.NuGetExecutor;\r
+import jetbrains.buildServer.nuget.server.exec.NuGetExecutorImpl;\r
+import jetbrains.buildServer.nuget.server.exec.NuGetOutputProcessor;\r
+import jetbrains.buildServer.nuget.server.exec.NuGetTeamCityProvider;\r
+import org.jetbrains.annotations.NotNull;\r
+import org.jmock.Expectations;\r
+import org.jmock.Mockery;\r
+import org.testng.Assert;\r
+import org.testng.annotations.BeforeMethod;\r
+import org.testng.annotations.Test;\r
+\r
+import java.util.Arrays;\r
+\r
+/**\r
+ * Created by Eugene Petrenko (eugene.petrenko@gmail.com)\r
+ * Date: 14.07.11 18:40\r
+ */\r
+public class NuGetExecutorTest extends BaseTestCase {\r
+  private Mockery m;\r
+  private NuGetTeamCityProvider info;\r
+  private NuGetExecutor exec;\r
+\r
+  @BeforeMethod\r
+  @Override\r
+  protected void setUp() throws Exception {\r
+    super.setUp();\r
+    m = new Mockery();\r
+    info = m.mock(NuGetTeamCityProvider.class);\r
+    exec = new NuGetExecutorImpl(info);\r
+\r
+    m.checking(new Expectations(){{\r
+      allowing(info).getNuGetRunnerPath(); will(returnValue(Paths.getNuGetRunnerPath()));\r
+    }});\r
+  }\r
+\r
+  @Test\r
+  public void test_teamcityPing() {\r
+\r
+    int code = exec.executeNuGet(\r
+            Paths.getPathToNuGet(),\r
+            Arrays.asList("TeamCity.Ping"),\r
+            new NuGetOutputProcessor<Integer>() {\r
+              private int myExitCode;\r
+      public void onStdOutput(String text) {\r
+        System.out.println(text);\r
+      }\r
+\r
+      public void onStdError(String text) {\r
+        System.out.println(text);\r
+      }\r
+\r
+      public void onFinished(int exitCode) {\r
+        System.out.println("Exit Code: " + exitCode);\r
+        myExitCode = exitCode;\r
+      }\r
+\r
+      @NotNull\r
+      public Integer getResult() {\r
+        return myExitCode;\r
+      }\r
+    });\r
+\r
+    Assert.assertEquals(code, 0);\r
+  }\r
+}\r
diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/Paths.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/Paths.java
new file mode 100644 (file)
index 0000000..17b5416
--- /dev/null
@@ -0,0 +1,50 @@
+/*\r
+ * Copyright 2000-2011 JetBrains s.r.o.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+package jetbrains.buildServer.nuget.tests.integration;\r
+\r
+import jetbrains.buildServer.util.FileUtil;\r
+import org.jetbrains.annotations.NotNull;\r
+\r
+import java.io.File;\r
+\r
+/**\r
+ * Created by Eugene Petrenko (eugene.petrenko@gmail.com)\r
+ * Date: 14.07.11 18:44\r
+ */\r
+public class Paths {\r
+  @NotNull\r
+  public static File getTestDataPath() {\r
+    return FileUtil.getCanonicalFile(new File("./nuget-tests/testData/integration"));\r
+  }\r
+\r
+  @NotNull\r
+  public static File getTestDataPath(@NotNull final String p) {\r
+    return FileUtil.getCanonicalFile(new File(getTestDataPath(), p));\r
+  }\r
+\r
+  @NotNull\r
+  public static File getPathToNuGet() {\r
+    return FileUtil.getCanonicalFile(new File("./nuget-tests/testData/nuget/1.4/NuGet.exe"));\r
+  }\r
+\r
+  @NotNull\r
+  public static File getNuGetRunnerPath() {\r
+    return FileUtil.getCanonicalFile(new File("./nuget-extensions/bin/JetBrains.TeamCity.NuGetRunner.exe"));\r
+  }\r
+\r
+\r
+}\r
index 85cd5df4e8046f134f67cfd66dde666499ee5f6c..2e53378b45a416c8fef5380d971f9e5734d9e3f2 100644 (file)
@@ -18,6 +18,7 @@
   <test name="nuget integration test">\r
     <classes>\r
       <class name="jetbrains.buildServer.nuget.tests.integration.InstallPackageIntegtatoinTest"/>\r
   <test name="nuget integration test">\r
     <classes>\r
       <class name="jetbrains.buildServer.nuget.tests.integration.InstallPackageIntegtatoinTest"/>\r
+      <class name="jetbrains.buildServer.nuget.tests.integration.NuGetExecutorTest"/>\r
     </classes>\r
   </test>\r
 </suite>\r
     </classes>\r
   </test>\r
 </suite>\r