[openjpa] 01/03: fix TestQueryExcludingSubclasses sorting

[st...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git

commit bb214f93d4027c298a38eb679e97f6e8c2ed12d8
Author: Mark Struberg <st...@apache.org>
AuthorDate: Sat Apr 10 11:39:57 2021 +0200

    fix TestQueryExcludingSubclasses sorting
    
    The sorting behaviour of characters )'a..z, A..Z') and
    numbers (0..9) is depending on NLS. For e.g. german NLS
    in Oracle 0 comes only after z, so we get esub1,esub2,e1,e2
    while on some other databases we get e1,e2,esub1,esub2.
    Easy fix is to have the second position also a Character to
    force a distinctive order over all different databases and
    settings.
---
 .../persistence/query/TestQueryExcludingSubclasses.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryExcludingSubclasses.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryExcludingSubclasses.java
index afae439..4d3dc13 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryExcludingSubclasses.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryExcludingSubclasses.java
@@ -41,15 +41,15 @@ public class TestQueryExcludingSubclasses
         setUp(ManyOneEntity.class, ManyOneEntitySub.class);
 
         ManyOneEntity e1 = new ManyOneEntity();
-        e1.setName("e1");
+        e1.setName("eMain1");
         ManyOneEntity e2 = new ManyOneEntity();
-        e2.setName("e2");
+        e2.setName("eMain2");
         ManyOneEntity invalid = new ManyOneEntity();
         invalid.setName("invalid");
         ManyOneEntitySub esub1 = new ManyOneEntitySub();
-        esub1.setName("esub1");
+        esub1.setName("eSub1");
         ManyOneEntitySub esub2 = new ManyOneEntitySub();
-        esub2.setName("esub2");
+        esub2.setName("eSub2");
         ManyOneEntitySub invalidsub = new ManyOneEntitySub();
         invalidsub.setName("invalidsub");
 
@@ -73,11 +73,11 @@ public class TestQueryExcludingSubclasses
         assertEquals(4, res.size());
         for (int i = 0; i < 2; i++) {
             assertEquals(ManyOneEntity.class, res.get(i).getClass());
-            assertEquals("e" + (i + 1), res.get(i).getName());
+            assertEquals("eMain" + (i + 1), res.get(i).getName());
         }
         for (int i = 0; i < 2; i++) {
             assertEquals(ManyOneEntitySub.class, res.get(i + 2).getClass());
-            assertEquals("esub" + (i + 1), res.get(i + 2).getName());
+            assertEquals("eSub" + (i + 1), res.get(i + 2).getName());
         }
         em.close();
     }
@@ -91,7 +91,7 @@ public class TestQueryExcludingSubclasses
         assertEquals(2, res.size());
         for (int i = 0; i < res.size(); i++) {
             assertEquals(ManyOneEntity.class, res.get(i).getClass());
-            assertEquals("e" + (i + 1), res.get(i).getName());
+            assertEquals("eMain" + (i + 1), res.get(i).getName());
         }
         em.close();
     }