--- a/server/test/unittest_ssplanner.py	Fri Apr 17 13:21:05 2009 +0200
+++ b/server/test/unittest_ssplanner.py	Fri Apr 17 16:55:37 2009 +0200
@@ -21,12 +21,12 @@
         self._test('Any XN ORDERBY XN WHERE X name XN',
                    [('OneFetchStep', [('Any XN ORDERBY XN WHERE X name XN',
                                        [{'X': 'Basket', 'XN': 'String'},
-                                        {'X': 'ECache', 'XN': 'String'},
-                                        {'X': 'EConstraintType', 'XN': 'String'},
-                                        {'X': 'EEType', 'XN': 'String'},
-                                        {'X': 'EGroup', 'XN': 'String'},
-                                        {'X': 'EPermission', 'XN': 'String'},
-                                        {'X': 'ERType', 'XN': 'String'},
+                                        {'X': 'CWCache', 'XN': 'String'},
+                                        {'X': 'CWConstraintType', 'XN': 'String'},
+                                        {'X': 'CWEType', 'XN': 'String'},
+                                        {'X': 'CWGroup', 'XN': 'String'},
+                                        {'X': 'CWPermission', 'XN': 'String'},
+                                        {'X': 'CWRType', 'XN': 'String'},
                                         {'X': 'File', 'XN': 'String'},
                                         {'X': 'Folder', 'XN': 'String'},
                                         {'X': 'Image', 'XN': 'String'},
@@ -40,12 +40,12 @@
         self._test('Any XN,COUNT(X) GROUPBY XN WHERE X name XN',
                    [('OneFetchStep', [('Any XN,COUNT(X) GROUPBY XN WHERE X name XN',
                                        [{'X': 'Basket', 'XN': 'String'},
-                                        {'X': 'ECache', 'XN': 'String'},
-                                        {'X': 'EConstraintType', 'XN': 'String'},
-                                        {'X': 'EEType', 'XN': 'String'},
-                                        {'X': 'EGroup', 'XN': 'String'},
-                                        {'X': 'EPermission', 'XN': 'String'},
-                                        {'X': 'ERType', 'XN': 'String'},
+                                        {'X': 'CWCache', 'XN': 'String'},
+                                        {'X': 'CWConstraintType', 'XN': 'String'},
+                                        {'X': 'CWEType', 'XN': 'String'},
+                                        {'X': 'CWGroup', 'XN': 'String'},
+                                        {'X': 'CWPermission', 'XN': 'String'},
+                                        {'X': 'CWRType', 'XN': 'String'},
                                         {'X': 'File', 'XN': 'String'},
                                         {'X': 'Folder', 'XN': 'String'},
                                         {'X': 'Image', 'XN': 'String'},