removed testPersistentGetterSetterPair Test

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermBase.java
index 6b923fd2504b6e4d40949e804b2caf44472483be..a121c6c4b56b67e0f1460a1f4fc9a5c8039f974e 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermBase.java
@@ -60,8 +60,8 @@ public abstract class OrderedTermBase<T extends OrderedTermBase> extends Defined
        protected int orderIndex;
        
        /**
-        * Higher ordered terms have a lower oderIndex, 
-        * lower ordered terms have a higher order Index:
+        * Higher ordered terms have a lower order index, 
+        * lower ordered terms have a higher order index:
         * <p>
         * <b>a.oderIndex &lt; b.oderIndex : a &gt; b</b>
         * @return the order index of a term

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/unit/EntityTestBase.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/unit/EntityTestBase.java
index 46e79893f5104a88abc89c3d5a7344a4f32616ad..96d36aafa8e03fe6a7623e45899aed52ebc03b3f 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/unit/EntityTestBase.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/unit/EntityTestBase.java
@@ -52,60 +52,58 @@ public abstract class EntityTestBase {
                }\r
        }\r
        \r
-       /**\r
-        * Tests if all persistent (not transient) getter have an according setter.\r
-        * FIXME Having matched getter / setter pairs is not strictly necessary if we \r
-        * use field-level hibernate annotations, and is perhaps even desirable (i.e. \r
-        * prevent the use of set() methods on *-to-Many fields by enforcing use of add*() \r
-        * and remove*())\r
-        */\r
-       @Test \r
-       @Ignore\r
-       public final void testPersistentGetterSetterPair() {\r
-               //\r
-               Annotation annotation = clazzToTest.getAnnotation(Entity.class);\r
-               if (annotation != null){\r
-                       Method[] methods = clazzToTest.getDeclaredMethods();\r
-                       List<String> strMethods = new ArrayList<String>(); \r
-                       for (Method method : methods){\r
-                               strMethods.add(method.getName());\r
-                       }               \r
-                       for (Method method : methods){\r
-                               if (Modifier.isStatic( method.getModifiers())){\r
-                                       continue;\r
-                               }\r
-                               String getMethodName = method.getName();\r
-                               try {\r
-                                       if ( ( getMethodName.startsWith("get") || getMethodName.startsWith("is") )\r
-                                                       && method.getAnnotation(Transient.class) == null){\r
-                                               String setMethodName = null;\r
-                                               if ( getMethodName.startsWith("get")){\r
-                                                       setMethodName = "s" + getMethodName.substring(1);\r
-                                               }else if ( getMethodName.startsWith("is")){\r
-                                                       setMethodName = "set" + getMethodName.substring(2);\r
-                                               }else{\r
-                                                       logger.error("Unknown getter method start");\r
-                                                       fail();\r
-                                               }\r
-                                               Class params = method.getReturnType();\r
-                                               Method setMethod = clazzToTest.getDeclaredMethod(setMethodName, params);\r
-                                               if (setMethod == null){fail();}\r
-                                       }else{\r
-                                               //no setter - do nothing\r
-                                       }\r
-                               } catch (SecurityException e) {\r
-                                       logger.info(e.getMessage());\r
-                               } catch (Exception e) {\r
-                                       String warning = "Missing setter for getter - a non transient getter method should also have a setter: " + getMethodName;\r
-                                       logger.warn(warning);\r
-                                       if (! (clazzToTest == (Class)NonViralName.class && getMethodName.equals("getCitation") ) ){\r
-                                               fail(warning);\r
-                                       }\r
-                               }\r
-\r
-                       }\r
-               }\r
-               \r
-       }\r
+//     /**\r
+//      * Tests if all persistent (not transient) getter have an according setter.\r
+//      * Not needed anymore as we switched to field-level hibernate annotations.\r
+//      * Maybe useful once we try to fully compliant with the beans specification. \r
+//      */\r
+//     @Test \r
+//     @Ignore\r
+//     public final void testPersistentGetterSetterPair() {\r
+//             //\r
+//             Annotation annotation = clazzToTest.getAnnotation(Entity.class);\r
+//             if (annotation != null){\r
+//                     Method[] methods = clazzToTest.getDeclaredMethods();\r
+//                     List<String> strMethods = new ArrayList<String>(); \r
+//                     for (Method method : methods){\r
+//                             strMethods.add(method.getName());\r
+//                     }               \r
+//                     for (Method method : methods){\r
+//                             if (Modifier.isStatic( method.getModifiers())){\r
+//                                     continue;\r
+//                             }\r
+//                             String getMethodName = method.getName();\r
+//                             try {\r
+//                                     if ( ( getMethodName.startsWith("get") || getMethodName.startsWith("is") )\r
+//                                                     && method.getAnnotation(Transient.class) == null){\r
+//                                             String setMethodName = null;\r
+//                                             if ( getMethodName.startsWith("get")){\r
+//                                                     setMethodName = "s" + getMethodName.substring(1);\r
+//                                             }else if ( getMethodName.startsWith("is")){\r
+//                                                     setMethodName = "set" + getMethodName.substring(2);\r
+//                                             }else{\r
+//                                                     logger.error("Unknown getter method start");\r
+//                                                     fail();\r
+//                                             }\r
+//                                             Class params = method.getReturnType();\r
+//                                             Method setMethod = clazzToTest.getDeclaredMethod(setMethodName, params);\r
+//                                             if (setMethod == null){fail();}\r
+//                                     }else{\r
+//                                             //no setter - do nothing\r
+//                                     }\r
+//                             } catch (SecurityException e) {\r
+//                                     logger.info(e.getMessage());\r
+//                             } catch (Exception e) {\r
+//                                     String warning = "Missing setter for getter - a non transient getter method should also have a setter: " + getMethodName;\r
+//                                     logger.warn(warning);\r
+//                                     if (! (clazzToTest == (Class)NonViralName.class && getMethodName.equals("getCitation") ) ){\r
+//                                             fail(warning);\r
+//                                     }\r
+//                             }\r
+//\r
+//                     }\r
+//             }\r
+//             \r
+//     }\r
 \r
 }\r