Project

General

Profile

« Previous | Next » 

Revision 034d3d7a

Added by Cherian Mathew over 8 years ago

testing fixes :

  • removed unnecessary config files
  • moved h2 test db to test resources folder
  • cleaned up unitils properties file
  • reverted applicationContext to use persistentTermInitializer

View differences:

src/test/resources/webapp/WEB-INF/applicationContext.xml
22 22 

  		




  23
  23
  
    
    <bean id="dataSource" class="org.unitils.database.UnitilsDataSourceFactoryBean"/>


  		




  24
  24
  
    

  		




  25
  
  
    
    <!--


  		




  26
  
  
    
        use TestingTermInitializer


  		




  27
  
  
    
     -->


  		




  28
  
  
    
    <bean id="testingTermInitializer" class="eu.etaxonomy.cdm.database.TestingTermInitializer">


  		




  29
  
  
    
        <property name="termsDataSet" value="classpath:/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml"/>


  		




  30
  
  
    
        <property name="termsDtd" value="classpath:/eu/etaxonomy/cdm/persistence/dao/hibernate/dataset.dtd"/>


  		




  31
  
  
    
        <property name="omit" value="false"/>


  		




  32
  
  
    
    </bean>


  		




  33
  25
  
    
    <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">


  		




  34
  
  
    
        <property name="omit" value="true"/>


  		




  
  26
  
    
        <property name="omit" value="false"/>


  		




  35
  27
  
    
    </bean>


  		




  36
  28
  
    

  		




  37
  29
  
    
    <bean id="hibernateProperties"


  		




  ......




  41
  33
  
    
                <prop key="hibernate.cache.region.factory_class">org.hibernate.cache.internal.NoCachingRegionFactory</prop>


  		




  42
  34
  
    
                <prop key="hibernate.show_sql">false</prop>


  		




  43
  35
  
    
                <prop key="hibernate.format_sql">false</prop>


  		




  44
  
  
    
                <prop key="hibernate.search.default.directory_provider">org.hibernate.search.store.impl.FSDirectoryProvider</prop>


  		




  45
  
  
    
                <!-- TODO trying to use a managed session context


  		




  46
  
  
    
                <prop key="hibernate.current_session_context_class">managed</prop>


  		




  47
  
  
    
                -->


  		




  48
  
  
    
<!--                 temp for h4 migration testing -->


  		




  49
  
  
    
<!--                 <prop key="hibernate.connection.driver_class">org.h2.Driver</prop> -->


  		




  50
  
  
    
<!--                 <prop key="hibernate.connection.url">jdbc:h2:mem:cdm</prop> -->


  		




  51
  
  
    
<!--                 <prop key="hibernate.connection.username">sa</prop> -->


  		




  52
  
  
    
<!--                 <prop key="hibernate.connection.password"></prop> -->


  		




  53
  
  
    
<!--                 <prop key="hibernate.search.lucene_version">LUCENE_36</prop> -->


  		




  54
  
  
    
<!--                 end temp for h4 migration testing -->


  		




  55
  
  
    
                <prop key="hibernate.search.default.indexBase">./target/index</prop>


  		




  56
  
  
    
                <!--  hibernate.search.default.exclusive_index_use=false


  		




  57
  
  
    
                      locks must not only be released after application shutdown in test environment -->


  		




  58
  
  
    
                <prop key="hibernate.search.default.exclusive_index_use">false</prop>


  		




  59
  
  
    
                <!-- hsqldb v. <1.9 has a bug (http://sourceforge.net/tracker/?func=detail&atid=378131&aid=1407528&group_id=23316)


  		




  60
  
  
    
                    due to which it is not possible to use batch updates, so we need to disable


  		




  61
  
  
    
                    hibernate batching when using hsqldb in the app context: -->


  		




  
  36
  
    
                <prop key="hibernate.search.autoregister_listeners">false</prop>


  		




  62
  37
  
    
                <prop key="hibernate.jdbc.batch_size">0</prop>


  		




  63
  38
  
    
            </props>


  		




  64
  39
  
    
        </property>


  		












Also available in:  Unified diff