rename classes

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/LocateNuGetConfigBuildProcess.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/LocateNuGetConfigBuildProcess.java
index a047ce9e20c38f33f642adf9bc1f48214d8c14ee..352332a1fb497a38813f2795f1d41dc726bb543e 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/LocateNuGetConfigBuildProcess.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/LocateNuGetConfigBuildProcess.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import jetbrains.buildServer.RunBuildException;\r
 import jetbrains.buildServer.agent.BuildFinishedStatus;\r
 import jetbrains.buildServer.agent.BuildProgressLogger;\r
-import jetbrains.buildServer.nuget.agent.parameters.NuGetParameters;\r
+import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
 import jetbrains.buildServer.nuget.agent.util.BuildProcessBase;\r
 import jetbrains.buildServer.util.FileUtil;\r
 import jetbrains.buildServer.util.StringUtil;\r
@@ -41,11 +41,11 @@ import java.util.List;
 public class LocateNuGetConfigBuildProcess extends BuildProcessBase {\r
   private static final Logger LOG = Logger.getInstance(LocateNuGetConfigBuildProcess.class.getName());\r
 \r
-  private final NuGetParameters myContext;\r
+  private final NuGetFetchParameters myContext;\r
   private final BuildProgressLogger myLogger;\r
   private final Callback myCallback;\r
 \r
-  public LocateNuGetConfigBuildProcess(@NotNull final NuGetParameters context,\r
+  public LocateNuGetConfigBuildProcess(@NotNull final NuGetFetchParameters context,\r
                                        @NotNull final BuildProgressLogger logger,\r
                                        @NotNull final Callback callback) {\r
     myContext = context;\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/NuGetActionFactory.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/NuGetActionFactory.java
index 94bb7dee3409f5c0a3b69582360dfd222814edf7..7bee209fe93d794bca92be3f3a3fff982da68359 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/NuGetActionFactory.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/NuGetActionFactory.java
@@ -19,7 +19,7 @@ package jetbrains.buildServer.nuget.agent.install;
 import jetbrains.buildServer.RunBuildException;\r
 import jetbrains.buildServer.agent.BuildProcess;\r
 import jetbrains.buildServer.agent.BuildRunnerContext;\r
-import jetbrains.buildServer.nuget.agent.parameters.NuGetParameters;\r
+import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesUpdateParameters;\r
 import org.jetbrains.annotations.NotNull;\r
@@ -45,7 +45,7 @@ public interface NuGetActionFactory {
 \r
   @NotNull\r
   BuildProcess createUsageReport(@NotNull BuildRunnerContext context,\r
-                                 @NotNull NuGetParameters params,\r
+                                 @NotNull NuGetFetchParameters params,\r
                                  @NotNull File packagesConfig,\r
                                  @NotNull File targetFolder) throws RunBuildException;\r
 }\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/PackagesInstallerRunner.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/PackagesInstallerRunner.java
index 6c5c07a5d816304bbf3f60ab0effaaf944971583..47d1745eec92e46bba946a98a2148ac446d7504c 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/PackagesInstallerRunner.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/PackagesInstallerRunner.java
@@ -22,7 +22,7 @@ import jetbrains.buildServer.agent.*;
 import jetbrains.buildServer.nuget.agent.install.impl.InstallStages;\r
 import jetbrains.buildServer.nuget.agent.install.impl.InstallStagesImpl;\r
 import jetbrains.buildServer.nuget.agent.install.impl.PackagesInstallerBuilder;\r
-import jetbrains.buildServer.nuget.agent.parameters.NuGetParameters;\r
+import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\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
@@ -58,7 +58,7 @@ public class PackagesInstallerRunner implements AgentBuildRunner, AgentBuildRunn
 \r
   private void createStages(@NotNull final BuildRunnerContext context,\r
                             @NotNull final InstallStages stages) throws RunBuildException {\r
-    final NuGetParameters parameters = myParametersFactory.loadNuGetParameters(context);\r
+    final NuGetFetchParameters parameters = myParametersFactory.loadNuGetParameters(context);\r
     final PackagesInstallParameters installParameters = myParametersFactory.loadInstallPackagesParameters(context, parameters);\r
     final PackagesUpdateParameters updateParameters = myParametersFactory.loadUpdatePackagesParameters(context, parameters);\r
 \r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/LoggingNuGetActionFactoryImpl.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/LoggingNuGetActionFactoryImpl.java
index 04812bb5c6bea5242fac63701355c6bc3fcadd35..eadaad4c317349b4a284d9d0dc1416fa808a0c13 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/LoggingNuGetActionFactoryImpl.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/LoggingNuGetActionFactoryImpl.java
@@ -21,7 +21,7 @@ import jetbrains.buildServer.agent.BuildProcess;
 import jetbrains.buildServer.agent.BuildProgressLogger;\r
 import jetbrains.buildServer.agent.BuildRunnerContext;\r
 import jetbrains.buildServer.nuget.agent.install.NuGetActionFactory;\r
-import jetbrains.buildServer.nuget.agent.parameters.NuGetParameters;\r
+import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesUpdateParameters;\r
 import jetbrains.buildServer.nuget.agent.util.DelegatingBuildProcess;\r
@@ -42,7 +42,7 @@ public class LoggingNuGetActionFactoryImpl implements NuGetActionFactory {
   }\r
 \r
   @NotNull\r
-  public BuildProcess createUsageReport(@NotNull BuildRunnerContext context, @NotNull NuGetParameters params, @NotNull File packagesConfig, @NotNull File targetFolder) throws RunBuildException {\r
+  public BuildProcess createUsageReport(@NotNull BuildRunnerContext context, @NotNull NuGetFetchParameters params, @NotNull File packagesConfig, @NotNull File targetFolder) throws RunBuildException {\r
     return myActionFactory.createUsageReport(context, params, packagesConfig, targetFolder);\r
   }\r
 \r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/NuGetActionFactoryImpl.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/NuGetActionFactoryImpl.java
index 640a7f7189ce666b27eb1c14adcdfbac168199be..40a0dee9a9b2decd50801943c55f7fcd0f12608c 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/NuGetActionFactoryImpl.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/install/impl/NuGetActionFactoryImpl.java
@@ -23,7 +23,7 @@ import jetbrains.buildServer.agent.BuildProcess;
 import jetbrains.buildServer.agent.BuildRunnerContext;\r
 import jetbrains.buildServer.nuget.agent.install.NuGetActionFactory;\r
 import jetbrains.buildServer.nuget.agent.install.PackageUsages;\r
-import jetbrains.buildServer.nuget.agent.parameters.NuGetParameters;\r
+import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesUpdateParameters;\r
 import jetbrains.buildServer.nuget.agent.util.BuildProcessBase;\r
@@ -95,7 +95,7 @@ public class NuGetActionFactoryImpl implements NuGetActionFactory {
 \r
   @NotNull\r
   public BuildProcess createUsageReport(@NotNull final BuildRunnerContext context,\r
-                                        @NotNull final NuGetParameters params,\r
+                                        @NotNull final NuGetFetchParameters params,\r
                                         @NotNull final File packagesConfig,\r
                                         @NotNull final File targetFolder) throws RunBuildException {\r
     return new BuildProcessBase() {\r
@@ -110,7 +110,7 @@ public class NuGetActionFactoryImpl implements NuGetActionFactory {
 \r
   @NotNull\r
   private BuildProcess executeNuGet(@NotNull final BuildRunnerContext context,\r
-                                    @NotNull final NuGetParameters nuget,\r
+                                    @NotNull final NuGetFetchParameters nuget,\r
                                     @NotNull final Collection<String> arguments,\r
                                     @NotNull final File workingDirectory) throws RunBuildException {\r
     final List<String> argz = new ArrayList<String>(arguments);\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/NuGetParameters.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/NuGetFetchParameters.java
similarity index 91%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/NuGetParameters.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/NuGetFetchParameters.java
index 771761f99217c75f01fa80272902718476edddbd..02a14813fe48a90aca2994d98414cbf4eb5bf317 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/NuGetParameters.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/NuGetFetchParameters.java
@@ -10,7 +10,7 @@ import java.util.Collection;
  * Created by Eugene Petrenko (eugene.petrenko@gmail.com)\r
  * Date: 10.07.11 14:27\r
  */\r
-public interface NuGetParameters {\r
+public interface NuGetFetchParameters {\r
   /**\r
    * @return path to nuget.exe file\r
    * @throws jetbrains.buildServer.RunBuildException if nuget was not found\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/NuGetParametersHolder.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/NuGetFetchParametersHolder.java
similarity index 87%
rename from nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/NuGetParametersHolder.java
rename to nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/NuGetFetchParametersHolder.java
index 66e2ac7e20d41e83adbf134710833913ea2a35aa..6e931c3e2779ce4e9948348344e7fec03c82bea3 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/NuGetParametersHolder.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/NuGetFetchParametersHolder.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
  * Created by Eugene Petrenko (eugene.petrenko@gmail.com)\r
  * Date: 10.07.11 15:57\r
  */\r
-public interface NuGetParametersHolder {\r
+public interface NuGetFetchParametersHolder {\r
   @NotNull\r
-  NuGetParameters getNuGetParameters();\r
+  NuGetFetchParameters getNuGetParameters();\r
 }\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/PackagesInstallParameters.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/PackagesInstallParameters.java
index 2925e8c210a030be83eac4f027ac99a5c44a1ce6..561decf4b99f2bdb5a783b20a7a743029b6feac0 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/PackagesInstallParameters.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/PackagesInstallParameters.java
@@ -20,7 +20,7 @@ package jetbrains.buildServer.nuget.agent.parameters;
  * Created by Eugene Petrenko (eugene.petrenko@gmail.com)\r
  * Date: 07.07.11 16:18\r
  */\r
-public interface PackagesInstallParameters extends NuGetParametersHolder{\r
+public interface PackagesInstallParameters extends NuGetFetchParametersHolder {\r
   /**\r
    * @return true if pacakges are expected to be installed\r
    *         without version\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/PackagesParametersFactory.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/PackagesParametersFactory.java
index a5e9afc08ead318167e76dc11b9b211e71696b83..80e842a57d5ddfb57524db023fa8f844a36edd12 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/PackagesParametersFactory.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/PackagesParametersFactory.java
@@ -34,13 +34,13 @@ public interface PackagesParametersFactory {
    * @throws RunBuildException if failed to create parameters\r
    */\r
   @NotNull\r
-  NuGetParameters loadNuGetParameters(@NotNull final BuildRunnerContext context) throws RunBuildException;\r
+  NuGetFetchParameters loadNuGetParameters(@NotNull final BuildRunnerContext context) throws RunBuildException;\r
 \r
   @Nullable\r
   PackagesInstallParameters loadInstallPackagesParameters(@NotNull final BuildRunnerContext context,\r
-                                                          @NotNull final NuGetParameters nuget) throws RunBuildException;\r
+                                                          @NotNull final NuGetFetchParameters nuget) throws RunBuildException;\r
 \r
   @Nullable\r
   PackagesUpdateParameters loadUpdatePackagesParameters(@NotNull final BuildRunnerContext context,\r
-                                                        @NotNull final NuGetParameters nuget) throws RunBuildException;\r
+                                                        @NotNull final NuGetFetchParameters nuget) throws RunBuildException;\r
 }\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/PackagesUpdateParameters.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/PackagesUpdateParameters.java
index e4e410865bba83314c57822cbec97a6f00fe428b..fca13827fc502fd558cd0033eef82e81f7dcdd00 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/PackagesUpdateParameters.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/PackagesUpdateParameters.java
@@ -26,7 +26,7 @@ import java.util.Collection;
  * Created by Eugene Petrenko (eugene.petrenko@gmail.com)\r
  * Date: 10.07.11 14:02\r
  */\r
-public interface PackagesUpdateParameters extends NuGetParametersHolder {\r
+public interface PackagesUpdateParameters extends NuGetFetchParametersHolder {\r
 \r
   /**\r
    * @return the way packages are updated\r

diff --git a/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/impl/PackagesParametersFactoryImpl.java b/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/impl/PackagesParametersFactoryImpl.java
index 25290c07ab8e71ebda7307804af803c086c4bafe..6cc8f2d651c7f6eedb27978073a20663db45c7c5 100644 (file)
--- a/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/impl/PackagesParametersFactoryImpl.java
+++ b/nuget-agent/src/jetbrains/buildServer/nuget/agent/parameters/impl/PackagesParametersFactoryImpl.java
@@ -38,8 +38,8 @@ import static jetbrains.buildServer.nuget.common.PackagesConstants.*;
  */\r
 public class PackagesParametersFactoryImpl implements PackagesParametersFactory {\r
   @NotNull\r
-  public NuGetParameters loadNuGetParameters(@NotNull final BuildRunnerContext context) throws RunBuildException {\r
-    return new NuGetParameters() {\r
+  public NuGetFetchParameters loadNuGetParameters(@NotNull final BuildRunnerContext context) throws RunBuildException {\r
+    return new NuGetFetchParameters() {\r
 \r
       private File resolvePath(@NotNull final String runnerParameter, @NotNull String name) throws RunBuildException {\r
         String path = getParameter(context, runnerParameter);\r
@@ -101,10 +101,10 @@ public class PackagesParametersFactoryImpl implements PackagesParametersFactory
 \r
 \r
   public PackagesInstallParameters loadInstallPackagesParameters(@NotNull final BuildRunnerContext context,\r
-                                                                 @NotNull final NuGetParameters nuget) throws RunBuildException {\r
+                                                                 @NotNull final NuGetFetchParameters nuget) throws RunBuildException {\r
     return new PackagesInstallParameters() {\r
       @NotNull\r
-      public NuGetParameters getNuGetParameters() {\r
+      public NuGetFetchParameters getNuGetParameters() {\r
         return nuget;\r
       }\r
 \r
@@ -115,12 +115,12 @@ public class PackagesParametersFactoryImpl implements PackagesParametersFactory
   }\r
 \r
   public PackagesUpdateParameters loadUpdatePackagesParameters(@NotNull final BuildRunnerContext context,\r
-                                                               @NotNull final NuGetParameters nuget) throws RunBuildException {\r
+                                                               @NotNull final NuGetFetchParameters nuget) throws RunBuildException {\r
     if (!getBoolean(context, NUGET_UPDATE_PACKAGES)) return null;\r
 \r
     return new PackagesUpdateParameters() {\r
       @NotNull\r
-      public NuGetParameters getNuGetParameters() {\r
+      public NuGetFetchParameters getNuGetParameters() {\r
         return nuget;\r
       }\r
 \r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/LocateNuGetConfigBuildProcessTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/LocateNuGetConfigBuildProcessTest.java
index a0ed14cc6eebe29d277094a5d5925aa3b80c79fb..82dcab7a898456a339fe75a2f3e3c5b80927c39e 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/LocateNuGetConfigBuildProcessTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/LocateNuGetConfigBuildProcessTest.java
@@ -20,7 +20,7 @@ import jetbrains.buildServer.RunBuildException;
 import jetbrains.buildServer.agent.BuildFinishedStatus;\r
 import jetbrains.buildServer.agent.BuildProgressLogger;\r
 import jetbrains.buildServer.nuget.agent.install.LocateNuGetConfigBuildProcess;\r
-import jetbrains.buildServer.nuget.agent.parameters.NuGetParameters;\r
+import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
 import jetbrains.buildServer.nuget.tests.util.BuildProcessTestCase;\r
 import jetbrains.buildServer.util.FileUtil;\r
 import org.jmock.Expectations;\r
@@ -38,7 +38,7 @@ public class LocateNuGetConfigBuildProcessTest extends BuildProcessTestCase {
   private File myRoot;\r
   private Mockery m;\r
   private BuildProgressLogger log;\r
-  private NuGetParameters ps;\r
+  private NuGetFetchParameters ps;\r
   private LocateNuGetConfigBuildProcess.Callback cb;\r
   private LocateNuGetConfigBuildProcess proc;\r
 \r
@@ -49,7 +49,7 @@ public class LocateNuGetConfigBuildProcessTest extends BuildProcessTestCase {
     myRoot = createTempDir();\r
     m = new Mockery();\r
     log = m.mock(BuildProgressLogger.class);\r
-    ps = m.mock(NuGetParameters.class);\r
+    ps = m.mock(NuGetFetchParameters.class);\r
     cb = m.mock(LocateNuGetConfigBuildProcess.Callback.class);\r
     proc = new LocateNuGetConfigBuildProcess(ps, log, cb);\r
   }\r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetInstallPackageActionFactoryTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetInstallPackageActionFactoryTest.java
index 86b8c059d4dc67bf1cdc09c37521521e28e3e20d..54195d3a1c1885debb95bcd15d3a6e61d930cf6a 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetInstallPackageActionFactoryTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetInstallPackageActionFactoryTest.java
@@ -20,7 +20,7 @@ import jetbrains.buildServer.BaseTestCase;
 import jetbrains.buildServer.RunBuildException;\r
 import jetbrains.buildServer.agent.BuildRunnerContext;\r
 import jetbrains.buildServer.nuget.agent.install.PackageUsages;\r
-import jetbrains.buildServer.nuget.agent.parameters.NuGetParameters;\r
+import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
 import jetbrains.buildServer.nuget.agent.install.impl.NuGetActionFactoryImpl;\r
 import jetbrains.buildServer.nuget.agent.util.CommandlineBuildProcessFactory;\r
@@ -44,7 +44,7 @@ public class NuGetInstallPackageActionFactoryTest extends BaseTestCase {
   private NuGetActionFactoryImpl i;\r
   private BuildRunnerContext ctx;\r
   private PackagesInstallParameters ps;\r
-  private NuGetParameters nugetParams;\r
+  private NuGetFetchParameters nugetParams;\r
   private File myTarget;\r
   private File myConfig;\r
 \r
@@ -58,7 +58,7 @@ public class NuGetInstallPackageActionFactoryTest extends BaseTestCase {
     i = new NuGetActionFactoryImpl(myProcessFactory, pu);\r
     ctx = m.mock(BuildRunnerContext.class);\r
     ps = m.mock(PackagesInstallParameters.class);\r
-    nugetParams = m.mock(NuGetParameters.class);\r
+    nugetParams = m.mock(NuGetFetchParameters.class);\r
 \r
     myTarget = createTempDir();\r
     myConfig = createTempFile();\r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetUpdatePackageActionFactoryTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetUpdatePackageActionFactoryTest.java
index 2131a6abb4e744240eae9f547f249f8dd41e7950..d175827fc24cd7ceaeac4a1b59cb5910e9d6cbee 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetUpdatePackageActionFactoryTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/NuGetUpdatePackageActionFactoryTest.java
@@ -20,7 +20,7 @@ import jetbrains.buildServer.BaseTestCase;
 import jetbrains.buildServer.RunBuildException;\r
 import jetbrains.buildServer.agent.BuildRunnerContext;\r
 import jetbrains.buildServer.nuget.agent.install.PackageUsages;\r
-import jetbrains.buildServer.nuget.agent.parameters.NuGetParameters;\r
+import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesUpdateParameters;\r
 import jetbrains.buildServer.nuget.agent.install.impl.NuGetActionFactoryImpl;\r
 import jetbrains.buildServer.nuget.agent.util.CommandlineBuildProcessFactory;\r
@@ -43,7 +43,7 @@ public class NuGetUpdatePackageActionFactoryTest extends BaseTestCase {
   private CommandlineBuildProcessFactory myProcessFactory;\r
   private NuGetActionFactoryImpl i;\r
   private BuildRunnerContext ctx;\r
-  private NuGetParameters nugetParams;\r
+  private NuGetFetchParameters nugetParams;\r
   private PackagesUpdateParameters ps;\r
   private File myTarget;\r
   private File myConfig;\r
@@ -58,7 +58,7 @@ public class NuGetUpdatePackageActionFactoryTest extends BaseTestCase {
     i = new NuGetActionFactoryImpl(myProcessFactory, pu);\r
     ctx = m.mock(BuildRunnerContext.class);\r
     ps = m.mock(PackagesUpdateParameters.class);\r
-    nugetParams = m.mock(NuGetParameters.class);\r
+    nugetParams = m.mock(NuGetFetchParameters.class);\r
 \r
     myTarget = createTempDir();\r
     myConfig = createTempFile();\r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/PackagesInstallerBuilderTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/PackagesInstallerBuilderTest.java
index 233b621d1b79fb8ca410f2a32f618082504a2b54..48c2b03445f2519a0a6ed6e976199b4a020909cf 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/PackagesInstallerBuilderTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/agent/PackagesInstallerBuilderTest.java
@@ -23,7 +23,7 @@ import jetbrains.buildServer.agent.BuildRunnerContext;
 import jetbrains.buildServer.nuget.agent.install.NuGetActionFactory;\r
 import jetbrains.buildServer.nuget.agent.install.impl.InstallStages;\r
 import jetbrains.buildServer.nuget.agent.install.impl.PackagesInstallerBuilder;\r
-import jetbrains.buildServer.nuget.agent.parameters.NuGetParameters;\r
+import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesInstallParameters;\r
 import jetbrains.buildServer.nuget.agent.parameters.PackagesUpdateParameters;\r
 import jetbrains.buildServer.nuget.agent.util.BuildProcessContinuation;\r
@@ -49,7 +49,7 @@ public class PackagesInstallerBuilderTest extends BaseTestCase {
   private BuildProcessContinuation postUpdate;\r
   private BuildProcessContinuation report;\r
   private BuildRunnerContext context;\r
-  private NuGetParameters nugetSettings;\r
+  private NuGetFetchParameters nugetSettings;\r
   private PackagesInstallParameters installParameters;\r
   private PackagesUpdateParameters updateParameters;\r
   private File myTaget;\r
@@ -77,7 +77,7 @@ public class PackagesInstallerBuilderTest extends BaseTestCase {
     context = m.mock(BuildRunnerContext.class);\r
     installParameters = m.mock(PackagesInstallParameters.class);\r
     updateParameters = m.mock(PackagesUpdateParameters.class);\r
-    nugetSettings = m.mock(NuGetParameters.class);\r
+    nugetSettings = m.mock(NuGetFetchParameters.class);\r
 \r
     final InstallStages is = m.mock(InstallStages.class);\r
     final BuildProcess reportProcess = m.mock(BuildProcess.class, "report process");\r

diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/InstallPackageIntegtatoinTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/InstallPackageIntegtatoinTest.java
index 65eb4a905898399d2a5fe0d72c1495445de50693..a0cacc7faa9a34ec56ea0402487b322d2f520f63 100644 (file)
--- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/InstallPackageIntegtatoinTest.java
+++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/integration/InstallPackageIntegtatoinTest.java
@@ -27,7 +27,7 @@ import jetbrains.buildServer.nuget.agent.install.impl.NuGetActionFactoryImpl;
 import jetbrains.buildServer.nuget.agent.install.impl.NuGetPackagesCollectorImpl;\r
 import jetbrains.buildServer.nuget.agent.install.impl.NuGetPackagesConfigParser;\r
 import jetbrains.buildServer.nuget.agent.install.impl.PackageUsagesImpl;\r
-import jetbrains.buildServer.nuget.agent.parameters.NuGetParameters;\r
+import jetbrains.buildServer.nuget.agent.parameters.NuGetFetchParameters;\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
@@ -61,7 +61,7 @@ public class InstallPackageIntegtatoinTest extends BuildProcessTestCase {
   private PackagesParametersFactory myParametersFactory;\r
   private PackagesInstallParameters myInstall;\r
   private PackagesUpdateParameters myUpdate;\r
-  private NuGetParameters myNuGet;\r
+  private NuGetFetchParameters myNuGet;\r
   private BuildProcess myMockProcess;\r
 \r
   @BeforeMethod\r
@@ -77,7 +77,7 @@ public class InstallPackageIntegtatoinTest extends BuildProcessTestCase {
     myInstall = m.mock(PackagesInstallParameters.class);\r
     myUpdate = m.mock(PackagesUpdateParameters.class);\r
     myMockProcess = m.mock(BuildProcess.class);\r
-    myNuGet = m.mock(NuGetParameters.class);\r
+    myNuGet = m.mock(NuGetFetchParameters.class);\r
 \r
     m.checking(new Expectations() {{\r
       allowing(myContext).getBuild();\r