X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fimpl%2Futil%2FFlowUtilTest.java;h=7d86563b592eefec9c4528020a1f2aaa0663f692;hb=cfe3a97837951ebbedb337dc988027f10c49f714;hp=2c3feb93db9ca46c9d623411dedabe8b6f5b1b88;hpb=e1ef8b31e7f6c908e06d947bd10f51e498378ab5;p=openflowplugin.git diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowUtilTest.java index 2c3feb93db..7d86563b59 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowUtilTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowUtilTest.java @@ -1,25 +1,17 @@ /* + * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * - * * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. - * * - * * This program and the accompanying materials are made available under the - * * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html */ package org.opendaylight.openflowplugin.impl.util; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import com.google.common.base.Function; import com.google.common.collect.Lists; import java.util.Collections; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.apache.commons.lang3.tuple.Pair; import org.junit.Assert; import org.junit.Test; @@ -27,6 +19,7 @@ import org.mockito.Mockito; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowId; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev150304.SendBarrierOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.FlowRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.AddFlowsBatchOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.AddFlowsBatchOutputBuilder; @@ -44,33 +37,11 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; public class FlowUtilTest { - - public static final Pattern INDEX_PATTERN = Pattern.compile("^#UF\\$TABLE\\*1-([0-9]+)$"); public static final NodeId DUMMY_NODE_ID = new NodeId("dummyNodeId"); public static final FlowId DUMMY_FLOW_ID = new FlowId("dummyFlowId"); public static final FlowId DUMMY_FLOW_ID_2 = new FlowId("dummyFlowId_2"); public static final Short DUMMY_TABLE_ID = 1; - @Test - public void createAlienFlowIdTest() { - final String alienFlowId1 = FlowUtil.createAlienFlowId(DUMMY_TABLE_ID).getValue(); - final Integer index1 = parseIndex(alienFlowId1); - final String alienFlowId2 = FlowUtil.createAlienFlowId(DUMMY_TABLE_ID).getValue(); - final Integer index2 = parseIndex(alienFlowId2); - - assertNotNull("index1 parsing failed: " + alienFlowId1, index1); - assertNotNull("index2 parsing failed: " + alienFlowId2, index2); - assertTrue(index1 < index2); - } - - private static Integer parseIndex(String alienFlowIdValue) { - final Matcher mach = INDEX_PATTERN.matcher(alienFlowIdValue); - if (mach.find()) { - return Integer.valueOf(mach.group(1)); - } - return null; - } - @Test public void testBuildFlowPath() throws Exception { final InstanceIdentifier nodePath = InstanceIdentifier @@ -110,42 +81,43 @@ public class FlowUtilTest { } @Test - public void testFLOW_ADD_TRANSFORM__failure() throws Exception { + public void testFlowAddTransformFailure() throws Exception { final RpcResult> input = createBatchOutcomeWithError(); checkBatchErrorOutcomeTransformation(FlowUtil.FLOW_ADD_TRANSFORM.apply(input)); } @Test - public void testFLOW_ADD_TRANSFORM__success() throws Exception { + public void testFlowAddTransformSuccess() throws Exception { final RpcResult> input = createEmptyBatchOutcome(); checkBatchSuccessOutcomeTransformation(FlowUtil.FLOW_ADD_TRANSFORM.apply(input)); } @Test - public void testFLOW_REMOVE_TRANSFORM__failure() throws Exception { + public void testFlowRemoveTransformFailure() throws Exception { final RpcResult> input = createBatchOutcomeWithError(); checkBatchErrorOutcomeTransformation(FlowUtil.FLOW_REMOVE_TRANSFORM.apply(input)); } @Test - public void testFLOW_REMOVE_TRANSFORM__success() throws Exception { + public void testFlowRemoveTransformSuccess() throws Exception { final RpcResult> input = createEmptyBatchOutcome(); checkBatchSuccessOutcomeTransformation(FlowUtil.FLOW_REMOVE_TRANSFORM.apply(input)); } @Test - public void testFLOW_UPDATE_TRANSFORM__failure() throws Exception { + public void testFlowUpdateTransformFailure() throws Exception { final RpcResult> input = createBatchOutcomeWithError(); checkBatchErrorOutcomeTransformation(FlowUtil.FLOW_UPDATE_TRANSFORM.apply(input)); } @Test - public void testFLOW_UPDATE_TRANSFORM__success() throws Exception { + public void testFlowUpdateTransformSuccess() throws Exception { final RpcResult> input = createEmptyBatchOutcome(); checkBatchSuccessOutcomeTransformation(FlowUtil.FLOW_UPDATE_TRANSFORM.apply(input)); } - private void checkBatchSuccessOutcomeTransformation(final RpcResult output) { + private void checkBatchSuccessOutcomeTransformation( + final RpcResult output) { Assert.assertTrue(output.isSuccessful()); Assert.assertEquals(0, output.getResult().getBatchFailedFlowsOutput().size()); Assert.assertEquals(0, output.getErrors().size()); @@ -166,7 +138,8 @@ public class FlowUtilTest { .build(); } - private void checkBatchErrorOutcomeTransformation(final RpcResult output) { + private void checkBatchErrorOutcomeTransformation( + final RpcResult output) { Assert.assertFalse(output.isSuccessful()); Assert.assertEquals(1, output.getResult().getBatchFailedFlowsOutput().size()); Assert.assertEquals(DUMMY_FLOW_ID, output.getResult().getBatchFailedFlowsOutput().get(0).getFlowId()); @@ -176,12 +149,13 @@ public class FlowUtilTest { @Test public void testCreateComposingFunction_success_success() throws Exception { - final Function, RpcResult>, RpcResult> compositeFunction = - FlowUtil.createComposingFunction(); + final Function, RpcResult>, + RpcResult> compositeFunction = FlowUtil.createComposingFunction(); final RpcResult addFlowBatchOutput = createAddFlowsBatchSuccessOutput(); - final RpcResult barrierOutput = RpcResultBuilder.success().build(); - final Pair, RpcResult> input = Pair.of(addFlowBatchOutput, barrierOutput); + final RpcResult barrierOutput = RpcResultBuilder.success().build(); + final Pair, RpcResult> input + = Pair.of(addFlowBatchOutput, barrierOutput); final RpcResult composite = compositeFunction.apply(input); Assert.assertTrue(composite.isSuccessful()); @@ -191,12 +165,13 @@ public class FlowUtilTest { @Test public void testCreateComposingFunction_failure_success() throws Exception { - final Function, RpcResult>, RpcResult> compositeFunction = - FlowUtil.createComposingFunction(); + final Function, RpcResult>, + RpcResult> compositeFunction = FlowUtil.createComposingFunction(); final RpcResult addFlowBatchOutput = createAddFlowsBatchFailureOutcome(); - final RpcResult barrierOutput = RpcResultBuilder.success().build(); - final Pair, RpcResult> input = Pair.of(addFlowBatchOutput, barrierOutput); + final RpcResult barrierOutput = RpcResultBuilder.success().build(); + final Pair, RpcResult> input + = Pair.of(addFlowBatchOutput, barrierOutput); final RpcResult composite = compositeFunction.apply(input); Assert.assertFalse(composite.isSuccessful()); @@ -206,12 +181,13 @@ public class FlowUtilTest { @Test public void testCreateComposingFunction_success_failure() throws Exception { - final Function, RpcResult>, RpcResult> compositeFunction = - FlowUtil.createComposingFunction(); + final Function, RpcResult>, + RpcResult> compositeFunction = FlowUtil.createComposingFunction(); final RpcResult addFlowBatchOutput = createAddFlowsBatchSuccessOutput(); - final RpcResult barrierOutput = createBarrierFailureOutcome(); - final Pair, RpcResult> input = Pair.of(addFlowBatchOutput, barrierOutput); + final RpcResult barrierOutput = createBarrierFailureOutcome(); + final Pair, RpcResult> input + = Pair.of(addFlowBatchOutput, barrierOutput); final RpcResult composite = compositeFunction.apply(input); Assert.assertFalse(composite.isSuccessful()); @@ -221,12 +197,13 @@ public class FlowUtilTest { @Test public void testCreateComposingFunction_failure_failure() throws Exception { - final Function, RpcResult>, RpcResult> compositeFunction = - FlowUtil.createComposingFunction(); + final Function, RpcResult>, + RpcResult> compositeFunction = FlowUtil.createComposingFunction(); final RpcResult addFlowBatchOutput = createAddFlowsBatchFailureOutcome(); - final RpcResult barrierOutput = createBarrierFailureOutcome(); - final Pair, RpcResult> input = Pair.of(addFlowBatchOutput, barrierOutput); + final RpcResult barrierOutput = createBarrierFailureOutcome(); + final Pair, RpcResult> input + = Pair.of(addFlowBatchOutput, barrierOutput); final RpcResult composite = compositeFunction.apply(input); Assert.assertFalse(composite.isSuccessful()); @@ -234,8 +211,8 @@ public class FlowUtilTest { Assert.assertEquals(1, composite.getResult().getBatchFailedFlowsOutput().size()); } - private RpcResult createBarrierFailureOutcome() { - return RpcResultBuilder.failed() + private RpcResult createBarrierFailureOutcome() { + return RpcResultBuilder.failed() .withError(RpcError.ErrorType.APPLICATION, "ut-barrier-error") .build(); }