mirror of
https://github.com/haraldk/TwelveMonkeys.git
synced 2025-08-04 20:15:28 -04:00
ProviderInfo now returns "Unspecified" for unknown packages without version info.
This commit is contained in:
parent
9c443f28e3
commit
67b985bc1d
@ -34,7 +34,7 @@ public class ProviderInfo {
|
|||||||
mVendorName = vendor != null ? vendor : fakeVendor(pPackage);
|
mVendorName = vendor != null ? vendor : fakeVendor(pPackage);
|
||||||
|
|
||||||
String version = pPackage.getImplementationVersion();
|
String version = pPackage.getImplementationVersion();
|
||||||
mVersion = version != null ? version : "DEV";
|
mVersion = version != null ? version : fakeVersion(pPackage);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String fakeVendor(final Package pPackage) {
|
private static String fakeVendor(final Package pPackage) {
|
||||||
@ -42,6 +42,11 @@ public class ProviderInfo {
|
|||||||
return name.startsWith("com.twelvemonkeys") ? "TwelveMonkeys" : name;
|
return name.startsWith("com.twelvemonkeys") ? "TwelveMonkeys" : name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String fakeVersion(Package pPackage) {
|
||||||
|
String name = pPackage.getName();
|
||||||
|
return name.startsWith("com.twelvemonkeys") ? "DEV" : "Unspecified";
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the vendor name, as specified in the manifest entry
|
* Returns the vendor name, as specified in the manifest entry
|
||||||
* {@code Implementation-Vendor} for the package.
|
* {@code Implementation-Vendor} for the package.
|
||||||
|
@ -26,7 +26,7 @@ public class ProviderInfoTestCase extends TestCase {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testGetVendorNonJARPackage() {
|
public void testGetVendorUnknownNonJARPackage() {
|
||||||
ProviderInfo info = new ProviderInfo(mockNonJARPackage("org.foo"));
|
ProviderInfo info = new ProviderInfo(mockNonJARPackage("org.foo"));
|
||||||
|
|
||||||
String vendor = info.getVendorName();
|
String vendor = info.getVendorName();
|
||||||
@ -35,7 +35,7 @@ public class ProviderInfoTestCase extends TestCase {
|
|||||||
|
|
||||||
String version = info.getVersion();
|
String version = info.getVersion();
|
||||||
assertNotNull(version);
|
assertNotNull(version);
|
||||||
assertEquals("DEV", version);
|
assertEquals("Unspecified", version);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testGetVendorNonJARTMPackage() {
|
public void testGetVendorNonJARTMPackage() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user