Fixing some minor warnings and errors in JPA tests

Signed-off-by: Will Dazey <[email protected]>

Author: dazey3

Diff for: foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/jpql/AbstractSchemaIdentifierEqualsTest.java

@@ -22,7 +22,7 @@ public void setup() {
         Employee emp;
         emp = (Employee)getSomeEmployees().firstElement();
 
-        String ejbqlString = "SELECT OBJECT(emp) FROM Employee emp WHERE emp = ?1";
+        String ejbqlString = "SELECT OBJECT(e) FROM Employee e WHERE e = ?1";
 
         setEjbqlString(ejbqlString);
         setOriginalOject(emp);

Diff for: foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/jpql/AbstractSchemaIdentifierNotEqualsTest.java

@@ -23,7 +23,7 @@ public void setup() {
         Vector employees = getSomeEmployees();
         emp = (Employee)employees.firstElement();
 
-        String ejbqlString = "SELECT OBJECT(emp) FROM Employee emp WHERE emp <> ?1";
+        String ejbqlString = "SELECT OBJECT(e) FROM Employee e WHERE e <> ?1";
 
         setEjbqlString(ejbqlString);
 

Diff for: foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/jpql/BaseTestCase.java

@@ -22,7 +22,7 @@ public void setup() {
         Vector employees = getSession().readAllObjects(Employee.class);
 
         setOriginalOject(employees);
-        setEjbqlString("SELECT OBJECT(emp) FROM Employee emp");
+        setEjbqlString("SELECT OBJECT(e) FROM Employee e");
 
         super.setup();
     }

Diff for: foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/jpql/BinaryOperatorTest.java

@@ -30,7 +30,7 @@ public static BinaryOperatorTest getSimpleGreaterThanTest() {
         BinaryOperatorTest theTest = new BinaryOperatorTest();
 
         theTest.setName("Simple Greater Than test");
-        theTest.setEjbqlString("SELECT OBJECT(emp) FROM Employee emp WHERE emp.id > 12");
+        theTest.setEjbqlString("SELECT OBJECT(e) FROM Employee e WHERE e.id > 12");
         theTest.setReferenceClass(Employee.class);
 
         ExpressionBuilder builder = new ExpressionBuilder();
@@ -44,7 +44,7 @@ public static BinaryOperatorTest getSimpleGreaterThanEqualTest() {
         BinaryOperatorTest theTest = new BinaryOperatorTest();
 
         theTest.setName("Simple Greater Than Equal test");
-        theTest.setEjbqlString("SELECT OBJECT(emp) FROM Employee emp WHERE emp.id >= 12");
+        theTest.setEjbqlString("SELECT OBJECT(e) FROM Employee e WHERE e.id >= 12");
         theTest.setReferenceClass(Employee.class);
 
         ExpressionBuilder builder = new ExpressionBuilder();
@@ -58,7 +58,7 @@ public static BinaryOperatorTest getSimpleLessThanEqualTest() {
         BinaryOperatorTest theTest = new BinaryOperatorTest();
 
         theTest.setName("Simple Less Than Equal test");
-        theTest.setEjbqlString("SELECT OBJECT(emp) FROM Employee emp WHERE emp.id <= 1000000");
+        theTest.setEjbqlString("SELECT OBJECT(e) FROM Employee e WHERE e.id <= 1000000");
         theTest.setReferenceClass(Employee.class);
 
         ExpressionBuilder builder = new ExpressionBuilder();
@@ -72,7 +72,7 @@ public static BinaryOperatorTest getSimpleLessThanTest() {
         BinaryOperatorTest theTest = new BinaryOperatorTest();
 
         theTest.setName("Simple Less Than test");
-        theTest.setEjbqlString("SELECT OBJECT(emp) FROM Employee emp WHERE emp.id < 1000000");
+        theTest.setEjbqlString("SELECT OBJECT(e) FROM Employee e WHERE e.id < 1000000");
         theTest.setReferenceClass(Employee.class);
 
         ExpressionBuilder builder = new ExpressionBuilder();
@@ -86,7 +86,7 @@ public static BinaryOperatorTest getSimplePlusTest() {
         BinaryOperatorTest theTest = new BinaryOperatorTest();
 
         theTest.setName("Simple Plus test");
-        theTest.setEjbqlString("SELECT OBJECT(emp) FROM Employee emp WHERE emp.salary + 1000 <= 50000");
+        theTest.setEjbqlString("SELECT OBJECT(e) FROM Employee e WHERE e.salary + 1000 <= 50000");
         theTest.setReferenceClass(Employee.class);
 
         ExpressionBuilder builder = new ExpressionBuilder();
@@ -100,7 +100,7 @@ public static BinaryOperatorTest getSimplePlusTestWithBracketsBeforeComparison()
         BinaryOperatorTest theTest = new BinaryOperatorTest();
 
         theTest.setName("Simple Plus test with brackets before comparison");
-        theTest.setEjbqlString("SELECT OBJECT(emp) FROM Employee emp WHERE (emp.salary + 1000) <= 50000");
+        theTest.setEjbqlString("SELECT OBJECT(e) FROM Employee e WHERE (e.salary + 1000) <= 50000");
         theTest.setReferenceClass(Employee.class);
 
         ExpressionBuilder builder = new ExpressionBuilder();
@@ -114,7 +114,7 @@ public static BinaryOperatorTest getSimplePlusTestWithBracketsAfterComparison()
         BinaryOperatorTest theTest = new BinaryOperatorTest();
 
         theTest.setName("Simple Plus test with brackets after comparison");
-        theTest.setEjbqlString("SELECT OBJECT(emp) FROM Employee emp WHERE 50000 > (emp.salary + 1000)");
+        theTest.setEjbqlString("SELECT OBJECT(e) FROM Employee e WHERE 50000 > (e.salary + 1000)");
         theTest.setReferenceClass(Employee.class);
 
         ExpressionBuilder builder = new ExpressionBuilder();
@@ -128,7 +128,7 @@ public static BinaryOperatorTest getSimpleMinusTest() {
         BinaryOperatorTest theTest = new BinaryOperatorTest();
 
         theTest.setName("Simple Minus test");
-        theTest.setEjbqlString("SELECT OBJECT(emp) FROM Employee emp WHERE emp.salary - 1000 <= 50000");
+        theTest.setEjbqlString("SELECT OBJECT(e) FROM Employee e WHERE e.salary - 1000 <= 50000");
         theTest.setReferenceClass(Employee.class);
 
         ExpressionBuilder builder = new ExpressionBuilder();
@@ -142,7 +142,7 @@ public static BinaryOperatorTest getSimpleMinusTestWithBracketsBeforeComparison(
         BinaryOperatorTest theTest = new BinaryOperatorTest();
 
         theTest.setName("Simple Minus test with Brackets Before Comparison");
-        theTest.setEjbqlString("SELECT OBJECT(emp) FROM Employee emp WHERE (emp.salary - 1000) <= 50000");
+        theTest.setEjbqlString("SELECT OBJECT(e) FROM Employee e WHERE (e.salary - 1000) <= 50000");
         theTest.setReferenceClass(Employee.class);
 
         ExpressionBuilder builder = new ExpressionBuilder();
@@ -156,7 +156,7 @@ public static BinaryOperatorTest getSimpleMinusTestWithBracketsAfterComparison()
         BinaryOperatorTest theTest = new BinaryOperatorTest();
 
         theTest.setName("Simple Minus test with Brackets After Comparison");
-        theTest.setEjbqlString("SELECT OBJECT(emp) FROM Employee emp WHERE 50000 > (emp.salary - 1000)");
+        theTest.setEjbqlString("SELECT OBJECT(e) FROM Employee e WHERE 50000 > (e.salary - 1000)");
         theTest.setReferenceClass(Employee.class);
 
         ExpressionBuilder builder = new ExpressionBuilder();
@@ -170,7 +170,7 @@ public static BinaryOperatorTest getSimpleMultiplyTest() {
         BinaryOperatorTest theTest = new BinaryOperatorTest();
 
         theTest.setName("Simple Multiply test");
-        theTest.setEjbqlString("SELECT OBJECT(emp) FROM Employee emp WHERE emp.salary * 2 <= 100000");
+        theTest.setEjbqlString("SELECT OBJECT(e) FROM Employee e WHERE e.salary * 2 <= 100000");
         theTest.setReferenceClass(Employee.class);
 
         ExpressionBuilder builder = new ExpressionBuilder();
@@ -184,7 +184,7 @@ public static BinaryOperatorTest getSimpleMultiplyTestWithBracketsBeforeComparis
         BinaryOperatorTest theTest = new BinaryOperatorTest();
 
         theTest.setName("Simple Multiply test with brackets before comparison");
-        theTest.setEjbqlString("SELECT OBJECT(emp) FROM Employee emp WHERE (emp.salary * 2) <= 100000");
+        theTest.setEjbqlString("SELECT OBJECT(e) FROM Employee e WHERE (e.salary * 2) <= 100000");
         theTest.setReferenceClass(Employee.class);
 
         ExpressionBuilder builder = new ExpressionBuilder();
@@ -198,7 +198,7 @@ public static BinaryOperatorTest getSimpleMultiplyTestWithBracketsAfterCompariso
         BinaryOperatorTest theTest = new BinaryOperatorTest();
 
         theTest.setName("Simple Multiply test with brackets after comparison");
-        theTest.setEjbqlString("SELECT OBJECT(emp) FROM Employee emp WHERE 100000 > (emp.salary * 2)");
+        theTest.setEjbqlString("SELECT OBJECT(e) FROM Employee e WHERE 100000 > (e.salary * 2)");
         theTest.setReferenceClass(Employee.class);
 
         ExpressionBuilder builder = new ExpressionBuilder();
@@ -212,7 +212,7 @@ public static BinaryOperatorTest getSimpleDivideTest() {
         BinaryOperatorTest theTest = new BinaryOperatorTest();
 
         theTest.setName("Simple Divide test");
-        theTest.setEjbqlString("SELECT OBJECT(emp) FROM Employee emp WHERE emp.salary / 2 <= 20000");
+        theTest.setEjbqlString("SELECT OBJECT(e) FROM Employee e WHERE e.salary / 2 <= 20000");
         theTest.setReferenceClass(Employee.class);
 
         ExpressionBuilder builder = new ExpressionBuilder();
@@ -226,7 +226,7 @@ public static BinaryOperatorTest getSimpleDivideTestWithBracketsBeforeComparison
         BinaryOperatorTest theTest = new BinaryOperatorTest();
 
         theTest.setName("Simple Divide test with brackets before comparison");
-        theTest.setEjbqlString("SELECT OBJECT(emp) FROM Employee emp WHERE (emp.salary / 2) <= 20000");
+        theTest.setEjbqlString("SELECT OBJECT(e) FROM Employee e WHERE (e.salary / 2) <= 20000");
         theTest.setReferenceClass(Employee.class);
 
         ExpressionBuilder builder = new ExpressionBuilder();
@@ -240,7 +240,7 @@ public static BinaryOperatorTest getSimpleDivideTestWithBracketsAfterComparison(
         BinaryOperatorTest theTest = new BinaryOperatorTest();
 
         theTest.setName("Simple Divide test with brackets after comparison");
-        theTest.setEjbqlString("SELECT OBJECT(emp) FROM Employee emp WHERE 20000 > (emp.salary / 2)");
+        theTest.setEjbqlString("SELECT OBJECT(e) FROM Employee e WHERE 20000 > (e.salary / 2)");
         theTest.setReferenceClass(Employee.class);
 
         ExpressionBuilder builder = new ExpressionBuilder();