From 02e5d1dfb39c5bd53acec78842742d85aea22138 Mon Sep 17 00:00:00 2001
From: juanf <juanf@ethz.ch>
Date: Mon, 10 Jun 2024 09:55:52 +0200
Subject: [PATCH] BIS-1096: Bugfix, avoid duplicated property type creations
---
.../openbis/systemtest/asapi/v3/UncompressedImportTest.java | 4 ++--
.../ethz/sis/openbis/systemtest/asapi/v3/ZipImportTest.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UncompressedImportTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UncompressedImportTest.java
index 94ebd7a52ee..1f1a52c122c 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UncompressedImportTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UncompressedImportTest.java
@@ -204,7 +204,7 @@ public class UncompressedImportTest extends AbstractImportTest
final Plugin validationPlugin = sampleType.getValidationPlugin();
final String validationPluginBareName = name.substring(0, name.lastIndexOf("."));
- assertEquals(validationPlugin.getName(), sampleType.getCode() + "." + validationPluginBareName);
+ assertEquals(validationPlugin.getName(), validationPluginBareName);
assertEquals(validationPlugin.getScript(), source);
}
@@ -239,7 +239,7 @@ public class UncompressedImportTest extends AbstractImportTest
final String pluginBareName = name.substring(0, name.lastIndexOf("."));
- assertEquals(plugin.getName(), propertyAssignment.getPropertyType().getCode() + "." + pluginBareName);
+ assertEquals(plugin.getName(), pluginBareName);
assertEquals(plugin.getScript(), source);
}
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ZipImportTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ZipImportTest.java
index d2196dd938d..7cfd600fe1c 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ZipImportTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ZipImportTest.java
@@ -269,7 +269,7 @@ public class ZipImportTest extends AbstractImportTest
final Plugin validationPlugin = sampleType.getValidationPlugin();
final String validationPluginBareName = name.substring(0, name.lastIndexOf("."));
- assertEquals(validationPlugin.getName(), sampleType.getCode() + "." + validationPluginBareName);
+ assertEquals(validationPlugin.getName(), validationPluginBareName);
assertEquals(validationPlugin.getScript().trim(), source);
}
@@ -305,7 +305,7 @@ public class ZipImportTest extends AbstractImportTest
final String pluginBareName = name.substring(0, name.lastIndexOf("."));
- assertEquals(plugin.getName(), propertyAssignment.getPropertyType().getCode() + "." + pluginBareName);
+ assertEquals(plugin.getName(), pluginBareName);
assertEquals(plugin.getScript().trim(), source);
}
--
GitLab