Mercurial > hg > mercurial
changeset 637:49a03af60439
Extract common test logic
line wrap: on
line diff
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentMirrorCleanerTest.java Mon Aug 19 14:46:21 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentMirrorCleanerTest.java Mon Aug 19 15:07:42 2013 +0400 @@ -26,13 +26,8 @@ * @author dmitry.neverov */ @Test -public class AgentMirrorCleanerTest { +public class AgentMirrorCleanerTest extends BaseMercurialTestCase { - static { - Logger.setFactory(new Log4jFactory()); - } - - private TempFiles myTempFiles = new TempFiles(); private Mockery myContext; private MercurialAgentSideVcsSupport myVcsSupport; private AgentMirrorCleaner myCleaner; @@ -43,6 +38,7 @@ @BeforeMethod public void setUp() throws Exception { + super.setUp(); myContext = new Mockery(); myWorkDir = myTempFiles.createTempDir(); @@ -65,11 +61,6 @@ }}); } - @AfterMethod - public void tearDown() { - myTempFiles.cleanup(); - } - public void should_add_cleaners_only_for_roots_not_used_in_build() throws Exception { //setup mirrors for 2 roots on an agent:
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutWithSubreposTest.java Mon Aug 19 14:46:21 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutWithSubreposTest.java Mon Aug 19 15:07:42 2013 +0400 @@ -39,9 +39,8 @@ * @author dmitry.neverov */ @Test -public class AgentSideCheckoutWithSubreposTest { +public class AgentSideCheckoutWithSubreposTest extends BaseMercurialTestCase { - private TempFiles myTempFiles = new TempFiles(); private File myOriginalRepositoriesParentDir; private File myWorkDir; private Mockery myContext; @@ -52,12 +51,9 @@ private File myDefaultWorkDir; private MirrorManagerImpl myMirrorManager; - static { - Logger.setFactory(new Log4jFactory()); - } - @BeforeMethod public void setUp() throws Exception { + super.setUp(); myProcesses = new ArrayList<Process>(); myOriginalRepositoriesParentDir = myTempFiles.createTempDir(); myDefaultWorkDir = new File(myOriginalRepositoriesParentDir, "agentWorkDir"); @@ -86,7 +82,7 @@ @AfterMethod public void tearDown() { - myTempFiles.cleanup(); + super.tearDown(); for (Process p : myProcesses) { p.destroy(); }
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/BaseMercurialPatchTestCase.java Mon Aug 19 14:46:21 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/BaseMercurialPatchTestCase.java Mon Aug 19 15:07:42 2013 +0400 @@ -15,12 +15,11 @@ */ package jetbrains.buildServer.buildTriggers.vcs.mercurial; -import jetbrains.buildServer.TempFiles; +import com.intellij.openapi.diagnostic.Logger; +import jetbrains.buildServer.log.Log4jFactory; 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; @@ -33,6 +32,10 @@ */ public abstract class BaseMercurialPatchTestCase extends PatchTestCase { + static { + Logger.setFactory(new Log4jFactory()); + } + protected VcsRootImpl createVcsRoot(@NotNull String repPath) throws IOException { File repository = copyRepository(myTempFiles, repPath); return new VcsRootBuilder().withUrl(repository.getAbsolutePath()).build();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/BaseMercurialTestCase.java Mon Aug 19 15:07:42 2013 +0400 @@ -0,0 +1,26 @@ +package jetbrains.buildServer.buildTriggers.vcs.mercurial; + +import jetbrains.buildServer.TempFiles; +import jetbrains.buildServer.log.Log4jFactory; +import com.intellij.openapi.diagnostic.Logger; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; + +public class BaseMercurialTestCase { + + static { + Logger.setFactory(new Log4jFactory()); + } + + protected TempFiles myTempFiles; + + @BeforeMethod + public void setUp() throws Exception { + myTempFiles = new TempFiles(); + } + + @AfterMethod + public void tearDown() { + myTempFiles.cleanup(); + } +}
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/BookmarksTest.java Mon Aug 19 14:46:21 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/BookmarksTest.java Mon Aug 19 15:07:42 2013 +0400 @@ -25,13 +25,8 @@ @RequiredHgVersion(min = "2.4") @Test(dataProviderClass = HgVersionConstraint.class, dataProvider = "installedHgVersion") -public class BookmarksTest { +public class BookmarksTest extends BaseMercurialTestCase { - static { - Logger.setFactory(new Log4jFactory()); - } - - private TempFiles myTempFiles; private File myRemoteRepository; private ServerPluginConfig myConfig; private MercurialVcsSupport myVcs; @@ -39,7 +34,7 @@ @BeforeMethod public void setUp() throws Exception { - myTempFiles = new TempFiles(); + super.setUp(); myRemoteRepository = myTempFiles.createTempDir(); myConfig = serverPluginConfig() .cachesDir(myTempFiles.createTempDir()) @@ -50,11 +45,6 @@ myRoot = vcsRoot().withUrl(myRemoteRepository.getAbsolutePath()).build(); } - @AfterMethod - public void tearDown() { - myTempFiles.cleanup(); - } - public void current_state_should_include_bookmarks(@NotNull HgVersion _) throws Exception { setupRemoteRepositoryWithTwoBookmarks();
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/CleanupTest.java Mon Aug 19 14:46:21 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/CleanupTest.java Mon Aug 19 15:07:42 2013 +0400 @@ -26,9 +26,8 @@ * @author dmitry.neverov */ @Test -public class CleanupTest { +public class CleanupTest extends BaseMercurialTestCase { - private TempFiles myTempFiles; private File myCachesDir; private Cleanup myCleanup; private MirrorManager myMirrorManager; @@ -36,7 +35,7 @@ @BeforeMethod public void setUp() throws Exception { - myTempFiles = new TempFiles(); + super.setUp(); myCachesDir = myTempFiles.createTempDir(); ServerPluginConfig config = new ServerPluginConfigBuilder().cachesDir(myCachesDir).withMirrorExpirationTimeout(myMirrorExpirationTimeout).build(); @@ -45,11 +44,6 @@ myCleanup = new Cleanup(myMirrorManager, config); } - @AfterMethod - public void tearDown() { - myTempFiles.cleanup(); - } - public void cleanup_should_remove_directories_by_timestamp() throws Exception { final String url1 = "http://some.org/repository1";
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/DagFeaturesTest.java Mon Aug 19 14:46:21 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/DagFeaturesTest.java Mon Aug 19 15:07:42 2013 +0400 @@ -22,18 +22,14 @@ * @author dmitry.neverov */ @Test -public class DagFeaturesTest { +public class DagFeaturesTest extends BaseMercurialTestCase { - static { - Logger.setFactory(new Log4jFactory()); - } - - private TempFiles myTempFiles = new TempFiles(); private MercurialVcsSupport myHg; private String myRepository; @BeforeMethod public void setUp() throws Exception { + super.setUp(); ServerPluginConfig config = new ServerPluginConfigBuilder() .cachesDir(myTempFiles.createTempDir()) .build(); @@ -45,10 +41,6 @@ myRepository = copy.getAbsolutePath(); } - public void tearDown() { - myTempFiles.cleanup(); - } - @TestFor(issues = "TW-17882") public void should_detect_changes_from_named_branches() throws Exception {
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgFileUtilTest.java Mon Aug 19 14:46:21 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgFileUtilTest.java Mon Aug 19 15:07:42 2013 +0400 @@ -1,7 +1,6 @@ package jetbrains.buildServer.buildTriggers.vcs.mercurial; -import jetbrains.buildServer.util.FileUtil; import jetbrains.buildServer.util.TestFor; import org.testng.annotations.Test; @@ -12,7 +11,6 @@ import java.util.List; import java.util.Set; import java.util.concurrent.CountDownLatch; -import com.intellij.openapi.util.SystemInfo; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertFalse;
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgRepoTest.java Mon Aug 19 14:46:21 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgRepoTest.java Mon Aug 19 15:07:42 2013 +0400 @@ -4,13 +4,9 @@ import jetbrains.buildServer.TempFiles; import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.AuthSettings; import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.TestCommandSettingsFactory; -import jetbrains.buildServer.log.Log4jFactory; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.io.File; -import java.io.IOException; import java.util.List; import static jetbrains.buildServer.buildTriggers.vcs.mercurial.Util.copyRepository; @@ -19,23 +15,7 @@ import static org.testng.AssertJUnit.assertTrue; @Test -public class HgRepoTest { - - static { - Logger.setFactory(new Log4jFactory()); - } - - private TempFiles myTempFiles; - - @BeforeMethod - public void setUp() throws IOException { - myTempFiles = new TempFiles(); - } - - @AfterMethod - public void tearDown() { - myTempFiles.cleanup(); - } +public class HgRepoTest extends BaseMercurialTestCase { public void subrepos() throws Exception { File repository = myTempFiles.createTempDir();
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgVcsRootFactoryTest.java Mon Aug 19 14:46:21 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgVcsRootFactoryTest.java Mon Aug 19 15:07:42 2013 +0400 @@ -4,8 +4,6 @@ import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.HgVcsRoot; import jetbrains.buildServer.util.TestFor; import jetbrains.buildServer.vcs.VcsRoot; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.io.File; @@ -16,19 +14,7 @@ import static org.testng.AssertJUnit.assertNull; @Test -public class HgVcsRootFactoryTest { - - private TempFiles myTempFiles; - - @BeforeMethod(alwaysRun = true) - public void setUp() { - myTempFiles = new TempFiles(); - } - - @AfterMethod(alwaysRun = true) - public void tearDown() { - myTempFiles.cleanup(); - } +public class HgVcsRootFactoryTest extends BaseMercurialTestCase { @TestFor(issues = "TW-25057") public void vcs_root_custom_clone_dir_should_not_contain_password() throws Exception {
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ListFilesSupportTest.java Mon Aug 19 14:46:21 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ListFilesSupportTest.java Mon Aug 19 15:07:42 2013 +0400 @@ -1,8 +1,5 @@ package jetbrains.buildServer.buildTriggers.vcs.mercurial; -import com.intellij.openapi.diagnostic.Logger; -import jetbrains.buildServer.TempFiles; -import jetbrains.buildServer.log.Log4jFactory; import jetbrains.buildServer.util.TestFor; import jetbrains.buildServer.vcs.ListDirectChildrenPolicy; import jetbrains.buildServer.vcs.VcsException; @@ -27,25 +24,21 @@ * @author dmitry.neverov */ @Test -public class ListFilesSupportTest { - - static { - Logger.setFactory(new Log4jFactory()); - } +public class ListFilesSupportTest extends BaseMercurialTestCase { private MercurialVcsSupport myVcs; private VcsRoot myRoot; private File myRemoteRepoDir; @BeforeMethod - protected void setUp() throws Exception { - TempFiles tempFiles = new TempFiles(); + public void setUp() throws Exception { + super.setUp(); ServerPluginConfig myPluginConfig = new ServerPluginConfigBuilder() - .cachesDir(tempFiles.createTempDir()) + .cachesDir(myTempFiles.createTempDir()) .build(); myVcs = mercurialSupport().withConfig(myPluginConfig).build(); - myRemoteRepoDir = tempFiles.createTempDir(); + myRemoteRepoDir = myTempFiles.createTempDir(); copyRepository(new File("mercurial-tests/testData/rep1"), myRemoteRepoDir); myRoot = vcsRoot().withUrl(myRemoteRepoDir.getAbsolutePath()).build(); }
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MirrorManagerTest.java Mon Aug 19 14:46:21 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MirrorManagerTest.java Mon Aug 19 15:07:42 2013 +0400 @@ -1,10 +1,7 @@ package jetbrains.buildServer.buildTriggers.vcs.mercurial; -import jetbrains.buildServer.TempFiles; import jetbrains.buildServer.util.Hash; -import junit.framework.TestCase; import org.jetbrains.annotations.NotNull; -import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -12,20 +9,23 @@ import java.io.IOException; import java.util.List; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.assertTrue; + /** * @author dmitry.neverov */ @Test -public class MirrorManagerTest extends TestCase { +public class MirrorManagerTest extends BaseMercurialTestCase { - private TempFiles myTempFiles; private File myRootDir; private MirrorManagerImpl myManager; @BeforeMethod public void setUp() throws Exception { - myTempFiles = new TempFiles(); + super.setUp(); myRootDir = myTempFiles.createTempDir(); myManager = new MirrorManagerImpl(new PluginConfig() { @NotNull @@ -35,11 +35,6 @@ }); } - @AfterMethod - public void tearDown() { - myTempFiles.cleanup(); - } - public void manager_should_create_an_empty_map_file() { assertTrue(myRootDir.listFiles().length == 1);
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/RevisionFormatTest.java Mon Aug 19 14:46:21 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/RevisionFormatTest.java Mon Aug 19 15:07:42 2013 +0400 @@ -24,20 +24,15 @@ import static jetbrains.buildServer.buildTriggers.vcs.mercurial.VcsRootBuilder.vcsRoot; @Test -public class RevisionFormatTest extends PatchTestCase { +public class RevisionFormatTest extends BaseMercurialPatchTestCase { - static { - Logger.setFactory(new Log4jFactory()); - } - - private TempFiles myTempFiles; private MercurialVcsSupport myVcs; private VcsRoot myRoot; private File myRemoteRepoDir; @BeforeMethod public void setUp() throws Exception { - myTempFiles = new TempFiles(); + super.setUp(); ServerPluginConfig pluginConfig = new ServerPluginConfigBuilder() .cachesDir(myTempFiles.createTempDir()) .build(); @@ -47,11 +42,6 @@ myRoot = vcsRoot().withUrl(myRemoteRepoDir.getAbsolutePath()).build(); } - @AfterMethod - public void tearDown() { - myTempFiles.cleanup(); - } - public void collect_changes_result_does_not_depend_on_revnums() throws VcsException { List<ModificationData> changesWithRevnums = myVcs.getCollectChangesPolicy().collectChanges(myRoot,
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubrepoChangesTest.java Mon Aug 19 14:46:21 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubrepoChangesTest.java Mon Aug 19 15:07:42 2013 +0400 @@ -30,13 +30,8 @@ @RequiredHgVersion(min = "1.7.0") //support subrepos only for hg with revsets @Test(dataProviderClass = HgVersionConstraint.class, dataProvider = "installedHgVersion") -public class SubrepoChangesTest { +public class SubrepoChangesTest extends BaseMercurialTestCase { - static { - Logger.setFactory(new Log4jFactory()); - } - - private TempFiles myTempFiles; private MercurialVcsSupport myVcs; private File myRemoteRepo1; private File myRemoteRepo2; @@ -44,8 +39,8 @@ private File myRepoNoSubs; @BeforeMethod - public void setUp() throws IOException { - myTempFiles = new TempFiles(); + public void setUp() throws Exception { + super.setUp(); ServerPluginConfig pluginConfig = new ServerPluginConfigBuilder() .cachesDir(myTempFiles.createTempDir()) .detectSubrepoChanges(true) @@ -62,11 +57,6 @@ myVcs = mercurialSupport().withConfig(pluginConfig).build(); } - @AfterMethod - public void tearDown() { - myTempFiles.cleanup(); - } - public void should_report_changes_from_subrepos(@NotNull HgVersion _) throws Exception { VcsRoot root = vcsRoot().withUrl(myRemoteRepo1.getAbsolutePath()).withSubrepoChanges(true).build();
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubrepoPatchTest.java Mon Aug 19 14:46:21 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/SubrepoPatchTest.java Mon Aug 19 15:07:42 2013 +0400 @@ -1,7 +1,5 @@ package jetbrains.buildServer.buildTriggers.vcs.mercurial; -import com.intellij.openapi.diagnostic.Logger; -import jetbrains.buildServer.log.Log4jFactory; import jetbrains.buildServer.vcs.CheckoutRules; import jetbrains.buildServer.vcs.VcsRoot; import org.testng.annotations.BeforeMethod; @@ -18,10 +16,6 @@ @Test public class SubrepoPatchTest extends BaseMercurialPatchTestCase { - static { - Logger.setFactory(new Log4jFactory()); - } - private MercurialVcsSupport myVcs; private File myRemoteRepo1; private File myRemoteRepo2;
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/UnrelatedResitoriesTest.java Mon Aug 19 14:46:21 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/UnrelatedResitoriesTest.java Mon Aug 19 15:07:42 2013 +0400 @@ -8,7 +8,6 @@ import jetbrains.buildServer.vcs.VcsException; import jetbrains.buildServer.vcs.impl.VcsRootImpl; import org.jetbrains.annotations.NotNull; -import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -23,22 +22,17 @@ * @author dmitry.neverov */ @Test -public class UnrelatedResitoriesTest { +public class UnrelatedResitoriesTest extends BaseMercurialTestCase { private final static String CURRENT_VERSION_OF_NEW_REPO = "4780519e01aa"; private MercurialVcsSupport myVcs; - private TempFiles myTempFiles; private File myRepositoryLocation; private VcsRootImpl myRoot; private ServerPluginConfig myPluginConfig; - static { - Logger.setFactory(new Log4jFactory()); - } - @BeforeMethod public void setUp() throws Exception { - myTempFiles = new TempFiles(); + super.setUp(); myPluginConfig = new ServerPluginConfigBuilder() .cachesDir(myTempFiles.createTempDir()) .build(); @@ -48,11 +42,6 @@ myRoot = new VcsRootBuilder().withUrl(myRepositoryLocation.getCanonicalPath()).build(); } - @AfterMethod - public void tearDown() { - myTempFiles.cleanup(); - } - public void should_be_able_to_sync_when_repository_became_unrelated() throws Exception { myVcs = createVcs();