Skip TestInternalCorrelationMedium on old repo

Also, removed last traces of TemporaryUserType.
Evolveum · Aug 4, 2022 · d1a7e55 · d1a7e55
1 parent 72db30a
commit d1a7e55
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 39 deletions.
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-correlation-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-correlation-3.xsd
@@ -1347,25 +1347,6 @@
         <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
-    <xsd:complexType name="TemporaryUserType">
-        <xsd:annotation>
-            <xsd:documentation>
-                Temporary data structure just to continue the development of the smart correlation.
-            </xsd:documentation>
-            <xsd:appinfo>
-                <a:since>4.6</a:since>
-                <a:container>true</a:container>
-                <a:experimental>true</a:experimental>
-            </xsd:appinfo>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element ref="tns:extension" minOccurs="0"/>
-            <xsd:element name="givenName" type="t:PolyStringType" minOccurs="0"/>
-            <xsd:element name="familyName" type="t:PolyStringType" minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:long"/>
-    </xsd:complexType>
-
     <xsd:complexType name="FocusIdentitySourceType">
         <xsd:annotation>
             <xsd:documentation>

diff --git a/model/model-intest/src/test/resources/schema/enterprise.xsd b/model/model-intest/src/test/resources/schema/enterprise.xsd
@@ -36,22 +36,4 @@
         </xsd:sequence>
     </xsd:complexType>
 
-    <!-- FIXME TEMPORARY CODE -->
-    <xsd:complexType name="TemporaryUserTypeExtensionType">
-        <xsd:annotation>
-            <xsd:appinfo>
-                <a:extension ref="c:TemporaryUserType"/>
-            </xsd:appinfo>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="personalNumber" type="xsd:string">
-                <xsd:annotation>
-                    <xsd:appinfo>
-                        <a:indexed>true</a:indexed>
-                    </xsd:appinfo>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
-
 </xsd:schema>
diff --git a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
@@ -66,6 +66,7 @@
 import org.springframework.test.context.web.ServletTestExecutionListener;
 import org.testng.Assert;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.w3c.dom.Element;
@@ -4241,4 +4242,15 @@ protected void dumpResourceCapabilities(@NotNull ResourceType resource) throws S
             System.out.println("Capability: " + CapabilityUtil.getCapabilityDisplayName(capability) + " : " + capability);
         }
     }
+
+    @SuppressWarnings("WeakerAccess")
+    protected boolean isNativeRepository() {
+        return repositoryService.isNative();
+    }
+
+    protected void skipIfNotNativeRepository() {
+        if (!isNativeRepository()) {
+            throw new SkipException("Not running on the native repository");
+        }
+    }
 }
diff --git a/...po-test-util/src/main/java/com/evolveum/midpoint/test/asserter/FocusIdentityAsserter.java b/...po-test-util/src/main/java/com/evolveum/midpoint/test/asserter/FocusIdentityAsserter.java
@@ -20,8 +20,6 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.IdentityItemsType;
 
-import com.evolveum.midpoint.xml.ns._public.common.common_3.TemporaryUserType;
-
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;

diff --git a/...t/java/com/evolveum/midpoint/testing/story/correlation/TestInternalCorrelationMedium.java b/...t/java/com/evolveum/midpoint/testing/story/correlation/TestInternalCorrelationMedium.java
@@ -14,6 +14,7 @@
 
 import java.io.File;
 
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import com.evolveum.midpoint.prism.PrismObject;
@@ -68,6 +69,11 @@ public class TestInternalCorrelationMedium extends AbstractCorrelationTest {
     private static final ItemPath PATH_DATE_OF_BIRTH = ItemPath.create(UserType.F_EXTENSION, "dateOfBirth"); // TODO NS URI
     private static final ItemPath PATH_NATIONAL_ID = ItemPath.create(UserType.F_EXTENSION, "nationalId"); // TODO NS URI
 
+    @BeforeMethod
+    public void onNativeOnly() {
+        skipIfNotNativeRepository();
+    }
+
     @Override
     public void initSystem(Task initTask, OperationResult initResult) throws Exception {
         super.initSystem(initTask, initResult);