HONEYCOMB-275 - compilation error with HC runner and setUp

Refactored setUp() method in WriteCustomizerTest
to not trigger http://errorprone.info/bugpattern/JUnit4SetUpNotRun
while used in combination with @RunWith(HoneycombTestRunner.class)

Change-Id: Iba56b39399ddd7678dda97e094e935a3f02dd22c
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>

1 files changed, 22 insertions, 22 deletions

diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizerTest.java
index e3c1d86f9..d64af5715 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizerTest.java
@@ -21,11 +21,11 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import com.google.common.base.Optional;
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
 import io.fd.hc2vpp.v3po.interfaces.acl.IetfAclWriter;
 import io.fd.hc2vpp.v3po.interfaces.acl.common.AclTableContextManager;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
 import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
 import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterface;
 import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
 import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply;
@@ -73,8 +73,27 @@ public class SubInterfaceIetfAclCustomizerTest extends WriterCustomizerTest {
     @Mock
     private AclTableContextManager aclCtx;
 
+    private static InputAclSetInterface inputAclSetInterfaceWriteRequest() {
+        final InputAclSetInterface request = new InputAclSetInterface();
+        request.swIfIndex = SUBIF_INDEX;
+        request.isAdd = 1;
+        request.l2TableIndex = -1;
+        request.ip4TableIndex = -1;
+        request.ip6TableIndex = -1;
+        return request;
+    }
+
+    private static InputAclSetInterface inputAclSetInterfaceDeleteRequest() {
+        final InputAclSetInterface request = new InputAclSetInterface();
+        request.swIfIndex = SUBIF_INDEX;
+        request.l2TableIndex = -1;
+        request.ip4TableIndex = -1;
+        request.ip6TableIndex = -1;
+        return request;
+    }
+
     @Override
-    protected void setUp() {
+    protected void setUpTest() {
         customizer =
             new SubInterfaceIetfAclCustomizer(new IngressIetfAclWriter(api, aclCtx), new NamingContext("prefix", IFC_TEST_INSTANCE));
         defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
@@ -89,16 +108,6 @@ public class SubInterfaceIetfAclCustomizerTest extends WriterCustomizerTest {
         ).build();
     }
 
-    private static InputAclSetInterface inputAclSetInterfaceWriteRequest() {
-        final InputAclSetInterface request = new InputAclSetInterface();
-        request.swIfIndex = SUBIF_INDEX;
-        request.isAdd = 1;
-        request.l2TableIndex = -1;
-        request.ip4TableIndex = -1;
-        request.ip6TableIndex = -1;
-        return request;
-    }
-
     @Test
     public void testDelete() throws WriteFailedException {
         defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
@@ -119,15 +128,6 @@ public class SubInterfaceIetfAclCustomizerTest extends WriterCustomizerTest {
         verify(api).inputAclSetInterface(inputAclSetInterfaceDeleteRequest());
     }
 
-    private static InputAclSetInterface inputAclSetInterfaceDeleteRequest() {
-        final InputAclSetInterface request = new InputAclSetInterface();
-        request.swIfIndex = SUBIF_INDEX;
-        request.l2TableIndex = -1;
-        request.ip4TableIndex = -1;
-        request.ip6TableIndex = -1;
-        return request;
-    }
-
     @Test
     public void testWrite() throws WriteFailedException {
         defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);