Project

General

Profile

« Previous | Next » 

Revision dbe93902

Added by Katja Luther over 12 years ago

commented the InReference annotation out

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java
65 65 
import eu.etaxonomy.cdm.validation.Level2;
66 66 
import eu.etaxonomy.cdm.validation.annotation.NullOrNotEmpty;
67 67 
import eu.etaxonomy.cdm.validation.annotation.InReference;
68 
import eu.etaxonomy.cdm.validation.annotation.ReferenceCheck;
68 69 

  		




  69
  70
  
    
/**


  		




  70
  71
  
    
 * The upmost (abstract) class for references (information sources). 


  		




  ......




  111
  112
  
    
@Audited


  		




  112
  113
  
    
@javax.persistence.Table(name="Reference")


  		




  113
  114
  
    
@Table(appliesTo="Reference", indexes = { @org.hibernate.annotations.Index(name = "ReferenceTitleCacheIndex", columnNames = { "titleCache" }) })


  		




  114
  
  
    
@InReference(groups = Level2.class)


  		




  
  115
  
    
//@InReference(groups = Level2.class)


  		




  
  116
  
    
//@ReferenceCheck(groups = Level2.class)


  		




  115
  117
  
    
//public abstract class Reference<S extends IReferenceBaseCacheStrategy> extends IdentifiableMediaEntity<S> implements IParsable, IMergable, IMatchable, IArticle, IBook, IJournal, IBookSection,ICdDvd,IGeneric,IInProceedings, IProceedings, IPrintSeries, IReport, IThesis,IWebPage {


  		




  116
  118
  
    
public class Reference<S extends IReferenceBaseCacheStrategy> extends IdentifiableMediaEntity<S> implements INomenclaturalReference, IArticle, IBook, IPatent, IDatabase, IJournal, IBookSection,ICdDvd,IGeneric,IInProceedings, IProceedings, IPrintSeries, IReport, IThesis,IWebPage, IPersonalCommunication, IReference, Cloneable {


  		




  117
  119
  
    
	private static final long serialVersionUID = -2034764545042691295L;


  		




  ......




  226
  228
  
    

  		




  227
  229
  
    
//    @IndexedEmbedded


  		




  228
  230
  
    
    @Cascade(CascadeType.SAVE_UPDATE)


  		




  229
  
  
    
    @InReference(groups=Level2.class)


  		




  
  231
  
    
   // @InReference(groups=Level2.class)


  		




  230
  232
  
    
   	protected Reference inReference;


  		




  231
  233
  
    
    


  		




  232
  234
  
    
//    @XmlElement(name = "FullReference")


  		




  ......




  266
  268
  
    
	//URIs like DOIs, LSIDs or Handles for this reference


  		




  267
  269
  
    
	@XmlElement(name = "URI")


  		




  268
  270
  
    
	@Field(index=org.hibernate.search.annotations.Index.UN_TOKENIZED)


  		




  269
  
  
    
	


  		




  270
  271
  
    
	@Type(type="uriUserType")


  		




  271
  272
  
    
	private URI uri;


  		




  272
  273
  
    
	


  		












  

    
      cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ReferenceValidationTest.java
    
  





  61
  61
  
    
 *


  		




  62
  62
  
    
 */


  		




  63
  63
  
    
@SuppressWarnings("unused")


  		




  64
  
  
    
//@Ignore //FIXME ignoring only for merging 8.6.2010 a.kohlbecker


  		




  
  64
  
    
@Ignore //FIXME ignoring only for merging 8.6.2010 a.kohlbecker


  		




  65
  65
  
    
public class ReferenceValidationTest  {


  		




  66
  66
  
    
	private static final Logger logger = Logger.getLogger(ReferenceValidationTest.class);


  		




  67
  67
  
    
	


  		




  ......




  97
  97
  
    
		book.setIsbn("1-919795-99-5");


  		




  98
  98
  
    
        Set<ConstraintViolation<IBook>> constraintViolations  = validator.validate(book, Level2.class);


  		




  99
  99
  
    
        assertTrue("There should be no constraint violations as this book is valid at level 2",constraintViolations.isEmpty());


  		




  
  100
  
    
        


  		




  
  101
  
    
	


  		




  
  102
  
    
        


  		




