You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ja...@apache.org on 2008/11/08 22:53:37 UTC
svn commit: r712436 -
/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReleaseTest.java
Author: jalkanen
Date: Sat Nov 8 13:53:36 2008
New Revision: 712436
URL: http://svn.apache.org/viewvc?rev=712436&view=rev
Log:
Oops, didn't quite tolerate RELEASE being zero :)
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReleaseTest.java
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReleaseTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReleaseTest.java?rev=712436&r1=712435&r2=712436&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReleaseTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReleaseTest.java Sat Nov 8 13:53:36 2008
@@ -38,9 +38,17 @@
String rel = null;
if( Release.MINORREVISION != 0 )
- rel = Release.VERSION+"."+Release.REVISION+"."+(Release.MINORREVISION-1)+"-cvs";
+ {
+ rel = Release.VERSION+"."+Release.REVISION+"."+(Release.MINORREVISION-1)+"-svn";
+ }
+ else if( Release.REVISION != 0 )
+ {
+ rel = Release.VERSION+"."+(Release.REVISION-1)+".9999"+"-svn";
+ }
else
- rel = Release.VERSION+"."+(Release.REVISION-1)+".9999"+"-cvs";
+ {
+ rel = (Release.VERSION-1)+".9999.9999-svn";
+ }
assertTrue( Release.isNewerOrEqual(rel) );
}
@@ -92,8 +100,10 @@
if( Release.MINORREVISION != 0 )
rel = Release.VERSION+"."+Release.REVISION+"."+(Release.MINORREVISION-1)+"-cvs";
- else
+ else if( Release.REVISION != 0 )
rel = Release.VERSION+"."+(Release.REVISION-1)+".9999"+"-cvs";
+ else
+ rel = (Release.VERSION-1)+".9999.9999-svn";
assertFalse( Release.isOlderOrEqual(rel) );
}