Skip to content

xds: Use Rule order instead of RuleChain #10289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2023
Merged

xds: Use Rule order instead of RuleChain #10289

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions xds/src/test/java/io/grpc/xds/FakeControlPlaneXdsIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import io.grpc.testing.protobuf.SimpleServiceGrpc;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

Expand All @@ -71,18 +70,10 @@
@RunWith(JUnit4.class)
public class FakeControlPlaneXdsIntegrationTest {

public ControlPlaneRule controlPlane;
public DataPlaneRule dataPlane;

/**
* The {@link ControlPlaneRule} should run before the {@link DataPlaneRule}.
*/
@Rule
public RuleChain ruleChain() {
controlPlane = new ControlPlaneRule();
dataPlane = new DataPlaneRule(controlPlane);
return RuleChain.outerRule(controlPlane).around(dataPlane);
}
@Rule(order = 0)
public ControlPlaneRule controlPlane = new ControlPlaneRule();
@Rule(order = 1)
public DataPlaneRule dataPlane = new DataPlaneRule(controlPlane);

@Test
public void pingPong() throws Exception {
Expand Down