Skip to content

Commit

Permalink
Remove deprecated items from tests
Browse files Browse the repository at this point in the history 
Annotations ra:account and ra:accountType were used quite often.
This should fix failing tests.
  • Loading branch information
@mederly
mederly committed Apr 2, 2020
1 parent 107139b commit 7887936
Show file tree
Hide file tree
Showing 57 changed files with 60 additions and 144 deletions.
2 changes: 1 addition & 1 deletion infra/common/src/test/resources/refinery/resource-complex.xml
View file
Expand Up @@ -103,7 +103,7 @@
<xsd:complexType name="AccountObjectClass">
<xsd:annotation>
<xsd:appinfo>
<r:account />
<r:kind>account</r:kind>
<r:resourceObject />
<r:identifier ref="icfs:uid" />
<r:displayNameAttribute ref="ri:uid" />
Expand Down
2 changes: 1 addition & 1 deletion infra/common/src/test/resources/refinery/resource-simple.xml
View file
Expand Up @@ -97,8 +97,8 @@
<xsd:complexType name="AccountObjectClass">
<xsd:annotation>
<xsd:appinfo>
<r:account />
<r:resourceObject />
<r:kind>account</r:kind>
<r:identifier ref="icfs:uid" />
<r:displayNameAttribute ref="ri:uid" />
<r:namingAttribute ref="icfs:name" />
Expand Down
16 changes: 0 additions & 16 deletions infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/TestResourceSchema.java
View file
Expand Up @@ -46,7 +46,6 @@ public class TestResourceSchema extends AbstractSchemaTest {
private static final String TEST_DIR = "src/test/resources/processor/";

private static final String RESOURCE_SCHEMA_SIMPLE_FILENAME = TEST_DIR + "resource-schema-simple.xsd";
private static final String RESOURCE_SCHEMA_SIMPLE_DEPRECATED_FILENAME = TEST_DIR + "resource-schema-simple-deprecated.xsd";

private static final String SCHEMA_NAMESPACE = "http://schema.foo.com/bar";

Expand All @@ -65,21 +64,6 @@ public void testParseSchema() throws Exception {
assertSimpleSchema(schema, RESOURCE_SCHEMA_SIMPLE_FILENAME);
}

@Test
public void testParseSchemaDeprecated() throws Exception {
// GIVEN

Document schemaDom = DOMUtil.parseFile(RESOURCE_SCHEMA_SIMPLE_DEPRECATED_FILENAME);

// WHEN

ResourceSchema schema = ResourceSchemaImpl.parse(DOMUtil.getFirstChildElement(schemaDom), "http://schema.foo.com/bar",
RESOURCE_SCHEMA_SIMPLE_DEPRECATED_FILENAME, PrismTestUtil.getPrismContext());

// THEN
assertSimpleSchema(schema, RESOURCE_SCHEMA_SIMPLE_DEPRECATED_FILENAME);
}

private void assertSimpleSchema(ResourceSchema schema, String filename) {
assertNotNull(schema);
System.out.println("Parsed schema from " + filename + ":");
Expand Down
2 changes: 1 addition & 1 deletion infra/schema/src/test/resources/common/json/no-ns/resource-opendj.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion infra/schema/src/test/resources/common/json/ns/resource-opendj.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion infra/schema/src/test/resources/common/resource-opendj-no-xmlns.xml
View file
Expand Up @@ -152,7 +152,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion infra/schema/src/test/resources/common/xml/no-ns/resource-opendj.xml
View file
Expand Up @@ -137,7 +137,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion infra/schema/src/test/resources/common/xml/ns/resource-opendj.xml
View file
Expand Up @@ -154,7 +154,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion infra/schema/src/test/resources/common/yaml/no-ns/resource-opendj.yaml
View file
Expand Up @@ -97,7 +97,7 @@ resource:
\ xmlns:ra=\"http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3\"\
>icfs:name</ra:namingAttribute>\n\t\t\t <ra:nativeObjectClass\
\ xmlns:ra=\"http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3\"\
>__ACCOUNT__</ra:nativeObjectClass>\n\t\t\t <ra:account\
>__ACCOUNT__</ra:nativeObjectClass>\n\t\t\t <ra:resourceObject\
\ xmlns:ra=\"http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3\"\
/>\n\t\t\t <ra:default xmlns:ra=\"http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3\"\
/>\n\t\t\t\t\t\t\t</xsd:appinfo>\n\t\t\t\t\t\t</xsd:annotation>\n\t\t\t\t\t\
Expand Down
2 changes: 1 addition & 1 deletion infra/schema/src/test/resources/common/yaml/ns/resource-opendj.yaml
View file
Expand Up @@ -102,7 +102,7 @@ resource:
\ xmlns:ra=\"http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3\"\
>icfs:name</ra:namingAttribute>\n\t\t\t <ra:nativeObjectClass\
\ xmlns:ra=\"http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3\"\
>__ACCOUNT__</ra:nativeObjectClass>\n\t\t\t <ra:account\
>__ACCOUNT__</ra:nativeObjectClass>\n\t\t\t <ra:resourceObject\
\ xmlns:ra=\"http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3\"\
/>\n\t\t\t <ra:default xmlns:ra=\"http://midpoint.evolveum.com/xml/ns/public/resource/annotation-3\"\
/>\n\t\t\t\t\t\t\t</xsd:appinfo>\n\t\t\t\t\t\t</xsd:annotation>\n\t\t\t\t\t\
Expand Down
2 changes: 1 addition & 1 deletion infra/schema/src/test/resources/diff/resource-after-const.xml
View file
Expand Up @@ -112,7 +112,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion infra/schema/src/test/resources/diff/resource-after-ns-change.xml
View file
Expand Up @@ -116,7 +116,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion infra/schema/src/test/resources/diff/resource-before.xml
View file
Expand Up @@ -108,7 +108,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
3 changes: 2 additions & 1 deletion infra/schema/src/test/resources/processor/resource-schema-complex.xsd
View file
Expand Up @@ -19,7 +19,8 @@
<xsd:annotation>
<xsd:appinfo>
<r:identifier ref="icfs:uid" />
<r:account/>
<r:resourceObject/>
<r:kind>account</r:kind>
<r:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
70 changes: 0 additions & 70 deletions infra/schema/src/test/resources/processor/resource-schema-simple-deprecated.xsd
View file

This file was deleted.

2 changes: 1 addition & 1 deletion model/certification-impl/src/test/resources/common/resource-dummy-black.xml
View file
Expand Up @@ -63,7 +63,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/account-custom-function.xml
View file
Expand Up @@ -55,7 +55,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/account-resource-schema-handling-custom-variables.xml
View file
Expand Up @@ -59,7 +59,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/account-xpath-evaluation-extension.xml
View file
Expand Up @@ -84,7 +84,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/account-xpath-evaluation-filter.xml
View file
Expand Up @@ -85,7 +85,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
3 changes: 2 additions & 1 deletion model/model-impl/src/test/resources/account-xpath2.xml
View file
Expand Up @@ -35,7 +35,8 @@
<r:displayName ref="ri:description"/>
<r:descriptionAttribute ref="ri:description"/>
<r:nativeObjectClass>__ACCOUNT__</r:nativeObjectClass>
<r:accountType default="true"/>
<r:kind>account</r:kind>
<r:default/>
</xsd:appinfo>
</xsd:annotation>
<xsd:complexContent>
Expand Down
3 changes: 2 additions & 1 deletion model/model-impl/src/test/resources/controller/modify/account.xml
View file
Expand Up @@ -87,7 +87,8 @@
<xsd:annotation>
<xsd:appinfo>
<r:identifier ref="vr0:uid" />
<r:accountType default="true" />
<r:kind>account</r:kind>
<r:default/>
</xsd:appinfo>
</xsd:annotation>
<xsd:complexContent>
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/expr/account-xpath-evaluation.xml
View file
Expand Up @@ -95,7 +95,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
3 changes: 2 additions & 1 deletion model/model-impl/src/test/resources/expr/user-new.xml
View file
Expand Up @@ -134,7 +134,8 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:resourceObject/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/migrator/after/resource.xml
View file
Expand Up @@ -63,7 +63,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/migrator/before/resource.xml
View file
Expand Up @@ -63,7 +63,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
4 changes: 2 additions & 2 deletions model/model-impl/src/test/resources/misc/resource-dummy-for-checker.xml
View file
Expand Up @@ -60,7 +60,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down Expand Up @@ -91,7 +91,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/sync/action/account/group-change.xml
View file
Expand Up @@ -165,7 +165,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/sync/action/user/existing-user-change.xml
View file
Expand Up @@ -166,7 +166,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/sync/change-correct.xml
View file
Expand Up @@ -155,7 +155,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion model/model-impl/src/test/resources/sync/change-without-object.xml
View file
Expand Up @@ -136,7 +136,7 @@
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:nativeObjectClass>__ACCOUNT__</ra:nativeObjectClass>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down
3 changes: 1 addition & 2 deletions model/model-intest/src/test/resources/async/grouper-amqp091/resource-grouper-amqp091.xml
View file
Expand Up @@ -163,7 +163,7 @@
<ra:secondaryIdentifier>icfs:name</ra:secondaryIdentifier>
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:account/>
<ra:kind>account</ra:kind>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand All @@ -181,7 +181,6 @@
<ra:secondaryIdentifier>icfs:name</ra:secondaryIdentifier>
<ra:displayNameAttribute>icfs:name</ra:displayNameAttribute>
<ra:namingAttribute>icfs:name</ra:namingAttribute>
<ra:account/>
<ra:default/>
</xsd:appinfo>
</xsd:annotation>
Expand Down

0 comments on commit 7887936

Please sign in to comment.