chore: refactoring tests after migration to generic v7.4.0 to reduce …

…code duplication
SchweizerischeBundesbahnen · Oct 8, 2024 · 8bc14ae · 8bc14ae
1 parent b00d1db
commit 8bc14ae
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 35 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>ch.sbb.polarion.extensions</groupId>
         <artifactId>ch.sbb.polarion.extension.generic</artifactId>
-        <version>7.3.1</version>
+        <version>7.4.0</version>
     </parent>
 
     <artifactId>ch.sbb.polarion.extension.pdf-exporter</artifactId>
@@ -157,6 +157,13 @@
             <version>${awaitility.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>ch.sbb.polarion.extensions</groupId>
+            <artifactId>ch.sbb.polarion.extension.generic.app</artifactId>
+            <version>${project.parent.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/src/test/java/ch/sbb/polarion/extension/pdf_exporter/settings/CoverPageSettingsTest.java b/src/test/java/ch/sbb/polarion/extension/pdf_exporter/settings/CoverPageSettingsTest.java
@@ -1,5 +1,7 @@
 package ch.sbb.polarion.extension.pdf_exporter.settings;
 
+import ch.sbb.polarion.extension.generic.context.CurrentContextConfig;
+import ch.sbb.polarion.extension.generic.context.CurrentContextExtension;
 import ch.sbb.polarion.extension.generic.exception.ObjectNotFoundException;
 import ch.sbb.polarion.extension.generic.settings.GenericNamedSettings;
 import ch.sbb.polarion.extension.generic.settings.SettingId;
@@ -37,7 +39,8 @@
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
-@ExtendWith({MockitoExtension.class, PdfExporterContextExtension.class})
+@ExtendWith({MockitoExtension.class, CurrentContextExtension.class})
+@CurrentContextConfig("pdf-exporter")
 class CoverPageSettingsTest {
     @Mock
     PdfExporterPolarionService mockedPdfExporterPolarionService;

diff --git a/src/test/java/ch/sbb/polarion/extension/pdf_exporter/settings/CssSettingsTest.java b/src/test/java/ch/sbb/polarion/extension/pdf_exporter/settings/CssSettingsTest.java
@@ -1,5 +1,7 @@
 package ch.sbb.polarion.extension.pdf_exporter.settings;
 
+import ch.sbb.polarion.extension.generic.context.CurrentContextConfig;
+import ch.sbb.polarion.extension.generic.context.CurrentContextExtension;
 import ch.sbb.polarion.extension.generic.exception.ObjectNotFoundException;
 import ch.sbb.polarion.extension.generic.settings.GenericNamedSettings;
 import ch.sbb.polarion.extension.generic.settings.SettingId;
@@ -17,7 +19,8 @@
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-@ExtendWith({MockitoExtension.class, PdfExporterContextExtension.class})
+@ExtendWith({MockitoExtension.class, CurrentContextExtension.class})
+@CurrentContextConfig("pdf-exporter")
 class CssSettingsTest {
 
     @Test

diff --git a/...st/java/ch/sbb/polarion/extension/pdf_exporter/settings/FileNameTemplateSettingsTest.java b/...st/java/ch/sbb/polarion/extension/pdf_exporter/settings/FileNameTemplateSettingsTest.java
@@ -1,5 +1,7 @@
 package ch.sbb.polarion.extension.pdf_exporter.settings;
 
+import ch.sbb.polarion.extension.generic.context.CurrentContextConfig;
+import ch.sbb.polarion.extension.generic.context.CurrentContextExtension;
 import ch.sbb.polarion.extension.generic.exception.ObjectNotFoundException;
 import ch.sbb.polarion.extension.generic.settings.GenericNamedSettings;
 import ch.sbb.polarion.extension.generic.settings.SettingId;
@@ -20,7 +22,8 @@
 import static org.mockito.Mockito.contains;
 import static org.mockito.Mockito.*;
 
-@ExtendWith({MockitoExtension.class, PdfExporterContextExtension.class})
+@ExtendWith({MockitoExtension.class, CurrentContextExtension.class})
+@CurrentContextConfig("pdf-exporter")
 class FileNameTemplateSettingsTest {
 
     @Test

diff --git a/src/test/java/ch/sbb/polarion/extension/pdf_exporter/settings/HeaderFooterSettingsTest.java b/src/test/java/ch/sbb/polarion/extension/pdf_exporter/settings/HeaderFooterSettingsTest.java
@@ -1,5 +1,7 @@
 package ch.sbb.polarion.extension.pdf_exporter.settings;
 
+import ch.sbb.polarion.extension.generic.context.CurrentContextConfig;
+import ch.sbb.polarion.extension.generic.context.CurrentContextExtension;
 import ch.sbb.polarion.extension.generic.exception.ObjectNotFoundException;
 import ch.sbb.polarion.extension.generic.settings.SettingId;
 import ch.sbb.polarion.extension.generic.settings.SettingsService;
@@ -17,7 +19,8 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.*;
 
-@ExtendWith({MockitoExtension.class, PdfExporterContextExtension.class})
+@ExtendWith({MockitoExtension.class, CurrentContextExtension.class})
+@CurrentContextConfig("pdf-exporter")
 class HeaderFooterSettingsTest {
 
     @Test

diff --git a/src/test/java/ch/sbb/polarion/extension/pdf_exporter/settings/LocalizationSettingsTest.java b/src/test/java/ch/sbb/polarion/extension/pdf_exporter/settings/LocalizationSettingsTest.java
@@ -1,5 +1,7 @@
 package ch.sbb.polarion.extension.pdf_exporter.settings;
 
+import ch.sbb.polarion.extension.generic.context.CurrentContextConfig;
+import ch.sbb.polarion.extension.generic.context.CurrentContextExtension;
 import ch.sbb.polarion.extension.generic.settings.NamedSettings;
 import ch.sbb.polarion.extension.generic.settings.SettingId;
 import ch.sbb.polarion.extension.generic.settings.SettingsService;
@@ -15,7 +17,8 @@
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-@ExtendWith({MockitoExtension.class, PdfExporterContextExtension.class})
+@ExtendWith({MockitoExtension.class, CurrentContextExtension.class})
+@CurrentContextConfig("pdf-exporter")
 class LocalizationSettingsTest {
 
     @Test

diff --git a/...est/java/ch/sbb/polarion/extension/pdf_exporter/settings/PdfExporterContextExtension.java b/...est/java/ch/sbb/polarion/extension/pdf_exporter/settings/PdfExporterContextExtension.java
diff --git a/src/test/java/ch/sbb/polarion/extension/pdf_exporter/settings/StylePackageSettingsTest.java b/src/test/java/ch/sbb/polarion/extension/pdf_exporter/settings/StylePackageSettingsTest.java
@@ -1,5 +1,7 @@
 package ch.sbb.polarion.extension.pdf_exporter.settings;
 
+import ch.sbb.polarion.extension.generic.context.CurrentContextConfig;
+import ch.sbb.polarion.extension.generic.context.CurrentContextExtension;
 import ch.sbb.polarion.extension.generic.exception.ObjectNotFoundException;
 import ch.sbb.polarion.extension.generic.settings.GenericNamedSettings;
 import ch.sbb.polarion.extension.generic.settings.SettingId;
@@ -21,7 +23,8 @@
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
-@ExtendWith({MockitoExtension.class, PdfExporterContextExtension.class})
+@ExtendWith({MockitoExtension.class, CurrentContextExtension.class})
+@CurrentContextConfig("pdf-exporter")
 class StylePackageSettingsTest {
 
     @Test