SLING-10682 strictEq allows to compare enum to another enum (#8)
diff --git a/pom.xml b/pom.xml
index 475ef23..0f0b6e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,6 +124,41 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ com.github.spotbugs
+ </groupId>
+ <artifactId>
+ spotbugs-maven-plugin
+ </artifactId>
+ <versionRange>
+ [3.1.11,)
+ </versionRange>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<profiles>
diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/nodes/BinaryOperator.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/nodes/BinaryOperator.java
index 635eb6e..3d3a59a 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/nodes/BinaryOperator.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/nodes/BinaryOperator.java
@@ -225,6 +225,9 @@
if (left instanceof Boolean && right instanceof Boolean) {
return left.equals(right);
}
+ if (left instanceof Enum && right instanceof Enum) {
+ return left.equals(right);
+ }
if (left == null && right == null) {
return true;
}
@@ -244,8 +247,8 @@
return false;
}
}
- throw new SightlyCompilerException("Operands are not of the same type: the equality operator can only be applied to String, Number" +
- " and Boolean types.");
+ throw new SightlyCompilerException("Operands are not of the same type: the equality operator can only be applied to String, Number," +
+ "Boolean and Enum types.");
}
public static boolean inOp(Object left, Object right) {
diff --git a/src/test/java/org/apache/sling/scripting/sightly/compiler/expression/nodes/BinaryOperatorTest.java b/src/test/java/org/apache/sling/scripting/sightly/compiler/expression/nodes/BinaryOperatorTest.java
new file mode 100644
index 0000000..4ec0ddf
--- /dev/null
+++ b/src/test/java/org/apache/sling/scripting/sightly/compiler/expression/nodes/BinaryOperatorTest.java
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ******************************************************************************/
+package org.apache.sling.scripting.sightly.compiler.expression.nodes;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.sling.scripting.sightly.compiler.SightlyCompilerException;
+import org.apache.sling.scripting.sightly.testobjects.TestEnum;
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Enclosed.class)
+public class BinaryOperatorTest {
+
+ @RunWith(Parameterized.class)
+ public static class StrictEq {
+ @Parameters(name = "Comparison: {3}")
+ public static Iterable<? extends Object> data() {
+ List<Object[]> list = new ArrayList<>();
+ list.add(new Object[] {null, null, true, "null to null are equal"});
+
+ list.add(new Object[] {TestEnum.ONE, TestEnum.ONE.name(), true, "enum to string are equal"});
+ list.add(new Object[] {TestEnum.ONE, TestEnum.TWO.name(), false, "enum to string not equal"});
+ list.add(new Object[] {TestEnum.ONE.name(), TestEnum.ONE, true, "string to enum are equal"});
+ list.add(new Object[] {TestEnum.ONE.name(), TestEnum.TWO, false, "string to enum not equal"});
+ /**
+ * SLING-10682 verify compare enum to another enum
+ */
+ list.add(new Object[] {TestEnum.ONE, TestEnum.ONE, true, "enum to enum are equal"});
+ list.add(new Object[] {TestEnum.ONE, TestEnum.TWO, false, "enum to enum not equal"});
+
+ return list;
+ }
+
+ private Object left;
+ private Object right;
+ private boolean expectedOutcome;
+
+ public StrictEq(Object left, Object right, boolean expectedOutcome, String testLabel) {
+ super();
+ this.left = left;
+ this.right = right;
+ this.expectedOutcome = expectedOutcome;
+ }
+
+ @Test
+ public void testStrictEq() {
+ assertEquals(expectedOutcome, BinaryOperator.strictEq(left, right));
+ }
+
+ }
+
+ @RunWith(Parameterized.class)
+ public static class StrictEqError {
+
+ @Parameters(name = "Comparison: {2}")
+ public static Iterable<? extends Object> data() {
+ List<Object[]> list = new ArrayList<>();
+ list.add(new Object[] {TestEnum.ONE, new Object(), "enum to object not equal"});
+ list.add(new Object[] {new Object(), TestEnum.TWO, "object to enum not equal"});
+ list.add(new Object[] {new Object(), new Object(), "object to object not equal"});
+ list.add(new Object[] {null, TestEnum.ONE, "null to enum not equal"});
+ list.add(new Object[] {TestEnum.ONE, null, "enum to null not equal"});
+
+ return list;
+ }
+
+ private Object left;
+ private Object right;
+
+ public StrictEqError(Object left, Object right, String testLabel) {
+ super();
+ this.left = left;
+ this.right = right;
+ }
+
+ /**
+ * Expect exception when passed the wrong kind of object
+ */
+ @Test(expected = SightlyCompilerException.class)
+ public void testStrictEqWrongType() {
+ BinaryOperator.strictEq(left, right);
+ }
+
+ }
+
+}
diff --git a/src/test/java/org/apache/sling/scripting/sightly/testobjects/TestEnum.java b/src/test/java/org/apache/sling/scripting/sightly/testobjects/TestEnum.java
new file mode 100644
index 0000000..8978817
--- /dev/null
+++ b/src/test/java/org/apache/sling/scripting/sightly/testobjects/TestEnum.java
@@ -0,0 +1,28 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package org.apache.sling.scripting.sightly.testobjects;
+
+/**
+ * Used for testing/verifying the comparison
+ * of enum values
+ */
+public enum TestEnum {
+ ONE,
+ TWO
+}
\ No newline at end of file
