changeset 636:27933884b738

Better test name + reuse temp files
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Mon, 19 Aug 2013 14:46:21 +0400
parents f0dce200f02a
children 49a03af60439
files mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutTest.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/BaseMercurialPatchTestCase.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/BaseMercurialTestCase.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubrepoPatchTest.java
diffstat 5 files changed, 52 insertions(+), 66 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutTest.java	Mon Aug 19 14:21:24 2013 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutTest.java	Mon Aug 19 14:46:21 2013 +0400
@@ -46,7 +46,7 @@
  *         Date: 30.07.2008
  */
 @Test
-public class AgentSideCheckoutTest extends BaseMercurialTestCase {
+public class AgentSideCheckoutTest extends BaseMercurialPatchTestCase {
 
   final static String HG_PATH_REFERENCE = "%" + HgDetector.AGENT_HG_PATH_PROPERTY + "%";
   private MercurialAgentSideVcsSupport myVcsSupport;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/BaseMercurialPatchTestCase.java	Mon Aug 19 14:46:21 2013 +0400
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jetbrains.buildServer.buildTriggers.vcs.mercurial;
+
+import jetbrains.buildServer.TempFiles;
+import jetbrains.buildServer.vcs.impl.VcsRootImpl;
+import jetbrains.buildServer.vcs.patches.PatchTestCase;
+import org.jetbrains.annotations.NotNull;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+
+import java.io.File;
+import java.io.IOException;
+
+import static jetbrains.buildServer.buildTriggers.vcs.mercurial.Util.copyRepository;
+
+/**
+ * @author Pavel.Sher
+ *         Date: 31.07.2008
+ */
+public abstract class BaseMercurialPatchTestCase extends PatchTestCase {
+
+  protected VcsRootImpl createVcsRoot(@NotNull String repPath) throws IOException {
+    File repository = copyRepository(myTempFiles, repPath);
+    return new VcsRootBuilder().withUrl(repository.getAbsolutePath()).build();
+  }
+
+  protected VcsRootImpl createVcsRoot(@NotNull String repPath, @NotNull String branchName) throws IOException {
+    File repository = copyRepository(myTempFiles, repPath);
+    return new VcsRootBuilder().withUrl(repository.getAbsolutePath()).withBranch(branchName).build();
+  }
+
+  protected String simpleRepo() {
+    return new File("mercurial-tests/testData/rep1").getAbsolutePath();
+  }
+}
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/BaseMercurialTestCase.java	Mon Aug 19 14:21:24 2013 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright 2000-2011 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package jetbrains.buildServer.buildTriggers.vcs.mercurial;
-
-import jetbrains.buildServer.TempFiles;
-import jetbrains.buildServer.vcs.impl.VcsRootImpl;
-import jetbrains.buildServer.vcs.patches.PatchTestCase;
-import org.jetbrains.annotations.NotNull;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-
-import java.io.File;
-import java.io.IOException;
-
-import static jetbrains.buildServer.buildTriggers.vcs.mercurial.Util.copyRepository;
-
-/**
- * @author Pavel.Sher
- *         Date: 31.07.2008
- */
-public abstract class BaseMercurialTestCase extends PatchTestCase {
-  protected TempFiles myTempFiles;
-
-  @Override
-  @BeforeMethod
-  protected void setUp() throws Exception {
-    super.setUp();
-    myTempFiles = new TempFiles();
-  }
-
-  @AfterMethod
-  protected void tearDown() throws Exception {
-    myTempFiles.cleanup();
-  }
-
-  protected VcsRootImpl createVcsRoot(@NotNull String repPath) throws IOException {
-    File repository = copyRepository(myTempFiles, repPath);
-    return new VcsRootBuilder().withUrl(repository.getAbsolutePath()).build();
-  }
-
-  protected VcsRootImpl createVcsRoot(@NotNull String repPath, @NotNull String branchName) throws IOException {
-    File repository = copyRepository(myTempFiles, repPath);
-    return new VcsRootBuilder().withUrl(repository.getAbsolutePath()).withBranch(branchName).build();
-  }
-
-  protected String simpleRepo() {
-    return new File("mercurial-tests/testData/rep1").getAbsolutePath();
-  }
-}
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Mon Aug 19 14:21:24 2013 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Mon Aug 19 14:46:21 2013 +0400
@@ -45,7 +45,7 @@
 import static org.hamcrest.Matchers.not;
 
 @Test
-public class MercurialVcsSupportTest extends BaseMercurialTestCase {
+public class MercurialVcsSupportTest extends BaseMercurialPatchTestCase {
 
   private MercurialVcsSupport myVcs;
   private String myRep2Path = new File("mercurial-tests/testData/rep2").getAbsolutePath();
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubrepoPatchTest.java	Mon Aug 19 14:21:24 2013 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubrepoPatchTest.java	Mon Aug 19 14:46:21 2013 +0400
@@ -4,7 +4,6 @@
 import jetbrains.buildServer.log.Log4jFactory;
 import jetbrains.buildServer.vcs.CheckoutRules;
 import jetbrains.buildServer.vcs.VcsRoot;
-import jetbrains.buildServer.vcs.impl.VcsRootImpl;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -17,7 +16,7 @@
 import static jetbrains.buildServer.buildTriggers.vcs.mercurial.VcsRootBuilder.vcsRoot;
 
 @Test
-public class SubrepoPatchTest extends BaseMercurialTestCase {
+public class SubrepoPatchTest extends BaseMercurialPatchTestCase {
 
   static {
     Logger.setFactory(new Log4jFactory());