From 2352345b7e5b68d6d129b796898f0dff8634c71a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Tue, 22 Jun 2010 17:34:13 +0000
Subject: [PATCH] removed testPersistentGetterSetterPair Test

---
 .../cdm/model/common/OrderedTermBase.java     |   4 +-
 .../cdm/test/unit/EntityTestBase.java         | 108 +++++++++---------
 2 files changed, 55 insertions(+), 57 deletions(-)

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