Skip to content

Rename test resources bundle #3398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Rename test resources bundle #3398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/CgmesReportsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.powsybl.commons.datasource.ResourceDataSource;
import com.powsybl.commons.datasource.ResourceSet;
import com.powsybl.commons.report.PowsyblCoreReportResourceBundle;
import com.powsybl.commons.test.PowsyblCoreTestReportResourceBundle;
import com.powsybl.commons.test.PowsyblTestReportResourceBundle;
import com.powsybl.commons.report.ReportNode;
import org.junit.jupiter.api.Test;

Expand All @@ -15,7 +15,7 @@ class CgmesReportsTest {
@Test
void importingCgmesFileReportTest() {
ReportNode reportRoot = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("test")
.build();
ReadOnlyDataSource ds = new ResourceDataSource("CGMES import file(s)", new ResourceSet("/", "GeneratingUnitTypes.xml", "groundTest.xml"));
Expand Down
4 changes: 2 additions & 2 deletions .../cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/FunctionalLogsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import com.powsybl.cgmes.conversion.CgmesImport;
import com.powsybl.cgmes.model.GridModelReference;
import com.powsybl.commons.report.PowsyblCoreReportResourceBundle;
import com.powsybl.commons.test.PowsyblCoreTestReportResourceBundle;
import com.powsybl.commons.test.PowsyblTestReportResourceBundle;
import com.powsybl.commons.report.ReportNode;
import com.powsybl.iidm.network.Importers;
import org.junit.jupiter.api.BeforeEach;
Expand Down Expand Up @@ -64,7 +64,7 @@ void testImportMiniGridNodeBreaker() throws IOException {

private ReportNode importReport(GridModelReference testCase) {
ReportNode reportNode = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("testFunctionalLogs")
.withUntypedValue("name", testCase.name())
.build();
Expand Down
4 changes: 2 additions & 2 deletions ...ion/src/test/java/com/powsybl/cgmes/conversion/test/export/CommonGridModelExportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import com.powsybl.commons.datasource.MemDataSource;
import com.powsybl.commons.datasource.ReadOnlyDataSource;
import com.powsybl.commons.report.PowsyblCoreReportResourceBundle;
import com.powsybl.commons.test.PowsyblCoreTestReportResourceBundle;
import com.powsybl.commons.test.PowsyblTestReportResourceBundle;
import com.powsybl.commons.report.ReportNode;
import com.powsybl.commons.test.AbstractSerDeTest;
import com.powsybl.iidm.network.*;
Expand Down Expand Up @@ -449,7 +449,7 @@ void testFaraoUseCase() {

// Export using a reporter to gather the exported model identifiers
ReportNode report = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("rootKey")
.build();

Expand Down
6 changes: 3 additions & 3 deletions ...src/test/java/com/powsybl/cgmes/conversion/test/export/ExportProfilesConsistencyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import com.powsybl.cgmes.conversion.naming.NamingStrategyFactory;
import com.powsybl.commons.datasource.ReadOnlyDataSource;
import com.powsybl.commons.report.PowsyblCoreReportResourceBundle;
import com.powsybl.commons.test.PowsyblCoreTestReportResourceBundle;
import com.powsybl.commons.test.PowsyblTestReportResourceBundle;
import com.powsybl.commons.report.ReportNode;
import com.powsybl.commons.test.AbstractSerDeTest;
import com.powsybl.iidm.network.ExportersServiceLoader;
Expand All @@ -37,14 +37,14 @@ void testSVSmallGridNodeBreaker() {
Network network = importNetwork(CgmesConformity1Catalog.smallNodeBreaker().dataSource());

ReportNode reportNodeOnlySv = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("onlySV")
.build();
exportProfiles(List.of("SV"), network, reportNodeOnlySv);
assertTrue(inconsistentProfilesReported(reportNodeOnlySv));

ReportNode reportNodeSvAndTp = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("SVandTP")
.build();
exportProfiles(List.of("SV", "TP"), network, reportNodeSvAndTp);
Expand Down
4 changes: 2 additions & 2 deletions .../PowsyblCoreTestReportResourceBundle.java → ...test/PowsyblTestReportResourceBundle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
/**
* @author Alice Caron {@literal <alice.caron at rte-france.com>}
*/
public final class PowsyblCoreTestReportResourceBundle {
public final class PowsyblTestReportResourceBundle {

public static final String TEST_BASE_NAME = "i18n.reports";

private PowsyblCoreTestReportResourceBundle() {
private PowsyblTestReportResourceBundle() {
}
}
4 changes: 2 additions & 2 deletions commons/src/test/java/com/powsybl/commons/report/CommonsTestReportResourceBundle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
package com.powsybl.commons.report;

import com.google.auto.service.AutoService;
import com.powsybl.commons.test.PowsyblCoreTestReportResourceBundle;
import com.powsybl.commons.test.PowsyblTestReportResourceBundle;

/**
* @author Florian Dupuy {@literal <florian.dupuy at rte-france.com>}
Expand All @@ -17,6 +17,6 @@
public final class CommonsTestReportResourceBundle implements ReportResourceBundle {

public String getBaseName() {
return PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME;
return PowsyblTestReportResourceBundle.TEST_BASE_NAME;
}
}
4 changes: 2 additions & 2 deletions commons/src/test/java/com/powsybl/commons/report/NoOpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import com.powsybl.commons.test.AbstractSerDeTest;
import com.powsybl.commons.test.ComparisonUtils;
import com.powsybl.commons.test.PowsyblCoreTestReportResourceBundle;
import com.powsybl.commons.test.PowsyblTestReportResourceBundle;
import org.junit.jupiter.api.Test;

import java.io.IOException;
Expand Down Expand Up @@ -56,7 +56,7 @@ void test() throws IOException {
assertNull(reportNode.getMessageKey());

ReportNode reportNodeImplRoot = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("k")
.build();
reportNode.include(reportNodeImplRoot);
Expand Down
4 changes: 2 additions & 2 deletions commons/src/test/java/com/powsybl/commons/report/ReportFormatterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/
package com.powsybl.commons.report;

import com.powsybl.commons.test.PowsyblCoreTestReportResourceBundle;
import com.powsybl.commons.test.PowsyblTestReportResourceBundle;
import org.junit.jupiter.api.Test;

import java.util.Locale;
Expand All @@ -22,7 +22,7 @@ class ReportFormatterTest {
@Test
void test() {
ReportNode root = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("formatTest")
.withUntypedValue("doubleDefaultFormat", 4.35684975)
.withTypedValue("doubleSpecificFormat", 4.4664798548, TypedValue.ACTIVE_POWER)
Expand Down
10 changes: 5 additions & 5 deletions commons/src/test/java/com/powsybl/commons/report/ReportNodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import com.powsybl.commons.PowsyblException;
import com.powsybl.commons.test.AbstractSerDeTest;
import com.powsybl.commons.test.ComparisonUtils;
import com.powsybl.commons.test.PowsyblCoreTestReportResourceBundle;
import com.powsybl.commons.test.PowsyblTestReportResourceBundle;
import org.junit.jupiter.api.Test;

import java.io.IOException;
Expand All @@ -22,7 +22,7 @@
import java.util.Locale;
import java.util.Optional;

import static com.powsybl.commons.test.PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME;
import static com.powsybl.commons.test.PowsyblTestReportResourceBundle.TEST_BASE_NAME;
import static org.junit.jupiter.api.Assertions.*;

/**
Expand Down Expand Up @@ -338,15 +338,15 @@ void testTimestamps() {
void testMissingKey() {
// Without giving a locale
ReportNode report1 = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("unknown.key")
.build();
// translation should fall back to default properties as the key is not defined in the reports_en_US.properties
assertEquals("Cannot find message template with key: 'unknown.key'", report1.getMessage());

// With Locale.FRENCH
ReportNode report2 = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withLocale(Locale.FRENCH)
.withMessageTemplate("unknown.key")
.build();
Expand All @@ -358,7 +358,7 @@ void testMissingKey() {
void testLocaleAndi18n() {
// Without giving a locale => default one is en_US
ReportNode rootReportEnglish = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplateProvider(new BundleMessageTemplateProvider(TEST_BASE_NAME))
.withMessageTemplate("rootWithValue")
.withUntypedValue("value", 4)
Expand Down
4 changes: 2 additions & 2 deletions commons/src/test/java/com/powsybl/commons/report/TypedValueTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/
package com.powsybl.commons.report;

import com.powsybl.commons.test.PowsyblCoreTestReportResourceBundle;
import com.powsybl.commons.test.PowsyblTestReportResourceBundle;
import org.junit.jupiter.api.Test;

import java.util.Optional;
Expand All @@ -30,7 +30,7 @@ void testSeverity() {

// Check that is not possible to add a Severity attribute with a TypedValue that is not a severity
ReportNode root = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("root")
.build();
ReportNodeAdder r1 = root.newReportNode()
Expand Down
4 changes: 2 additions & 2 deletions iidm/iidm-api/src/test/java/com/powsybl/iidm/network/ExportersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import com.powsybl.commons.datasource.DataSource;
import com.powsybl.commons.datasource.DirectoryDataSource;
import com.powsybl.commons.report.PowsyblCoreReportResourceBundle;
import com.powsybl.commons.test.PowsyblCoreTestReportResourceBundle;
import com.powsybl.commons.test.PowsyblTestReportResourceBundle;
import com.powsybl.commons.report.ReportNode;
import com.powsybl.commons.test.TestUtil;
import com.powsybl.iidm.network.tools.ExporterMockWithReportNode;
Expand Down Expand Up @@ -135,7 +135,7 @@ void exportWithReportNode() throws Exception {
Exporter testExporter = new ExporterMockWithReportNode();
DataSource dataSource = Exporters.createDataSource(path);
ReportNode rootReportNode = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("reportTest")
.build();
testExporter.export(null, null, dataSource, rootReportNode);
Expand Down
4 changes: 2 additions & 2 deletions iidm/iidm-api/src/test/java/com/powsybl/iidm/network/ImportersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.powsybl.commons.datasource.DataSource;
import com.powsybl.commons.datasource.DirectoryDataSource;
import com.powsybl.commons.report.PowsyblCoreReportResourceBundle;
import com.powsybl.commons.test.PowsyblCoreTestReportResourceBundle;
import com.powsybl.commons.test.PowsyblTestReportResourceBundle;
import com.powsybl.commons.report.ReportNode;
import com.powsybl.commons.test.TestUtil;
import com.powsybl.computation.ComputationManager;
Expand Down Expand Up @@ -95,7 +95,7 @@ void getImporterWithImportConfig() {
void getImporterWithImportConfigAndReportNode() throws IOException {
Importer importer = Importer.find(loader, TEST_FORMAT, computationManager, importConfigWithPostProcessor);
ReportNode reportNode = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("testFunctionalLog")
.build();
assertNotNull(importer);
Expand Down
4 changes: 2 additions & 2 deletions iidm/iidm-api/src/test/java/com/powsybl/iidm/network/PostProcessorReportNodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import com.powsybl.commons.report.*;
import com.powsybl.commons.test.AbstractSerDeTest;
import com.powsybl.commons.test.PowsyblCoreTestReportResourceBundle;
import com.powsybl.commons.test.PowsyblTestReportResourceBundle;
import com.powsybl.computation.ComputationManager;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
Expand All @@ -36,7 +36,7 @@ class PostProcessorReportNodeTest extends AbstractSerDeTest {
void postProcessorWithReportNode() throws IOException {

ReportNode reportRoot = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("testPostProcessor")
.build();
Network network1 = importer1.importData(null, new NetworkFactoryMock(), null, reportRoot);
Expand Down
16 changes: 8 additions & 8 deletions iidm/iidm-api/src/test/java/com/powsybl/iidm/network/ReportNodeContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
package com.powsybl.iidm.network;

import com.powsybl.commons.report.PowsyblCoreReportResourceBundle;
import com.powsybl.commons.test.PowsyblCoreTestReportResourceBundle;
import com.powsybl.commons.test.PowsyblTestReportResourceBundle;
import com.powsybl.commons.report.ReportNode;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
Expand Down Expand Up @@ -54,15 +54,15 @@ void getReportNodeOnEmptyContextTest(String desc, Supplier<ReportNodeContext> co
void pushAndGetReportNodeTest(String desc, Supplier<ReportNodeContext> contextSupplier) {
ReportNodeContext reportNodeContext = contextSupplier.get();
ReportNode reportNode0 = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("task0")
.build();
reportNodeContext.pushReportNode(reportNode0);
assertEquals(reportNode0, reportNodeContext.getReportNode());
assertEquals(reportNode0, reportNodeContext.peekReportNode());

ReportNode reportNode1 = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("task1")
.build();
reportNodeContext.pushReportNode(reportNode1);
Expand All @@ -80,11 +80,11 @@ void popReportNodeTest(String desc, Supplier<ReportNodeContext> contextSupplier)
ReportNodeContext reportNodeContext = contextSupplier.get();

ReportNode reportNode0 = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("task0")
.build();
ReportNode reportNode1 = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("task1")
.build();
reportNodeContext.pushReportNode(reportNode0);
Expand Down Expand Up @@ -140,17 +140,17 @@ void copyNonEmptyReportNodeContextTest(String desc, Supplier<ReportNodeContext>

// Push reportNodes in the context
ReportNode reportNode1 = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("1")
.build();
reportNodeContext.pushReportNode(reportNode1);
ReportNode reportNode2 = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("2")
.build();
reportNodeContext.pushReportNode(reportNode2);
ReportNode reportNode3 = ReportNode.newRootReportNode()
.withResourceBundles(PowsyblCoreTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withResourceBundles(PowsyblTestReportResourceBundle.TEST_BASE_NAME, PowsyblCoreReportResourceBundle.BASE_NAME)
.withMessageTemplate("3")
.build();
reportNodeContext.pushReportNode(reportNode3);
Expand Down
Loading