Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 31D71200C8F for ; Fri, 9 Jun 2017 17:49:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 306D3160BD4; Fri, 9 Jun 2017 15:49:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4C89D160B9C for ; Fri, 9 Jun 2017 17:49:35 +0200 (CEST) Received: (qmail 81068 invoked by uid 500); 9 Jun 2017 15:49:34 -0000 Mailing-List: contact commits-help@metron.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@metron.apache.org Delivered-To: mailing list commits@metron.apache.org Received: (qmail 81059 invoked by uid 99); 9 Jun 2017 15:49:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jun 2017 15:49:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2CFA7E10F3; Fri, 9 Jun 2017 15:49:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cestella@apache.org To: commits@metron.apache.org Date: Fri, 09 Jun 2017 15:49:32 -0000 Message-Id: <0a912b4184cf49c9a543e71c93e41f08@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] metron git commit: METRON-980: Short circuit operations for Stellar closes apache/metron#606 archived-at: Fri, 09 Jun 2017 15:49:36 -0000 Repository: metron Updated Branches: refs/heads/master 7d6121bfd -> 30d0e2a6f http://git-wip-us.apache.org/repos/asf/metron/blob/30d0e2a6/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/FloatLiteralEvaluatorTest.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/FloatLiteralEvaluatorTest.java b/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/FloatLiteralEvaluatorTest.java index 4f7117a..f9ecff1 100644 --- a/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/FloatLiteralEvaluatorTest.java +++ b/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/FloatLiteralEvaluatorTest.java @@ -48,8 +48,8 @@ public class FloatLiteralEvaluatorTest { public void verifyHappyPathEvaluation() throws Exception { when(context.getText()).thenReturn("100f"); - Token evaluated = evaluator.evaluate(context); - assertEquals(new Token<>(100f, Float.class), evaluated); + Token evaluated = evaluator.evaluate(context, null); + assertEquals(new Token<>(100f, Float.class, null), evaluated); verify(context).getText(); verifyNoMoreInteractions(context); @@ -60,7 +60,7 @@ public class FloatLiteralEvaluatorTest { exception.expect(NumberFormatException.class); when(context.getText()).thenReturn(""); - evaluator.evaluate(context); + evaluator.evaluate(context, null); } @Test @@ -68,7 +68,7 @@ public class FloatLiteralEvaluatorTest { exception.expect(IllegalArgumentException.class); exception.expectMessage("Cannot evaluate a context that is null."); - evaluator.evaluate(null); + evaluator.evaluate(null, null); } } http://git-wip-us.apache.org/repos/asf/metron/blob/30d0e2a6/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/IntLiteralEvaluatorTest.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/IntLiteralEvaluatorTest.java b/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/IntLiteralEvaluatorTest.java index 2fd081f..bef23d1 100644 --- a/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/IntLiteralEvaluatorTest.java +++ b/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/IntLiteralEvaluatorTest.java @@ -48,8 +48,8 @@ public class IntLiteralEvaluatorTest { public void verifyHappyPathEvaluation() throws Exception { when(context.getText()).thenReturn("100"); - Token evaluated = evaluator.evaluate(context); - assertEquals(new Token<>(100, Integer.class), evaluated); + Token evaluated = evaluator.evaluate(context, null); + assertEquals(new Token<>(100, Integer.class, null), evaluated); verify(context).getText(); verifyNoMoreInteractions(context); @@ -60,7 +60,7 @@ public class IntLiteralEvaluatorTest { exception.expect(NumberFormatException.class); when(context.getText()).thenReturn(""); - evaluator.evaluate(context); + evaluator.evaluate(context, null); } @Test @@ -68,7 +68,7 @@ public class IntLiteralEvaluatorTest { exception.expect(IllegalArgumentException.class); exception.expectMessage("Cannot evaluate a context that is null."); - evaluator.evaluate(null); + evaluator.evaluate(null, null); } } http://git-wip-us.apache.org/repos/asf/metron/blob/30d0e2a6/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/LongLiteralEvaluatorTest.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/LongLiteralEvaluatorTest.java b/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/LongLiteralEvaluatorTest.java index 21f75d4..e9c3aa7 100644 --- a/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/LongLiteralEvaluatorTest.java +++ b/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/LongLiteralEvaluatorTest.java @@ -49,8 +49,8 @@ public class LongLiteralEvaluatorTest { public void verifyHappyPathEvaluation() throws Exception { when(context.getText()).thenReturn("100L"); - Token evaluated = evaluator.evaluate(context); - assertEquals(new Token<>(100L, Long.class), evaluated); + Token evaluated = evaluator.evaluate(context, null); + assertEquals(new Token<>(100L, Long.class, null), evaluated); verify(context).getText(); verifyNoMoreInteractions(context); @@ -62,7 +62,7 @@ public class LongLiteralEvaluatorTest { exception.expectMessage("Invalid format for long. Failed trying to parse a long with the following value: "); when(context.getText()).thenReturn(""); - evaluator.evaluate(context); + evaluator.evaluate(context, null); } @Test @@ -70,6 +70,6 @@ public class LongLiteralEvaluatorTest { exception.expect(IllegalArgumentException.class); exception.expectMessage("Cannot evaluate a context that is null."); - evaluator.evaluate(null); + evaluator.evaluate(null, null); } } http://git-wip-us.apache.org/repos/asf/metron/blob/30d0e2a6/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/NumberLiteralEvaluatorTest.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/NumberLiteralEvaluatorTest.java b/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/NumberLiteralEvaluatorTest.java index 8317737..2065e6d 100644 --- a/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/NumberLiteralEvaluatorTest.java +++ b/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/evaluators/NumberLiteralEvaluatorTest.java @@ -60,36 +60,36 @@ public class NumberLiteralEvaluatorTest { @Test public void verifyIntLiteralContextIsProperlyEvaluated() throws Exception { StellarParser.IntLiteralContext context = mock(StellarParser.IntLiteralContext.class); - NumberLiteralEvaluator.INSTANCE.evaluate(context, instanceMap); + NumberLiteralEvaluator.INSTANCE.evaluate(context, instanceMap, null); - verify(intLiteralContextNumberEvaluator).evaluate(context); + verify(intLiteralContextNumberEvaluator).evaluate(context, null); verifyZeroInteractions(doubleLiteralContextNumberEvaluator, floatLiteralContextNumberEvaluator, longLiteralContextNumberEvaluator); } @Test public void verifyDoubleLiteralContextIsProperlyEvaluated() throws Exception { StellarParser.DoubleLiteralContext context = mock(StellarParser.DoubleLiteralContext.class); - NumberLiteralEvaluator.INSTANCE.evaluate(context, instanceMap); + NumberLiteralEvaluator.INSTANCE.evaluate(context, instanceMap, null); - verify(doubleLiteralContextNumberEvaluator).evaluate(context); + verify(doubleLiteralContextNumberEvaluator).evaluate(context, null); verifyZeroInteractions(intLiteralContextNumberEvaluator, floatLiteralContextNumberEvaluator, longLiteralContextNumberEvaluator); } @Test public void verifyFloatLiteralContextIsProperlyEvaluated() throws Exception { StellarParser.FloatLiteralContext context = mock(StellarParser.FloatLiteralContext.class); - NumberLiteralEvaluator.INSTANCE.evaluate(context, instanceMap); + NumberLiteralEvaluator.INSTANCE.evaluate(context, instanceMap, null); - verify(floatLiteralContextNumberEvaluator).evaluate(context); + verify(floatLiteralContextNumberEvaluator).evaluate(context, null); verifyZeroInteractions(doubleLiteralContextNumberEvaluator, intLiteralContextNumberEvaluator, longLiteralContextNumberEvaluator); } @Test public void verifyLongLiteralContextIsProperlyEvaluated() throws Exception { StellarParser.LongLiteralContext context = mock(StellarParser.LongLiteralContext.class); - NumberLiteralEvaluator.INSTANCE.evaluate(context, instanceMap); + NumberLiteralEvaluator.INSTANCE.evaluate(context, instanceMap, null); - verify(longLiteralContextNumberEvaluator).evaluate(context); + verify(longLiteralContextNumberEvaluator).evaluate(context, null); verifyZeroInteractions(doubleLiteralContextNumberEvaluator, floatLiteralContextNumberEvaluator, intLiteralContextNumberEvaluator); } @@ -100,7 +100,7 @@ public class NumberLiteralEvaluatorTest { exception.expect(ParseException.class); exception.expectMessage("Does not support evaluation for type " + context.getClass()); - NumberLiteralEvaluator.INSTANCE.evaluate(context, instanceMap); + NumberLiteralEvaluator.INSTANCE.evaluate(context, instanceMap, null); verifyZeroInteractions(longLiteralContextNumberEvaluator, doubleLiteralContextNumberEvaluator, floatLiteralContextNumberEvaluator, intLiteralContextNumberEvaluator); }