Address testng cyclic dependency

Uncovered by newer versions of testng.
This commit is contained in:
Andrew Gaul 2022-07-31 20:08:27 +09:00 committed by Andrew Gaul
parent 5111923566
commit f4ec2bb63c
2 changed files with 2 additions and 3 deletions

View File

@ -104,7 +104,7 @@ import com.google.common.util.concurrent.ListenableFuture;
public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest { public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
private static final ByteSource oneHundredOneConstitutions = TestUtils.randomByteSource().slice(0, 101 * 45118); private static final ByteSource oneHundredOneConstitutions = TestUtils.randomByteSource().slice(0, 101 * 45118);
@BeforeClass(groups = { "integration", "live" }, dependsOnMethods = "setupContext") @BeforeClass(groups = { "integration", "live" })
@Override @Override
public void setUpResourcesOnThisThread(ITestContext testContext) throws Exception { public void setUpResourcesOnThisThread(ITestContext testContext) throws Exception {
super.setUpResourcesOnThisThread(testContext); super.setUpResourcesOnThisThread(testContext);

View File

@ -115,7 +115,6 @@ public class BaseBlobStoreIntegrationTest extends BaseViewLiveTest<BlobStoreCont
@AfterSuite(groups = { "integration", "live" }) @AfterSuite(groups = { "integration", "live" })
protected void destroyResources() throws Exception { protected void destroyResources() throws Exception {
setupContext();
deleteEverything(view); deleteEverything(view);
view.close(); view.close();
@ -134,7 +133,7 @@ public class BaseBlobStoreIntegrationTest extends BaseViewLiveTest<BlobStoreCont
* want to have a different implementation of context.getBlobStore(). For example, one class may * want to have a different implementation of context.getBlobStore(). For example, one class may
* want non-blocking i/o and another class google appengine. * want non-blocking i/o and another class google appengine.
*/ */
@BeforeClass(groups = { "integration", "live" }, dependsOnMethods = "setupContext") @BeforeClass(groups = { "integration", "live" })
public void setUpResourcesOnThisThread(ITestContext testContext) throws Exception { public void setUpResourcesOnThisThread(ITestContext testContext) throws Exception {
exec = MoreExecutors.listeningDecorator(Executors.newCachedThreadPool()); exec = MoreExecutors.listeningDecorator(Executors.newCachedThreadPool());
} }