Menu
▾
▴
[Hibernate-commits] Hibernate Code SVN: r9587 - in trunk/Hibernate3/test/org/hibernate/test: cache cache/treecache/optimistic instrument/domain instrument/runtime legacy proxy querycache
Author: ste...@jb...
Date: 2006-03-09 16:38:26 -0500 (Thu, 09 Mar 2006)
New Revision: 9587
Removed:
trunk/Hibernate3/test/org/hibernate/test/instrument/runtime/CGLIBTest.java
trunk/Hibernate3/test/org/hibernate/test/querycache/Part.java
Modified:
trunk/Hibernate3/test/org/hibernate/test/cache/BaseCacheProviderTestCase.java
trunk/Hibernate3/test/org/hibernate/test/cache/treecache/optimistic/OptimisticTreeCacheTest.java
trunk/Hibernate3/test/org/hibernate/test/instrument/domain/Documents.hbm.xml
trunk/Hibernate3/test/org/hibernate/test/legacy/MultiTableTest.java
trunk/Hibernate3/test/org/hibernate/test/legacy/ParentChildTest.java
trunk/Hibernate3/test/org/hibernate/test/proxy/ProxyTest.java
trunk/Hibernate3/test/org/hibernate/test/querycache/Item.hbm.xml
trunk/Hibernate3/test/org/hibernate/test/querycache/Item.java
trunk/Hibernate3/test/org/hibernate/test/querycache/QueryCacheTest.java
Log:
test suite cleanup; prep for joinTransaction() work
Modified: trunk/Hibernate3/test/org/hibernate/test/cache/BaseCacheProviderTestCase.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/cache/BaseCacheProviderTestCase.java 2006-03-09 21:11:44 UTC (rev 9586)
+++ trunk/Hibernate3/test/org/hibernate/test/cache/BaseCacheProviderTestCase.java 2006-03-09 21:38:26 UTC (rev 9587)
@@ -196,8 +196,4 @@
s.close();
}
-
- protected SessionFactoryImplementor sfi() {
- return ( SessionFactoryImplementor ) getSessions();
- }
}
Modified: trunk/Hibernate3/test/org/hibernate/test/cache/treecache/optimistic/OptimisticTreeCacheTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/cache/treecache/optimistic/OptimisticTreeCacheTest.java 2006-03-09 21:11:44 UTC (rev 9586)
+++ trunk/Hibernate3/test/org/hibernate/test/cache/treecache/optimistic/OptimisticTreeCacheTest.java 2006-03-09 21:38:26 UTC (rev 9587)
@@ -108,8 +108,4 @@
return option;
}
}
-
- public SessionFactoryImplementor sfi() {
- return ( SessionFactoryImplementor ) getSessions();
- }
}
Modified: trunk/Hibernate3/test/org/hibernate/test/instrument/domain/Documents.hbm.xml
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/instrument/domain/Documents.hbm.xml 2006-03-09 21:11:44 UTC (rev 9586)
+++ trunk/Hibernate3/test/org/hibernate/test/instrument/domain/Documents.hbm.xml 2006-03-09 21:38:26 UTC (rev 9587)
@@ -57,7 +57,7 @@
<property name="name" not-null="true" length="50"/>
<property name="upperCaseName" formula="upper(name)" lazy="true"/>
<property name="summary" not-null="true" length="200" lazy="true"/>
- <many-to-one name="folder" not-null="true" lazy="no-proxy"/>
+ <many-to-one name="folder" not-null="true" lazy="true"/>
<many-to-one name="owner" not-null="true" lazy="no-proxy" fetch="select"/>
<property name="text" not-null="true" length="2000" lazy="true"/>
<property name="lastTextModification" not-null="true" lazy="true" access="field"/>
Deleted: trunk/Hibernate3/test/org/hibernate/test/instrument/runtime/CGLIBTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/instrument/runtime/CGLIBTest.java 2006-03-09 21:11:44 UTC (rev 9586)
+++ trunk/Hibernate3/test/org/hibernate/test/instrument/runtime/CGLIBTest.java 2006-03-09 21:38:26 UTC (rev 9587)
@@ -1,13 +0,0 @@
-package org.hibernate.test.instrument.runtime;
-
-import org.hibernate.bytecode.BytecodeProvider;
-import org.hibernate.bytecode.cglib.BytecodeProviderImpl;
-
-/**
- * @author Steve Ebersole
- */
-public class CGLIBTest extends AbstractTransformingClassLoaderInstrumentTestCase {
- protected BytecodeProvider buildBytecodeProvider() {
- return new BytecodeProviderImpl();
- }
-}
Modified: trunk/Hibernate3/test/org/hibernate/test/legacy/MultiTableTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/legacy/MultiTableTest.java 2006-03-09 21:11:44 UTC (rev 9586)
+++ trunk/Hibernate3/test/org/hibernate/test/legacy/MultiTableTest.java 2006-03-09 21:38:26 UTC (rev 9587)
@@ -31,6 +31,7 @@
public void testCriteria() throws Exception {
Session s = openSession();
+ Transaction t = s.beginTransaction();
Lower l = new Lower();
s.save(l);
assertTrue( l==s.createCriteria(Top.class).uniqueResult() );
@@ -42,7 +43,7 @@
.createCriteria("another");
c.createCriteria("another").add( Expression.isNotNull("id") );
c.list();
- s.connection().commit();
+ t.commit();
s.close();
}
Modified: trunk/Hibernate3/test/org/hibernate/test/legacy/ParentChildTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/legacy/ParentChildTest.java 2006-03-09 21:11:44 UTC (rev 9586)
+++ trunk/Hibernate3/test/org/hibernate/test/legacy/ParentChildTest.java 2006-03-09 21:38:26 UTC (rev 9587)
@@ -72,25 +72,25 @@
public void testQueryOneToOne() throws Exception {
Session s = openSession();
+ Transaction t = s.beginTransaction();
Serializable id = s.save( new Parent() );
assertTrue( s.find("from Parent p left join fetch p.child").size()==1 );
- s.flush();
- s.connection().commit();
+ t.commit();
s.close();
s = openSession();
+ t = s.beginTransaction();
Parent p = (Parent) s.createQuery("from Parent p left join fetch p.child").uniqueResult();
assertTrue( p.getChild()==null );
s.find("from Parent p join p.child c where c.x > 0");
s.find("from Child c join c.parent p where p.x > 0");
- s.flush();
- s.connection().commit();
+ t.commit();
s.close();
s = openSession();
+ t = s.beginTransaction();
s.delete( s.get(Parent.class, id) );
- s.flush();
- s.connection().commit();
+ t.commit();
s.close();
}
Modified: trunk/Hibernate3/test/org/hibernate/test/proxy/ProxyTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/proxy/ProxyTest.java 2006-03-09 21:11:44 UTC (rev 9586)
+++ trunk/Hibernate3/test/org/hibernate/test/proxy/ProxyTest.java 2006-03-09 21:38:26 UTC (rev 9587)
@@ -225,8 +225,8 @@
Session s = openSession();
Transaction t = s.beginTransaction();
Long lastContainerId = null;
- int containerCount = 200;
- int nestedDataPointCount = 50;
+ int containerCount = 10;
+ int nestedDataPointCount = 5;
for ( int c_indx = 0; c_indx < containerCount; c_indx++ ) {
Owner owner = new Owner( "Owner #" + c_indx );
Container container = new Container( "Container #" + c_indx );
@@ -267,22 +267,25 @@
assertFalse( Hibernate.isInitialized( proxy ) );
t.commit();
- int iterations = 50;
- long cumulativeTime = 0;
- long cumulativeSize = 0;
- for ( int i = 0; i < iterations; i++ ) {
- final long start = System.currentTimeMillis();
- byte[] bytes = SerializationHelper.serialize( s );
- SerializationHelper.deserialize( bytes );
- final long end = System.currentTimeMillis();
- cumulativeTime += ( end - start );
- int size = bytes.length;
- cumulativeSize += size;
-// System.out.println( "Iteration #" + i + " took " + ( end - start ) + " ms : size = " + size + " bytes" );
- }
- System.out.println( "Average time : " + ( cumulativeTime / iterations ) + " ms" );
- System.out.println( "Average size : " + ( cumulativeSize / iterations ) + " bytes" );
+// int iterations = 50;
+// long cumulativeTime = 0;
+// long cumulativeSize = 0;
+// for ( int i = 0; i < iterations; i++ ) {
+// final long start = System.currentTimeMillis();
+// byte[] bytes = SerializationHelper.serialize( s );
+// SerializationHelper.deserialize( bytes );
+// final long end = System.currentTimeMillis();
+// cumulativeTime += ( end - start );
+// int size = bytes.length;
+// cumulativeSize += size;
+//// System.out.println( "Iteration #" + i + " took " + ( end - start ) + " ms : size = " + size + " bytes" );
+// }
+// System.out.println( "Average time : " + ( cumulativeTime / iterations ) + " ms" );
+// System.out.println( "Average size : " + ( cumulativeSize / iterations ) + " bytes" );
+ byte[] bytes = SerializationHelper.serialize( s );
+ SerializationHelper.deserialize( bytes );
+
t = s.beginTransaction();
int count = s.createQuery( "delete DataPoint" ).executeUpdate();
assertEquals( "unexpected DP delete count", ( containerCount * nestedDataPointCount ), count );
Modified: trunk/Hibernate3/test/org/hibernate/test/querycache/Item.hbm.xml
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/querycache/Item.hbm.xml 2006-03-09 21:11:44 UTC (rev 9586)
+++ trunk/Hibernate3/test/org/hibernate/test/querycache/Item.hbm.xml 2006-03-09 21:38:26 UTC (rev 9587)
@@ -12,17 +12,6 @@
</id>
<property name="name" not-null="true"/>
<property name="description" not-null="true"/>
- <set name="parts" inverse="false" cascade="save-update" table="ITEM_PARTS" fetch="select">
- <key column="ITEM_ID"/>
- <many-to-many class="Part" column="PART_ID"/>
- </set>
</class>
- <class name="Part" table="Parts">
- <id name="id">
- <generator class="native"/>
- </id>
- <property name="name"/>
- </class>
-
</hibernate-mapping>
Modified: trunk/Hibernate3/test/org/hibernate/test/querycache/Item.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/querycache/Item.java 2006-03-09 21:11:44 UTC (rev 9586)
+++ trunk/Hibernate3/test/org/hibernate/test/querycache/Item.java 2006-03-09 21:38:26 UTC (rev 9587)
@@ -12,7 +12,6 @@
private long id;
private String name;
private String description;
- private Set parts = new HashSet();
public String getDescription() {
return description;
@@ -32,12 +31,4 @@
public void setName(String name) {
this.name = name;
}
-
- public Set getParts() {
- return parts;
- }
-
- public void setParts(Set parts) {
- this.parts = parts;
- }
}
Deleted: trunk/Hibernate3/test/org/hibernate/test/querycache/Part.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/querycache/Part.java 2006-03-09 21:11:44 UTC (rev 9586)
+++ trunk/Hibernate3/test/org/hibernate/test/querycache/Part.java 2006-03-09 21:38:26 UTC (rev 9587)
@@ -1,25 +0,0 @@
-package org.hibernate.test.querycache;
-
-/**
- * @author Steve Ebersole
- */
-public class Part {
- private Long id;
- private String name;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-}
Modified: trunk/Hibernate3/test/org/hibernate/test/querycache/QueryCacheTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/querycache/QueryCacheTest.java 2006-03-09 21:11:44 UTC (rev 9586)
+++ trunk/Hibernate3/test/org/hibernate/test/querycache/QueryCacheTest.java 2006-03-09 21:38:26 UTC (rev 9587)
@@ -234,77 +234,6 @@
}
- public void testCollectionFetchCachingFailureExpected() throws Throwable {
- getSessions().evictQueries();
- getSessions().getStatistics().clear();
-
- final String queryString = "select distinct i from Item i join fetch i.parts";
-
- Session s = openSession();
- Transaction t = s.beginTransaction();
- Item i = new Item();
- i.setName( "widget" );
- i.setDescription( "A really top-quality, full-featured widget." );
- Part p1 = new Part();
- p1.setName( "p1-1" );
- i.getParts().add( p1 );
- Part p2 = new Part();
- p2.setName( "part-2" );
- i.getParts().add( p2 );
- s.save( i );
- t.commit();
- s.close();
-
- getSessions().evict( Item.class );
-
- QueryStatistics qs = getSessions().getStatistics().getQueryStatistics( queryString );
- EntityStatistics es = getSessions().getStatistics().getEntityStatistics( Item.class.getName() );
- CollectionStatistics cs = getSessions().getStatistics().getCollectionStatistics( Item.class.getName() + ".parts" );
-
- Thread.sleep(200);
-
- s = openSession();
- t = s.beginTransaction();
- List result = s.createQuery( queryString ).setCacheable( true ).list();
- assertEquals( result.size(), 1 );
- i = ( Item ) result.get( 0 );
- assertTrue( Hibernate.isInitialized( i ) );
- assertTrue( Hibernate.isInitialized( i.getParts() ) );
- t.commit();
- s.close();
-
- assertEquals( qs.getCacheHitCount(), 0 );
- assertEquals( getSessions().getStatistics().getEntityFetchCount(), 0 );
- assertEquals( getSessions().getStatistics().getCollectionFetchCount(), 0 );
-
- s = openSession();
- t = s.beginTransaction();
- result = s.createQuery( queryString ).setCacheable( true ).list();
- assertEquals( result.size(), 1 );
- i = ( Item ) result.get( 0 );
- assertTrue( Hibernate.isInitialized( i ) );
- // todo : this is the bug causing the failure expected (HHH-1543).
- // when the query results are served from the query cache,
- // collections are not forced to initialize
- assertTrue( Hibernate.isInitialized( i.getParts() ) );
- t.commit();
- s.close();
-
- assertEquals( qs.getCacheHitCount(), 1 );
- assertEquals( getSessions().getStatistics().getEntityFetchCount(), 0 );
- assertEquals( getSessions().getStatistics().getCollectionFetchCount(), 0 );
- assertEquals( es.getFetchCount(), 0 );
- assertEquals( cs.getFetchCount(), 0 );
-
- s = openSession();
- t = s.beginTransaction();
- s.delete( i );
- s.flush();
- s.createQuery("delete Part").executeUpdate();
- t.commit();
- s.close();
- }
-
protected String[] getMappings() {
return new String[] { "querycache/Item.hbm.xml" };
}
|
