inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed failing test

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3430 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2006-07-27 21:10:52 +00:00
parent 8d645825ba
commit 56af6dc0d9
1 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
source/java/org/alfresco/repo/descriptor/DescriptorServiceTest.java
View File

@@ -72,11 +72,9 @@ public class DescriptorServiceTest extends BaseSpringTest
String minor = serverDescriptor.getVersionMinor(); String minor = serverDescriptor.getVersionMinor();
String revision = serverDescriptor.getVersionRevision(); String revision = serverDescriptor.getVersionRevision();
String label = serverDescriptor.getVersionLabel(); String label = serverDescriptor.getVersionLabel();
String build = serverDescriptor.getVersionBuild();
String version = major + "." + minor + "." + revision; String version = major + "." + minor + "." + revision;
if (label != null && label.length() > 0) version = buildVersionString(version, label, build);
{
version += " (" + label + ")";
}
assertEquals(version, serverDescriptor.getVersion()); assertEquals(version, serverDescriptor.getVersion());
@@ -94,11 +92,9 @@ public class DescriptorServiceTest extends BaseSpringTest
String minor = repoDescriptor.getVersionMinor(); String minor = repoDescriptor.getVersionMinor();
String revision = repoDescriptor.getVersionRevision(); String revision = repoDescriptor.getVersionRevision();
String label = repoDescriptor.getVersionLabel(); String label = repoDescriptor.getVersionLabel();
String build = repoDescriptor.getVersionBuild();
String version = major + "." + minor + "." + revision; String version = major + "." + minor + "." + revision;
if (label != null && label.length() > 0) version = buildVersionString(version, label, build);
{
version += " (" + label + ")";
}
assertEquals(version, repoDescriptor.getVersion()); assertEquals(version, repoDescriptor.getVersion());
@@ -106,4 +102,43 @@ public class DescriptorServiceTest extends BaseSpringTest
assertTrue("Repository schema version must be greater than -1", schemaVersion > -1); assertTrue("Repository schema version must be greater than -1", schemaVersion > -1);
} }
private String buildVersionString(String version, String label, String build)
{
StringBuilder builder = new StringBuilder(version);
boolean hasLabel = (label != null && label.length() > 0);
boolean hasBuild = (build != null && build.length() > 0);
// add opening bracket if either a label or build number is present
if (hasLabel || hasBuild)
{
builder.append(" (");
}
// add label if present
if (hasLabel)
{
builder.append(label);
}
// add build number is present
if (hasBuild)
{
// if there is also a label we need a separating space
if (hasLabel)
{
builder.append(" ");
}
builder.append(build);
}
// add closing bracket if either a label or build number is present
if (hasLabel || hasBuild)
{
builder.append(")");
}
return builder.toString();
}
} }