Skip to content
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.

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

Bump to powsybl-core 5.2.0 and to junit5 #509

Merged
merged 20 commits into from
Apr 4, 2023
Merged

Bump to powsybl-core 5.2.0 and to junit5 #509

merged 20 commits into from
Apr 4, 2023

Conversation

So-Fras
Copy link
Member

@So-Fras So-Fras commented Mar 28, 2023

Please check if the PR fulfills these requirements (please use '[x]' to check the checkboxes, or submit the PR and then click the checkboxes)

  • The commit message follows our guidelines
  • Docs have been added / updated (for bug fixes / features)

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
Dependency update / clean

What is the new behavior (if this is a feature change)?
Bump to JUnit 5
Bump to version 5.2.0 of powsybl-core
Remove open-loadflow dependency to avoid updating unit tests when loadflow and/or test networks have been changed

Does this PR introduce a breaking change or deprecate an API?
No

Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
@@ -39,7 +39,7 @@ protected AbstractDiagramDataExporter(TripleStore tripleStore, ExportContext con
}

protected String addDiagramObject(String id, String name, double rotation, String diagramObjectStyleId, String diagramId) {
PropertyBag diagramObjectProperties = new PropertyBag(Arrays.asList(CgmesDLModel.IDENTIFIED_OBJECT_NAME, CgmesDLModel.IDENTIFIED_OBJECT, "rotation", CgmesDLModel.DIAGRAM, CgmesDLModel.DIAGRAM_OBJECT_STYLE));
PropertyBag diagramObjectProperties = new PropertyBag(Arrays.asList(CgmesDLModel.IDENTIFIED_OBJECT_NAME, CgmesDLModel.IDENTIFIED_OBJECT, "rotation", CgmesDLModel.DIAGRAM, CgmesDLModel.DIAGRAM_OBJECT_STYLE), true);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to decode identifiers?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know which option is the most suitable. It could be a layout parameter with a default value to true or false instead of a hard-coded value.

Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Copy link
Member

@geofjamg geofjamg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Be careful, you committed IntelliJ project files (.idea/*)

So-Fras and others added 9 commits March 29, 2023 02:33
Signed-off-by: Sophie Frasnedo <93923177+So-Fras@users.noreply.github.com>
Signed-off-by: Sophie Frasnedo <93923177+So-Fras@users.noreply.github.com>
Signed-off-by: Sophie Frasnedo <93923177+So-Fras@users.noreply.github.com>
Signed-off-by: Sophie Frasnedo <93923177+So-Fras@users.noreply.github.com>
Signed-off-by: Sophie Frasnedo <93923177+So-Fras@users.noreply.github.com>
Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
So-Fras and others added 2 commits March 31, 2023 10:02
Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
@flo-dup flo-dup changed the title bump to junit5 + powsybl-core 5.3.0 SNAPSHOT Bump to powsybl-core 5.2.0 and to junit5 Mar 31, 2023
flo-dup and others added 4 commits March 31, 2023 10:39
Signed-off-by: Florian Dupuy <66690739+flo-dup@users.noreply.github.com>
Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
Comment on lines 87 to 93
<artifactId>powsybl-loadflow-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-open-loadflow</artifactId>
<scope>test</scope>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can remove powsybl-loadflow-api too


import java.io.IOException;

import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;

/**
* @author Sophie Frasnedo <sophie.frasnedo at rte-france.com>
*/
public class TestBattery extends AbstractTestCaseIidm {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

public can be removed


import static com.powsybl.sld.model.coordinate.Direction.TOP;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;

/**
* @author Sophie Frasnedo <sophie.frasnedo at rte-france.com>
*/
public class TestAddBatteries extends AbstractTestCaseRaw {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

public can be removed

So-Fras added 3 commits April 3, 2023 15:47
remove public modifier

Signed-off-by: Sophie Frasnedo <93923177+So-Fras@users.noreply.github.com>
remove public modifier

Signed-off-by: Sophie Frasnedo <93923177+So-Fras@users.noreply.github.com>
remove powsybl-loadflow-api dependency

Signed-off-by: Sophie Frasnedo <93923177+So-Fras@users.noreply.github.com>
@sonarqubecloud
Copy link

sonarqubecloud bot commented Apr 3, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 2 Code Smells

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@flo-dup flo-dup merged commit 1d431aa into main Apr 4, 2023
@flo-dup flo-dup deleted the bump_to_junit5 branch April 4, 2023 06:32
BenoitJeanson pushed a commit that referenced this pull request May 2, 2023
* Bump powsybl-core to 5.2.0
* Bump to junit5
* remove olf dependency from nad
* update test reference

Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
Signed-off-by: BenoitJeanson <benoit.jeanson@rte-france.com>
BenoitJeanson pushed a commit that referenced this pull request May 4, 2023
* Bump powsybl-core to 5.2.0
* Bump to junit5
* remove olf dependency from nad
* update test reference

Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
BenoitJeanson pushed a commit that referenced this pull request May 4, 2023
* Bump powsybl-core to 5.2.0
* Bump to junit5
* remove olf dependency from nad
* update test reference

Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants