Skip to content
Browse files

HHH-7569 Correct multiple failures/issues in

hibernate-core-master-matrix CI job
  • Loading branch information...
1 parent 86deac4 commit f63b0c5f69b5b8281b897f544aff91f56ea6621a brmeyer committed Sep 6, 2012
View
2 hibernate-core/src/test/java/org/hibernate/test/tm/TransactionTimeoutTest.java
@@ -79,7 +79,7 @@ public void testTransactionTimeoutFailure() throws InterruptedException {
public void testTransactionTimeoutSuccess() {
Session session = openSession();
Transaction transaction = session.getTransaction();
- transaction.setTimeout( 2 );
+ transaction.setTimeout( 5 );
transaction.begin();
session.persist( new Person( "Lukasz", "Antoniak" ) );
transaction.commit();
View
2 hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/packaging/JarVisitorTest.java
@@ -226,6 +226,8 @@ public void testExplodedJar() throws Exception {
@Test
@TestForIssue(jiraKey = "HHH-6806")
public void testJarVisitorFactory() throws Exception{
+
+ addPackageToClasspath( buildExplodedPar(), buildDefaultPar() );
//setting URL to accept vfs based protocol
URL.setURLStreamHandlerFactory(new URLStreamHandlerFactory() {
View
11 ...rnate-entitymanager/src/test/java/org/hibernate/jpa/test/packaging/PackagingTestCase.java
@@ -84,8 +84,15 @@
URL myUrl = originalClassLoader.getResource(
PackagingTestCase.class.getName().replace( '.', '/' ) + ".class"
);
- // this is assuming that there is a target directory
- int index = myUrl.getFile().lastIndexOf( "target" );
+ int index;
+ if (myUrl.getFile().contains( "target" )) {
+ // assume there's normally a /target
+ index = myUrl.getFile().lastIndexOf( "target" );
+ } else {
+ // if running in some IDEs, may be in /bin instead
+ index = myUrl.getFile().lastIndexOf( "bin" );
+ }
+
if ( index == -1 ) {
fail( "Unable to setup packaging test" );
}

0 comments on commit f63b0c5

Please sign in to comment.
Something went wrong with that request. Please try again.