refs #1282: New Accounting: IS-Collector doesn't start correctly after upgrade to ghn 6.0.0
https://support.d4science.org/issues/1282 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@120303 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
b60934aed4
commit
be10ea589e
|
@ -127,9 +127,8 @@ public class AccountingPersistenceConfigurationTest {
|
||||||
logger.debug("Creating ServiceEndpoint to publish on IS available plugins and their own supported capabilities");
|
logger.debug("Creating ServiceEndpoint to publish on IS available plugins and their own supported capabilities");
|
||||||
ServiceEndpoint serviceEndpoint = new ServiceEndpoint();
|
ServiceEndpoint serviceEndpoint = new ServiceEndpoint();
|
||||||
Profile profile = serviceEndpoint.newProfile();
|
Profile profile = serviceEndpoint.newProfile();
|
||||||
AccountingPersistenceConfiguration accountingPersistenceConfiguration = new AccountingPersistenceConfiguration();
|
profile.category(AccountingPersistenceConfiguration.SERVICE_ENDPOINT_CATEGORY);
|
||||||
profile.category(accountingPersistenceConfiguration.SERVICE_ENDPOINT_CATEGORY);
|
profile.name(AccountingPersistenceConfiguration.SERVICE_ENDPOINT_NAME);
|
||||||
profile.name(accountingPersistenceConfiguration.SERVICE_ENDPOINT_NAME);
|
|
||||||
profile.version(TEST_VERSION);
|
profile.version(TEST_VERSION);
|
||||||
profile.description(PROFILE_DESCRIPTION);
|
profile.description(PROFILE_DESCRIPTION);
|
||||||
|
|
||||||
|
@ -176,11 +175,9 @@ public class AccountingPersistenceConfigurationTest {
|
||||||
protected void clean(){
|
protected void clean(){
|
||||||
ScopeProvider.instance.set(GCUBE_DEVNEXT_SCOPE);
|
ScopeProvider.instance.set(GCUBE_DEVNEXT_SCOPE);
|
||||||
|
|
||||||
AccountingPersistenceConfiguration accountingPersistenceConfiguration = new AccountingPersistenceConfiguration();
|
|
||||||
|
|
||||||
SimpleQuery query = ICFactory.queryFor(ServiceEndpoint.class)
|
SimpleQuery query = ICFactory.queryFor(ServiceEndpoint.class)
|
||||||
.addCondition(String.format("$resource/Profile/Category/text() eq '%s'", accountingPersistenceConfiguration.SERVICE_ENDPOINT_CATEGORY))
|
.addCondition(String.format("$resource/Profile/Category/text() eq '%s'", AccountingPersistenceConfiguration.SERVICE_ENDPOINT_CATEGORY))
|
||||||
.addCondition(String.format("$resource/Profile/Name/text() eq '%s'", accountingPersistenceConfiguration.SERVICE_ENDPOINT_NAME))
|
.addCondition(String.format("$resource/Profile/Name/text() eq '%s'", AccountingPersistenceConfiguration.SERVICE_ENDPOINT_NAME))
|
||||||
.addCondition(String.format("$resource/Profile/RunTime/HostedOn/text() eq '%s'", RUNNING_ON))
|
.addCondition(String.format("$resource/Profile/RunTime/HostedOn/text() eq '%s'", RUNNING_ON))
|
||||||
.setResult("$resource");
|
.setResult("$resource");
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue