Author: skabashnyuk
Date: 2009-10-05 08:22:02 -0400 (Mon, 05 Oct 2009)
New Revision: 224
Modified:
jcr/trunk/component/core/src/test/java/conf/standalone/test-jcr-config-sjdbc.xml
jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/api/nodetypes/TestValueConstraints.java
Log:
EXOJCR-161 : Merge test configuration. Revert changes in tests.
Modified:
jcr/trunk/component/core/src/test/java/conf/standalone/test-jcr-config-sjdbc.xml
===================================================================
---
jcr/trunk/component/core/src/test/java/conf/standalone/test-jcr-config-sjdbc.xml 2009-10-05
12:20:44 UTC (rev 223)
+++
jcr/trunk/component/core/src/test/java/conf/standalone/test-jcr-config-sjdbc.xml 2009-10-05
12:22:02 UTC (rev 224)
@@ -62,13 +62,7 @@
<query-handler
class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
<properties>
<property name="index-dir"
value="target/temp/index/db1/ws" />
- <property name="synonymprovider-class"
value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider"
/>
- <property name="synonymprovider-config-path"
value="../../synonyms.properties" />
- <property name="support-highlighting"
value="true" />
- <property name="indexing-configuration-path"
value="../../indexing-configuration.xml" />
- <property name="query-class"
value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
- <property name="spellchecker-class"
value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval"
/>
- </properties>
+ </properties>
</query-handler>
<lock-manager>
<time-out>15m</time-out>
@@ -283,6 +277,7 @@
<property name="support-highlighting"
value="true" />
<property name="indexing-configuration-path"
value="../../indexing-configuration.xml" />
<property name="query-class"
value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
+ <property name="excerptprovider-class"
value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt"
/>
<property name="spellchecker-class"
value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval"
/>
</properties>
</query-handler>
@@ -379,13 +374,16 @@
</cache>
<query-handler
class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
<properties>
- <property name="index-dir"
value="target/temp/index/db1/ws2tck" />
+ <property name="index-dir"
value="target/temp/index/db1tck/ws2" />
<property name="synonymprovider-class"
value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider"
/>
<property name="synonymprovider-config-path"
value="../../synonyms.properties" />
<property name="support-highlighting"
value="true" />
<property name="indexing-configuration-path"
value="../../indexing-configuration.xml" />
<property name="query-class"
value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
<property name="spellchecker-class"
value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval"
/>
+ <property name="excerptprovider-class"
value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt"/>
+ <property name="extractorPoolSize"
value="2"/>
+ <property name="extractorTimeout"
value="10"/>
</properties>
</query-handler>
</workspace>
Modified:
jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/api/nodetypes/TestValueConstraints.java
===================================================================
---
jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/api/nodetypes/TestValueConstraints.java 2009-10-05
12:20:44 UTC (rev 223)
+++
jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/api/nodetypes/TestValueConstraints.java 2009-10-05
12:22:02 UTC (rev 224)
@@ -31,7 +31,6 @@
import javax.jcr.Property;
import javax.jcr.PropertyType;
import javax.jcr.Value;
-import javax.jcr.nodetype.ConstraintViolationException;
/**
* Created by The eXo Platform SAS.
@@ -319,12 +318,11 @@
try
{
testProperty.setValue(false);
- session.save();
- fail();
+ root.save();
}
- catch (ConstraintViolationException e)
+ catch (Exception e)
{
- // ok
+ fail("setValue(BOOLEAN value) here should be no Exception ");
}
}
Show replies by date