My favorites | Sign in
Project Home Downloads Wiki Issues Source
READ-ONLY: This project has been archived. For more information see this post.
Search
for
  Advanced search   Search tips   Subscriptions

Issue 11 attachment: pkgscanner.patch (2.0 KB)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
Index: src/test/java/org/twdata/pkgscanner/DefaultOsgiVersionConverterTest.java
===================================================================
--- src/test/java/org/twdata/pkgscanner/DefaultOsgiVersionConverterTest.java (revision 181)
+++ src/test/java/org/twdata/pkgscanner/DefaultOsgiVersionConverterTest.java (working copy)
@@ -58,6 +58,18 @@
assertEquals( "0.0.0.4aug2000r7_dev", osgiVersion );
}

+ public void testBlank()
+ {
+ assertEquals("0.0.0", maven2Osgi.getVersion(""));
+ }
+
+ public void testBlankComponents()
+ {
+ assertEquals("0.0.0", maven2Osgi.getVersion(".."));
+ assertEquals("0.5.0", maven2Osgi.getVersion(".5."));
+ assertEquals("0.0.0", maven2Osgi.getVersion("..."));
+ }
+
/*
public void testPerformance() throws Exception
{
Index: src/main/java/org/twdata/pkgscanner/DefaultOsgiVersionConverter.java
===================================================================
--- src/main/java/org/twdata/pkgscanner/DefaultOsgiVersionConverter.java (revision 181)
+++ src/main/java/org/twdata/pkgscanner/DefaultOsgiVersionConverter.java (working copy)
@@ -110,16 +110,21 @@
private String getVersion( String major, String minor, String service, String qualifier )
{
StringBuffer sb = new StringBuffer();
- sb.append( major != null ? major : "0" );
+ sb.append( isBlank(major) ? "0" : major );
sb.append( '.' );
- sb.append( minor != null ? minor : "0" );
+ sb.append( isBlank(minor) ? "0" : minor );
sb.append( '.' );
- sb.append( service != null ? service : "0" );
- if ( qualifier != null )
+ sb.append( isBlank(service) ? "0" : service);
+ if (!isBlank(qualifier))
{
sb.append( '.' );
sb.append( qualifier );
}
return sb.toString();
}
+
+ private static boolean isBlank(String str)
+ {
+ return str == null || str.length() == 0;
+ }
}
Powered by Google Project Hosting