...
Expecting message:
<"data types for hello:0.0.1 do not exist">
to match regex:
<"service template not found in database">
but did not.
[INFO]
I also ran the models-pdp test on postgres
Updated
src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpProviderTest.java
src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpStatisticsProviderTest.java
with
| Code Block | ||||
|---|---|---|---|---|
| ||||
if (System.getProperty("USE-MARIADB") != null) {
jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_DRIVER, "org.mariadb.jdbc.Driver");
jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_URL, "jdbc:mariadb://localhost:3306/policy");
} else if (System.getProperty("USE-POSTGRES") != null) {
jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_DRIVER, "org.postgresql.Driver");
jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_URL, "jdbc:postgresql://localhost:5432/policy");
jdbcProperties.setProperty(PersistenceUnitProperties.TARGET_DATABASE, "PostgreSQL");
} else {
jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_DRIVER, "org.h2.Driver");
jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_URL, "jdbc:h2:mem:PdpProviderTest");
}
|
Updated pom.xml
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.19</version>
<scope>test</scope>
</dependency>
ran
mvn clean install -DUSE-POSTGRES
[ERROR] Failures:
[ERROR] PdpProviderTest.cudPolicyStatus_Create:746
Expected size:<2> but was:<5> in:
<[PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=pdp2, policy=MyPolicyB 2.3.4, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=pdp3, policy=MyPolicy 10.20.30, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=pdp1, policy=MyPolicy 1.2.3, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=idX, policy=MyPolicy 1.2.3, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=idY, policy=MyPolicy 1.2.3, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS)]>
[ERROR] PdpProviderTest.cudPolicyStatus_Delete:795
Expected size:<4> but was:<7> in:
<[PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=pdp2, policy=MyPolicyB 2.3.4, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=pdp3, policy=MyPolicy 10.20.30, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=pdp1, policy=MyPolicy 1.2.3, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=idX, policy=MyPolicy 1.2.3, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=idY, policy=MyPolicy 1.2.3, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=idZ, policy=MyPolicy 1.2.3, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=idW, policy=MyPolicy 1.2.3, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS)]>
[ERROR] PdpProviderTest.cudPolicyStatus_Update:767
Expected size:<4> but was:<11> in:
<[PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=pdp2, policy=MyPolicyB 2.3.4, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=pdp3, policy=MyPolicy 10.20.30, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=pdp1, policy=MyPolicy 1.2.3, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=idX, policy=MyPolicy 1.2.3, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=idY, policy=MyPolicy 1.2.3, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=idZ, policy=MyPolicy 1.2.3, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=idW, policy=MyPolicy 1.2.3, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=wId, policy=MyPolicy 1.2.3, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=zId, policy=MyPolicy 1.2.3, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=yId, policy=MyPolicy 1.2.3, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=xId, policy=MyPolicy 1.2.3, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS)]>
[ERROR] PdpProviderTest.testFromAuthorativeStatus:834
Expecting empty but was:<[PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=pdp2, policy=MyPolicyB 2.3.4, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=pdp3, policy=MyPolicy 10.20.30, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS),
PdpPolicyStatus(pdpGroup=groupA, pdpType=MyPdpType, pdpId=pdp1, policy=MyPolicy 1.2.3, policyType=MyPolicyType 1.2.4, deploy=true, state=SUCCESS)]>
[ERROR] PdpStatisticsProviderTest.testGetPdpStatistics:184 expected:<...s(pdpInstanceId=name[,timeStamp=2004-03-10T02:05:19Z,generatedId=1,pdpGroupName=group,pdpSubGroupName=subgroup,policyDeployCount=2,policyDeploySuccessCount=1,policyDeployFailCount=1,policyExecutedCount=2,policyExecutedSuccessCount=1,policyExecutedFailCount=1,engineStats=[]),PdpStatistics(pdpInstanceId=name2,timeStamp=2004-03-10T02:05:50Z,generatedId=2],pdpGroupName=group,...> but was:<...s(pdpInstanceId=name[2,timeStamp=2004-03-10T02:05:50Z,generatedId=2,pdpGroupName=group,pdpSubGroupName=subgroup,policyDeployCount=2,policyDeploySuccessCount=1,policyDeployFailCount=1,policyExecutedCount=2,policyExecutedSuccessCount=1,policyExecutedFailCount=1,engineStats=[]),PdpStatistics(pdpInstanceId=name,timeStamp=2004-03-10T02:05:19Z,generatedId=1],pdpGroupName=group,...>
models-tosca in postgres
Update the following files with java code above:
src/test/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProviderGenericTest.java
src/test/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProviderPolicyTest.java
src/test/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProviderPolicyTypeTest.java
src/test/java/org/onap/policy/models/tosca/simple/provider/SimpleToscaProviderTest.java
src/test/java/org/onap/policy/models/tosca/simple/provider/SimpleToscaServiceTemplateProviderTest.java
and pom.xml with postgres dependency.
[ERROR] Failures:
[ERROR] AuthorativeToscaProviderPolicyTypeTest.testPolicyTypesGet:167 expected:<2> but was:<4>
[ERROR] AuthorativeToscaProviderPolicyTypeTest.testPolicyTypesGetFiltered:253 expected:<2> but was:<4>
[ERROR] SimpleToscaProviderTest.testCreateUpdateGetDeleteDataType:174
Expecting message to be:
<"no data types found">
but was:
<"data type DataType0:0.0.1 not found">
Throwable that failed the check:
models-providers
Update the following files with java code below:
src/test/java/org/onap/policy/models/provider/impl/PolicyStatisticsPersistenceTest.java
src/test/java/org/onap/policy/models/provider/impl/PolicyToscaPersistenceTest.java
src/test/java/org/onap/policy/models/provider/impl/PolicyTypePersistenceTest.java
| Code Block | ||||
|---|---|---|---|---|
| ||||
if (System.getProperty("USE-MARIADB") != null) {
parameters.setDatabaseDriver("org.mariadb.jdbc.Driver");
parameters.setDatabaseUrl("jdbc:mariadb://localhost:3306/policy");
} else if (System.getProperty("USE-POSTGRES") != null) {
parameters.setDatabaseDriver("org.postgresql.Driver");
parameters.setDatabaseUrl("jdbc:postgresql://localhost:5432/policy");
parameters.setDatabaseType("PostgreSQL");
} else {
parameters.setDatabaseDriver("org.h2.Driver");
parameters.setDatabaseUrl("jdbc:h2:mem:PolicyStatisticsPersistenceTest");
}
|
This passes all tests as before
models-dao also passes all tests.
All the tests work with H2 but this is an in-memory DB so the tables/records are not persisted.