Project

General

Profile

« Previous | Next » 

Revision 64c991e6

Added by Andreas Müller over 2 years ago

add javadoc and cleanup

View differences:

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/DefinedTermDaoImpl.java
633 633
        while (it.hasNext()){
634 634
            S a = it.next();
635 635
            if (a != last){
636
                //AM: why is this necessary?
636 637
                if (!result.contains(a)){
637 638
                    result.add(a);
638 639
                }
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeFilterDaoHibernateImplTest.java
10 10
import java.util.List;
11 11
import java.util.UUID;
12 12

  
13
import org.joda.time.DateTime;
14 13
import org.junit.Assert;
15 14
import org.junit.Before;
16 15
import org.junit.Test;
......
214 213
        NamedArea africa = HibernateProxyHelper.deproxy(termDao.load(africaUuid), NamedArea.class);
215 214
        NamedArea germany = HibernateProxyHelper.deproxy(termDao.load(germanyUuid), NamedArea.class);
216 215

  
217
//        System.out.println("filter1:" + new DateTime().toString());
218 216
        TaxonNodeFilter filter = new TaxonNodeFilter(europe);
219 217
        List<UUID> listUuid = filterDao.listUuids(filter);
220
        System.out.println("assert:" + new DateTime().toString());
221 218

  
222 219
        assertEquals(message, 3, listUuid.size());
223 220
        Assert.assertTrue(listUuid.contains(node1.getUuid()));
......
225 222
        Assert.assertTrue(listUuid.contains(node3.getUuid()));
226 223
        Assert.assertFalse(listUuid.contains(node4.getUuid())); //status is absent
227 224

  
228
//        System.out.println("filter2:" + new DateTime().toString());
229 225
        filter = new TaxonNodeFilter(germany);
230 226
        listUuid = filterDao.listUuids(filter);
231 227
        assertEquals(message, 1, listUuid.size());
232 228
        Assert.assertTrue(listUuid.contains(node3.getUuid()));
233 229

  
234
//        System.out.println("filter3:" + new DateTime().toString());
235 230
        filter = new TaxonNodeFilter(middleEurope);
236 231
        listUuid = filterDao.listUuids(filter);
237 232
        assertEquals(message, 1, listUuid.size());
238 233
        Assert.assertTrue(listUuid.contains(node3.getUuid()));
239 234

  
240
//        System.out.println("filter4:" + new DateTime().toString());
241 235
        filter = new TaxonNodeFilter(africa);
242 236
        listUuid = filterDao.listUuids(filter);
243 237
        assertEquals(message, 0, listUuid.size());
244 238

  
245
//        System.out.println("end:" + new DateTime().toString());
246

  
247 239
    }
248 240

  
249 241
    @Test
......
354 346
        listUuid = filterDao.listUuids(filter);
355 347
        Assert.assertEquals("All 6 children including unpublished should be returned", 6, listUuid.size());
356 348

  
357

  
358 349
        filter.setIncludeRootNodes(true);
359 350
        listUuid = filterDao.listUuids(filter);
360 351
        Assert.assertEquals("All 7 children including root node should be returned", 7, listUuid.size());
361

  
362 352
    }
363 353

  
364 354
    @Test
cdmlib-test/src/main/java/eu/etaxonomy/cdm/test/integration/CdmIntegrationTest.java
133 133
        return connection;
134 134
    }
135 135

  
136
//  @SpringBeanByType
137
//  private IAgentDao agentDao;
138
//
139
//  @Before
140
//  public void debugExistingUsers(){
141
//      StringBuilder agentstr = new StringBuilder();
142
//      for(AgentBase agent : agentDao.list(null, null)) {
143
//          agentstr.append(agent.getId()).append(", ");
144
//      }
145
//      System.err.println("####" +  agentstr);
146
//  }
147

  
148 136
    /**
149 137
     * How to use:
150 138
     * <ol>

Also available in: Unified diff