Skip to content

Commit

Permalink
fix the integration tests expectations
Browse files Browse the repository at this point in the history
@mkristian
mkristian committed Nov 16, 2015
1 parent 33831a9 commit 5a7bd3f
Showing 4 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions maven/jruby-complete/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "4.1.0";
expected = "4.1.2";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
@@ -23,7 +23,7 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "rdoc (4.1.0)";
expected = "rdoc (4.1.2)";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
@@ -65,7 +65,7 @@ if ( !file.exists() )
throw new RuntimeException( "file '" + file + "' does not exists" );
}

expected = "uri:classloader://META-INF/jruby.home";
expected = "uri:classloader:/META-INF/jruby.home";
if ( !log.contains( expected ) ) throw new RuntimeException( "log file does not contain '" + expected + "'" );

expected = "jruby home is a file: falsefalse";
12 changes: 6 additions & 6 deletions maven/jruby-dist/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -6,12 +6,12 @@ String log = FileUtils.fileRead( new File( basedir, "build.log" ) );
String expected = "rake (10.1.0)";
if ( !log.contains( expected ) )
{
throw new runtimeexception( "log file does not contain '" + expected + "'" );
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "4.1.0";
expected = "4.1.2";
if ( !log.contains( expected ) )
{
throw new runtimeexception( "log file does not contain '" + expected + "'" );
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "json (1.8.0 java)";
if ( !log.contains( expected ) )
@@ -23,12 +23,12 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "rdoc (4.1.0";
expected = "rdoc (4.1.2";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "gems count 12";
expected = "gems count 10";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
@@ -49,5 +49,5 @@ if ( !log.contains( expected ) )
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}

String unexpected = "uri:classloader://META-INF/jruby.home";
String unexpected = "uri:classloader:/META-INF/jruby.home";
if ( log.contains( unexpected ) ) throw new RuntimeException( "log file does contain unexpected '" + unexpected + "'" );
6 changes: 3 additions & 3 deletions maven/jruby-jars/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "4.1.0";
expected = "4.1.2";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
@@ -23,7 +23,7 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "rdoc (4.1.0)";
expected = "rdoc (4.1.2)";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
@@ -49,5 +49,5 @@ if ( !log.contains( expected ) )
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}

expected = "uri:classloader://META-INF/jruby.home";
expected = "uri:classloader:/META-INF/jruby.home";
if ( !log.contains( expected ) ) throw new RuntimeException( "log file does not contain '" + expected + "'" );
6 changes: 3 additions & 3 deletions maven/jruby/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "4.1.0";
expected = "4.1.2";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
@@ -23,7 +23,7 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "rdoc (4.1.0)";
expected = "rdoc (4.1.2)";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
@@ -67,5 +67,5 @@ if ( !log.contains( expected ) ) throw new RuntimeException( "log file does not
expected = "maven/jruby/target/it/integrity/target/classes/hello.rb";
if ( !log.contains( expected ) ) throw new RuntimeException( "log file does not contain '" + expected + "'" );

expected = "uri:classloader://META-INF/jruby.home";
expected = "uri:classloader:/META-INF/jruby.home";

This comment has been minimized.

Sign in to view

Copy link
@kares

kares Nov 22, 2015

Member

@mkristian going to revert the :/ part to :// as the adjustment: b4a29df fails these integration tests again - seems its not a good idea to rely on getPath as it always changes :// to :/ which seems surprising to me, or am I wrong here?
if ( !log.contains( expected ) ) throw new RuntimeException( "log file does not contain '" + expected + "'" );

2 comments on commit 5a7bd3f

@mkristian
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the thing here is that "uri:classloader://META-INF/jruby.home" is just treated as a filesystem path and normalizing means to replace "//" with "/"

so the problem is that sometimes you have "://" and sometimes you have not depending on the execution path and whether there was some normalization or canonicalization happening or not.

with the file protocol it even does change the meaning of the path as file://hostname/path is different from file:/hostname/path where hostname is just a directory.

@kares
Copy link
Member

@kares kares commented on 5a7bd3f Nov 23, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thought so, thanks. just wanted to make sure I do not break anything - build should be 💚 🍵

Please sign in to comment.