signed expressions tests improved

Author: wumpz

src/main/java/net/sf/jsqlparser/expression/SignedExpression.java

@@ -26,23 +26,26 @@
  */
 public class SignedExpression implements Expression {
 
-    private char sign;
-    private Expression expression;
+	private char sign;
+	private Expression expression;
 
 	public SignedExpression(char sign, Expression expression) {
-        this.sign = sign;
-        setExpression(expression);
+		setSign(sign);
+		setExpression(expression);
 	}
 
-    public char getSign() {
-        return sign;
-    }
+	public char getSign() {
+		return sign;
+	}
 
-    public void setSign(char sign) {
-        this.sign = sign;
-    }
+	public final void setSign(char sign) {
+		this.sign = sign;
+		if (sign != '+' && sign != '-') {
+			throw new IllegalArgumentException("illegal sign character, only + - allowed");
+		}
+	}
 
-    public Expression getExpression() {
+	public Expression getExpression() {
 		return expression;
 	}
 
@@ -55,8 +58,8 @@ public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
 
-    @Override
-    public String toString() {
-        return getSign() + expression.toString();
-    }
+	@Override
+	public String toString() {
+		return getSign() + expression.toString();
+	}
 }

src/main/java/net/sf/jsqlparser/statement/create/index/CreateIndex.java

@@ -5,16 +5,16 @@
  * Copyright (C) 2004 - 2013 JSQLParser
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2.1 of the
+ * it under the terms of the GNU Lesser General Public License as 
+ * published by the Free Software Foundation, either version 2.1 of the 
  * License, or (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%

src/test/java/net/sf/jsqlparser/expression/SignedExpressionTest.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2014 JSQLParser.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+
+package net.sf.jsqlparser.expression;
+
+import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author toben
+ */
+public class SignedExpressionTest {
+	
+	public SignedExpressionTest() {
+	}
+	
+	@BeforeClass
+	public static void setUpClass() {
+	}
+	
+	@AfterClass
+	public static void tearDownClass() {
+	}
+	
+	@Before
+	public void setUp() {
+	}
+	
+	@After
+	public void tearDown() {
+	}
+
+	/**
+	 * Test of getSign method, of class SignedExpression.
+	 */
+	@Test(expected = IllegalArgumentException.class)
+	public void testGetSign() throws JSQLParserException {
+		new SignedExpression('*', CCJSqlParserUtil.parseExpression("a"));
+		fail("must not work");
+	}
+}

src/test/java/net/sf/jsqlparser/test/select/SelectTest.java

@@ -138,21 +138,34 @@ public void testAllColumnsFromTable() throws Exception {
         assertStatementCanBeDeparsedAs(select, statement);
     }
 
-    public void testSimpleSigns() throws Exception {
+    public void testSimpleSigns() throws JSQLParserException  {
         final String statement = "SELECT +1, -1 FROM tableName";
         Select select = (Select) parserManager.parse(new StringReader(statement));
 
         assertStatementCanBeDeparsedAs(select, statement);
     }
 
-    public void testSimpleAdditionsAndSubtractions() throws Exception {
+    public void testSimpleAdditionsAndSubtractionsWithSigns() throws JSQLParserException  {
         final String statement = "SELECT 1 - 1, 1 + 1, -1 - 1, -1 + 1, +1 + 1, +1 - 1 FROM tableName";
         Select select = (Select) parserManager.parse(new StringReader(statement));
 
         assertStatementCanBeDeparsedAs(select, statement);
     }
+	
+	public void testOperationsWithSigns() throws JSQLParserException  {
+		Expression expr = CCJSqlParserUtil.parseExpression("1 - -1");
+        assertEquals("1 - -1", expr.toString());
+		assertTrue(expr instanceof Subtraction);
+		Subtraction sub = (Subtraction) expr;
+		assertTrue(sub.getLeftExpression() instanceof LongValue);
+		assertTrue(sub.getRightExpression() instanceof SignedExpression);
+		
+		SignedExpression sexpr = (SignedExpression) sub.getRightExpression();
+		assertEquals("-", sexpr.getSign());
+		assertEquals("1", sexpr.getExpression().toString());
+    }
 
-    public void testSignedColumns() throws Exception {
+    public void testSignedColumns() throws JSQLParserException {
         final String statement = "SELECT -columnName, +columnName, +(columnName), -(columnName) FROM tableName";
         Select select = (Select) parserManager.parse(new StringReader(statement));