  100
  103
  
    
	}


  		




  101
  104
  
    
	


  		




  102
  105
  
    
	@Test


  		




  ......




  117
  120
  
    
        assertTrue("There should be no constraint violations as this book is valid at level 2",constraintViolations.isEmpty());


  		




  118
  121
  
    
	}


  		




  119
  122
  
    
	


  		




  120
  
  
    
	/*@Test


  		




  121
  
  
    
	public final void testLevel2ValidationWithInValidUri() {


  		




  122
  
  
    
		try {


  		




  123
  
  
    
			book.setUri(new URI("http://java-tutor.com/index.html"));


  		




  124
  
  
    
		} catch (URISyntaxException e) {


  		




  125
  
  
    
			Assert.fail("URI is not valid");	


  		




  126
  
  
    
		}


  		




  127
  
  
    
        Set<ConstraintViolation<IBook>> constraintViolations  = validator.validate(book, Level2.class);


  		




  128
  
  
    
        assertTrue("There should be a constraint violation as this book has an invalid URI",constraintViolations.isEmpty());


  		




  129
  
  
    
	}


  		




  130
  
  
    
	*/


  		




  
  123
  
    
	


  		




  131
  124
  
    
	@Test


  		




  132
  125
  
    
	public final void testLevel2ValidationWithInValidInReference() {


  		




  133
  126
  
    
		


  		




  ......




  136
  129
  
    
		bookSection.setTitle("");


  		




  137
  130
  
    
		bookSection.setInReference((Reference)book);


  		




  138
  131
  
    
		Set<ConstraintViolation<IBookSection>> constraintViolations  = validator.validate(bookSection, Level2.class);


  		




  139
  
  
    
		//assertTrue("There should be no constraint violation as this book has a valid Ref",constraintViolations.isEmpty());


  		




  140
  
  
    
		System.err.println("nr of violations " + constraintViolations.size() );


  		




  141
  
  
    
        for (ConstraintViolation conViol: constraintViolations){


  		




  142
  
  
    
        	System.err.println(conViol.getMessage() + " - "+conViol.getPropertyPath() + " - " + conViol.getInvalidValue());


  		




  143
  
  
    
        }


  		




  
  132
  
    
		assertTrue("There should be one constraint violation as this book has a valid Ref",constraintViolations.size() == 1);


  		




  
  133
  
    
		


  		




  144
  134
  
    
        Reference article = ReferenceFactory.newArticle();


  		




  145
  135
  
    
        article.setTitleCache("article");


  		




  146
  136
  
    
		bookSection.setInReference(ReferenceFactory.newArticle());


  		




  147
  137
  
    
        constraintViolations  = validator.validate(bookSection, Level2.class);


  		




  148
  
  
    
        assertFalse("There should be a constraint violation as this book has an invalid inReference",constraintViolations.isEmpty());


  		




  149
  
  
    
        System.err.println("nr of violations " + constraintViolations.size() );


  		




  150
  
  
    
        for (ConstraintViolation conViol: constraintViolations){


  		




  151
  
  
    
        	System.err.println(conViol.getMessage() + " - "+conViol.getPropertyPath() + " - " + conViol.getInvalidValue());


  		




  152
  
  
    
        }


  		




  
  138
  
    
        assertTrue("There should be a constraint violation as this book has an invalid inReference",constraintViolations.size() == 2);


  		




  
  139
  
    
        


  		




  
  140
  
    
        


  		




  153
  141
  
    
        


  		




  154
  142
  
    
	}


  		




  155
  
  
    
	


  		




  
  143
  
    
	/*


  		




  
  144
  
    
	public final void testValidationAfterCasting(){


  		




  
  145
  
    
		((Reference)book).castReferenceToArticle();


  		




  
  146
  
    
		Set<ConstraintViolation<IBookSection>> constraintViolations  = validator.validate(book, Level2.class);


  		




  
  147
  
    
        assertFalse("There should be one constraint violations as this article is not valid at level 2 (has an isbn)",constraintViolations.isEmpty());


  		




  
  148
  
    
	}


  		




  
  149
  
    
	*/


  		




  156
  150
  
    
}


  		












Also available in:  Unified diff