Project

General

Profile

« Previous | Next » 

Revision 892efc69

Added by Andreas Kohlbecker almost 14 years ago

merging /branches/cdmlib/SPRINT-Chichorieae1/ to trunk

View differences:

cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.java
47 47
48 48 
	private UUID uuid1;
49 49 
	private UUID uuid2;
50 
	private UUID uuid3;
50 51
51 52 
	@Before
52 53 
	public void setUp(){
53 
		uuid1 = UUID.fromString("0b5846e5-b8d2-4ca9-ac51-099286ea4adc");
54 
		uuid1 = UUID.fromString("20c8f083-5870-4cbd-bf56-c5b2b98ab6a7");
54 55 
		uuid2 = UUID.fromString("770239f6-4fa8-496b-8738-fe8f7b2ad519");
55 56 
		AuditEventContextHolder.clearContext();
56 57 
	}
......
88 89 
		TaxonNode taxNode2 = (TaxonNode) taxonNodeDao.findByUuid(uuid2);
89 90 
		Set<TaxonNode> rootNodes = new HashSet<TaxonNode>();
90 91
91 
		rootNodes.add(taxNode2);
92 
		rootNodes.add(taxNode);
93
94
92 95 
		for (TaxonNode rootNode : rootNodes){
93 96 
			taxonTree.addChildNode(rootNode, rootNode.getReference(), rootNode.getMicroReference(), rootNode.getSynonymToBeUsed());
94 97 
		}
98
99 
		//taxonTree.addChildNode(taxNode, taxNode.getReference(), taxNode.getMicroReference(), taxNode.getSynonymToBeUsed());
100
95 101 
		//old: taxonTree.setRootNodes(rootNodes);
96 102 
		taxNode.addChildNode(taxNode2, null, null,null);
97 103
......
108 114 
		taxa = taxonDao.getAllTaxonBases(10, 0);
109 115 
		assertEquals("there should be only one taxon left", 4, taxa.size());
110 116
117 
		taxonomicTreeDao.delete(taxonTree);
118 
		taxonTree = taxonomicTreeDao.findByUuid(UUID.fromString("aeee7448-5298-4991-b724-8d5b75a0a7a9"));
119 
		assertEquals("The tree should be null", null, taxonTree);
120
121
111 122 
	}
112 123 
}

Also available in: Unified diff