Return-Path: X-Original-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EE5C27807 for ; Fri, 2 Sep 2011 13:51:51 +0000 (UTC) Received: (qmail 14717 invoked by uid 500); 2 Sep 2011 13:51:51 -0000 Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org Received: (qmail 14661 invoked by uid 500); 2 Sep 2011 13:51:51 -0000 Mailing-List: contact connectors-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: connectors-dev@incubator.apache.org Delivered-To: mailing list connectors-commits@incubator.apache.org Received: (qmail 14654 invoked by uid 99); 2 Sep 2011 13:51:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Sep 2011 13:51:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Sep 2011 13:51:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E2DB323889B3; Fri, 2 Sep 2011 13:51:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1164533 - /incubator/lcf/trunk/framework/script-engine/src/test/java/org/apache/manifoldcf/scriptengine/tests/ExpressionTest.java Date: Fri, 02 Sep 2011 13:51:28 -0000 To: connectors-commits@incubator.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110902135128.E2DB323889B3@eris.apache.org> Author: kwright Date: Fri Sep 2 13:51:28 2011 New Revision: 1164533 URL: http://svn.apache.org/viewvc?rev=1164533&view=rev Log: Complete the integer part of the expression test. Other tests will be modeled on this one. Modified: incubator/lcf/trunk/framework/script-engine/src/test/java/org/apache/manifoldcf/scriptengine/tests/ExpressionTest.java Modified: incubator/lcf/trunk/framework/script-engine/src/test/java/org/apache/manifoldcf/scriptengine/tests/ExpressionTest.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/script-engine/src/test/java/org/apache/manifoldcf/scriptengine/tests/ExpressionTest.java?rev=1164533&r1=1164532&r2=1164533&view=diff ============================================================================== --- incubator/lcf/trunk/framework/script-engine/src/test/java/org/apache/manifoldcf/scriptengine/tests/ExpressionTest.java (original) +++ incubator/lcf/trunk/framework/script-engine/src/test/java/org/apache/manifoldcf/scriptengine/tests/ExpressionTest.java Fri Sep 2 13:51:28 2011 @@ -30,10 +30,114 @@ public class ExpressionTest extends Scri throws Exception { VariableReference vr; + + // Binary + vr = evaluateExpression("1+2"); assertNotNull(vr); assertEquals(vr.resolve().getIntValue(),3); - // MHL + + // Binary - + vr = evaluateExpression("1-2"); + assertNotNull(vr); + assertEquals(vr.resolve().getIntValue(),-1); + + // Binary * + vr = evaluateExpression("2*3"); + assertNotNull(vr); + assertEquals(vr.resolve().getIntValue(),6); + + // Binary / + vr = evaluateExpression("3/2"); + assertNotNull(vr); + assertEquals(vr.resolve().getIntValue(),1); + + // Unary - + vr = evaluateExpression("-2"); + assertNotNull(vr); + assertEquals(vr.resolve().getIntValue(),-2); + + // Binary & + vr = evaluateExpression("1&5"); + assertNotNull(vr); + assertEquals(vr.resolve().getIntValue(),1); + + // Binary | + vr = evaluateExpression("1|2"); + assertNotNull(vr); + assertEquals(vr.resolve().getIntValue(),3); + + // Unary ! + vr = evaluateExpression("!2"); + assertNotNull(vr); + assertEquals(vr.resolve().getIntValue(),2^2); + + // > + vr = evaluateExpression("1>1"); + assertNotNull(vr); + assertEquals(vr.resolve().getBooleanValue(),false); + vr = evaluateExpression("2>1"); + assertNotNull(vr); + assertEquals(vr.resolve().getBooleanValue(),true); + + // >= + vr = evaluateExpression("0>=1"); + assertNotNull(vr); + assertEquals(vr.resolve().getBooleanValue(),false); + vr = evaluateExpression("1>=1"); + assertNotNull(vr); + assertEquals(vr.resolve().getBooleanValue(),true); + + // < + vr = evaluateExpression("2<2"); + assertNotNull(vr); + assertEquals(vr.resolve().getBooleanValue(),false); + vr = evaluateExpression("1<2"); + assertNotNull(vr); + assertEquals(vr.resolve().getBooleanValue(),true); + + // <= + vr = evaluateExpression("2<=1"); + assertNotNull(vr); + assertEquals(vr.resolve().getBooleanValue(),false); + vr = evaluateExpression("1<=1"); + assertNotNull(vr); + assertEquals(vr.resolve().getBooleanValue(),true); + + // == + vr = evaluateExpression("1==2"); + assertNotNull(vr); + assertEquals(vr.resolve().getBooleanValue(),false); + vr = evaluateExpression("1==1"); + assertNotNull(vr); + assertEquals(vr.resolve().getBooleanValue(),true); + + // != + vr = evaluateExpression("1!=1"); + assertNotNull(vr); + assertEquals(vr.resolve().getBooleanValue(),false); + vr = evaluateExpression("1!=2"); + assertNotNull(vr); + assertEquals(vr.resolve().getBooleanValue(),true); + + // Attributes + vr = evaluateExpression("2 .__int__"); + assertNotNull(vr); + assertEquals(vr.resolve().getIntValue(),2); + vr = evaluateExpression("2 .__string__"); + assertNotNull(vr); + assertEquals(vr.resolve().getStringValue(),"2"); + vr = evaluateExpression("2 .__float__"); + assertNotNull(vr); + assertEquals(vr.resolve().getDoubleValue(),2.0,0.0); + vr = evaluateExpression("2 .__script__"); + assertNotNull(vr); + assertEquals(vr.resolve().getStringValue(),"2"); + + // Various values + assertEquals(new VariableInt(2).getIntValue(),2); + assertEquals(new VariableInt(2).getStringValue(),"2"); + assertEquals(new VariableInt(2).getDoubleValue(),2.0,0.0); + } }