[hibernate-commits] Hibernate SVN: r20177 - in search/trunk/hibernate-search/src: test/java/org/hibernate/search/test/jmx and 1 other directory.

Author: hardy.ferentschik Date: 2010-08-19 07:46:54 -0400 (Thu, 19 Aug 2010) New Revision: 20177 Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/event/FullTextIndexEventListener.java search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/ConfigInfoMBeanTest.java search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/IndexCtrlMBeanTest.java Log: HSEARCH-278 Fixed tests after adding more attributes Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/event/FullTextIndexEventListener.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/event/FullTextIndexEventListener.java 2010-08-19 11:45:48 UTC (rev 20176) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/event/FullTextIndexEventListener.java 2010-08-19 11:46:54 UTC (rev 20177) @@ -146,7 +146,8 @@ else if ( "manual".equals( indexingStrategy ) ) { used = false; } - log.debug( "Hibernate Search event listeners mode " + (used ? "activated" : "desactivated") ); + + log.debug( "Hibernate Search event listeners " + (used ? "activated" : "deactivated") ); } public SearchFactoryImplementor getSearchFactoryImplementor() { Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/ConfigInfoMBeanTest.java =================================================================== --- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/ConfigInfoMBeanTest.java 2010-08-19 11:45:48 UTC (rev 20176) +++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/ConfigInfoMBeanTest.java 2010-08-19 11:46:54 UTC (rev 20177) @@ -60,10 +60,11 @@ public void testAttributesAndOperations() throws Exception { MBeanInfo info = mbeanServer.getMBeanInfo( configBeanObjectName ); MBeanAttributeInfo[] attributes = info.getAttributes(); - assertEquals( "Wrong number of attributes", 2, attributes.length ); + assertEquals( "Wrong number of attributes", 3, attributes.length ); Set<String> attributeNames = new HashSet<String>(); attributeNames.add( "IndexedClassNames" ); attributeNames.add( "IndexingStrategy" ); + attributeNames.add( "SearchVersion" ); for ( MBeanAttributeInfo attribute : attributes ) { assertTrue( attributeNames.contains( attribute.getName() ) ); } Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/IndexCtrlMBeanTest.java =================================================================== --- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/IndexCtrlMBeanTest.java 2010-08-19 11:45:48 UTC (rev 20176) +++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jmx/IndexCtrlMBeanTest.java 2010-08-19 11:46:54 UTC (rev 20177) @@ -63,13 +63,21 @@ public void testAttributesAndOperations() throws Exception { MBeanInfo info = mbeanServer.getMBeanInfo( indexBeanObjectName ); MBeanAttributeInfo[] attributes = info.getAttributes(); - assertEquals( "Wrong number of attributes", 0, attributes.length ); + assertEquals( "Wrong number of attributes", 3, attributes.length ); + Set<String> attributeNames = new HashSet<String>(); + attributeNames.add( "NumberOfObjectLoadingThreads" ); + attributeNames.add( "NumberOfFetchingThreads" ); + attributeNames.add( "BatchSize" ); + for ( MBeanAttributeInfo attribute : attributes ) { + assertTrue( attributeNames.contains( attribute.getName() ) ); + } MBeanOperationInfo[] operations = info.getOperations(); - assertEquals( "Wrong number of operations", 2, operations.length ); + assertEquals( "Wrong number of operations", 3, operations.length ); Set<String> operationNames = new HashSet<String>(); operationNames.add( "index" ); operationNames.add( "purge" ); + operationNames.add( "optimize" ); for ( MBeanOperationInfo operation : operations ) { assertTrue( operationNames.contains( operation.getName() ) ); }