Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Call tearDown when a test is skipped.

Browse Source 
Test: revert ag/10246452 && atest com.android.server.am.CachedAppOptimizerTest
Test: atest FrameworksMockingServicesTests:StaticMockFixtureRuleTest
Bug: b/148899617
Change-Id: I4d1eaf3b5dfb869151eb8e5eba0277c1877fe589
This commit is contained in:
Matt Pape
2020-02-05 15:57:56 -08:00
parent 04c84989d3
commit 5fff126478
2 changed files with 81 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/tests/mockingservicestests/src/com/android/server/testables/StaticMockFixtureRule.java
View File

@@ -21,6 +21,7 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSess
import com.android.dx.mockito.inline.extended.StaticMockitoSession;
import com.android.dx.mockito.inline.extended.StaticMockitoSessionBuilder;
import org.junit.AssumptionViolatedException;
import org.junit.rules.TestRule;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
@@ -99,6 +100,11 @@ public class StaticMockFixtureRule implements TestRule {
tearDown(null);
}
@Override
protected void skipped(AssumptionViolatedException e, Description description) {
tearDown(e);
}
@Override
protected void failed(Throwable e, Description description) {
tearDown(e);

78
services/tests/mockingservicestests/src/com/android/server/testables/StaticMockFixtureRuleTest.java
View File

@@ -16,8 +16,10 @@
package com.android.server.testables;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
@@ -30,6 +32,7 @@ import com.android.dx.mockito.inline.extended.StaticMockitoSession;
import com.android.dx.mockito.inline.extended.StaticMockitoSessionBuilder;
import org.junit.After;
import org.junit.AssumptionViolatedException;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.Description;
@@ -57,6 +60,8 @@ public class StaticMockFixtureRuleTest {
@Mock private Supplier<StaticMockFixture> mSupplyA;
@Mock private Supplier<StaticMockFixture> mSupplyB;
@Mock private Statement mStatement;
@Mock private Statement mSkipStatement;
@Mock private Statement mThrowStatement;
@Mock private Description mDescription;
@Before
@@ -91,17 +96,22 @@ public class StaticMockFixtureRuleTest {
when(mB1.setUpMockedClasses(any())).thenAnswer(invocation -> invocation.getArgument(0));
doNothing().when(mB1).setUpMockBehaviors();
doNothing().when(mStatement).evaluate();
doThrow(new AssumptionViolatedException("bad assumption, test should be skipped"))
.when(mSkipStatement).evaluate();
doThrow(new IllegalArgumentException("bad argument, test should be failed"))
.when(mThrowStatement).evaluate();
doNothing().when(mA1).tearDown();
doNothing().when(mB1).tearDown();
}
private InOrder mocksInOrder() {
return inOrder(mSessionBuilder, mSession, mSupplyA, mSupplyB,
mA1, mA2, mB1, mB2, mStatement, mDescription);
return inOrder(mSessionBuilder, mSession, mSupplyA, mSupplyB, mA1, mA2, mB1, mB2,
mStatement, mSkipStatement, mThrowStatement, mDescription);
}
private void verifyNoMoreImportantMockInteractions() {
verifyNoMoreInteractions(mSupplyA, mSupplyB, mA1, mA2, mB1, mB2, mStatement);
verifyNoMoreInteractions(mSupplyA, mSupplyB, mA1, mA2, mB1, mB2, mStatement,
mSkipStatement, mThrowStatement);
}
@Test
@@ -183,4 +193,66 @@ public class StaticMockFixtureRuleTest {
verifyNoMoreImportantMockInteractions();
}
@Test
public void testTearDownOnSkippedTests() throws Throwable {
InOrder inOrder = mocksInOrder();
StaticMockFixtureRule rule = new StaticMockFixtureRule(mA1, mB1) {
@Override public StaticMockitoSessionBuilder getSessionBuilder() {
return mSessionBuilder;
}
};
Statement skipStatement = rule.apply(mSkipStatement, mDescription);
inOrder.verify(mA1).setUpMockedClasses(any(StaticMockitoSessionBuilder.class));
inOrder.verify(mB1).setUpMockedClasses(any(StaticMockitoSessionBuilder.class));
inOrder.verify(mA1).setUpMockBehaviors();
inOrder.verify(mB1).setUpMockBehaviors();
try {
skipStatement.evaluate();
fail("AssumptionViolatedException should have been thrown");
} catch (AssumptionViolatedException e) {
// expected
}
inOrder.verify(mSkipStatement).evaluate();
// note: tearDown in reverse order
inOrder.verify(mB1).tearDown();
inOrder.verify(mA1).tearDown();
verifyNoMoreImportantMockInteractions();
}
@Test
public void testTearDownOnFailedTests() throws Throwable {
InOrder inOrder = mocksInOrder();
StaticMockFixtureRule rule = new StaticMockFixtureRule(mA1, mB1) {
@Override public StaticMockitoSessionBuilder getSessionBuilder() {
return mSessionBuilder;
}
};
Statement failStatement = rule.apply(mThrowStatement, mDescription);
inOrder.verify(mA1).setUpMockedClasses(any(StaticMockitoSessionBuilder.class));
inOrder.verify(mB1).setUpMockedClasses(any(StaticMockitoSessionBuilder.class));
inOrder.verify(mA1).setUpMockBehaviors();
inOrder.verify(mB1).setUpMockBehaviors();
try {
failStatement.evaluate();
fail("IllegalArgumentException should have been thrown");
} catch (IllegalArgumentException e) {
// expected
}
inOrder.verify(mThrowStatement).evaluate();
// note: tearDown in reverse order
inOrder.verify(mB1).tearDown();
inOrder.verify(mA1).tearDown();
verifyNoMoreImportantMockInteractions();
}
}