Skip to content

[UIA-434] Upgraded to Mendix version 9.18.0 for Mendix 10 compatibility #41

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

Merged
MxMurshed merged 1 commit into from
Apr 14, 2023
Merged

[UIA-434] Upgraded to Mendix version 9.18.0 for Mendix 10 compatibility #41

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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.mendix.UnitTesting</groupId>
<artifactId>UnitTesting</artifactId>
<version>9.1.0</version>
<version>9.3.0</version>

<repositories>
<repository>
Expand Down
Binary file modified src/UnitTesting.mpr
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions src/javasource/system/actions/VerifyPassword.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public java.lang.Boolean executeAction() throws Exception

/**
* Returns a string representation of this action
* @return a string representation of this action
*/
@java.lang.Override
public java.lang.String toString()
Expand Down
4 changes: 2 additions & 2 deletions src/javasource/unittesting/TestManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ private void runMfTearDown(TestSuite testSuite)

// Either we had a teardown a teardown or
if (testSuite.getAutoRollbackMFs() && tearDownContext != null) {
tearDownContext.rollbackTransAction();
tearDownContext.rollbackTransaction();
}

// Make sure we clean setupContext after running this test/suite
Expand Down Expand Up @@ -396,7 +396,7 @@ else if (Core.getReturnType(mf).getType() != IDataType.DataTypeEnum.Boolean &&
}
finally {
if (testSuite.getAutoRollbackMFs())
mfContext.rollbackTransAction();
mfContext.rollbackTransaction();
test.setLastStep(lastStep);
test.setReadableTime((start > 10000 ? Math.round(start / 1000) + " seconds" : start + " milliseconds"));
commitSilent(test);
Expand Down
1 change: 1 addition & 0 deletions src/javasource/unittesting/actions/FindAllUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public java.lang.Boolean executeAction() throws Exception

/**
* Returns a string representation of this action
* @return a string representation of this action
*/
@java.lang.Override
public java.lang.String toString()
Expand Down
1 change: 1 addition & 0 deletions src/javasource/unittesting/actions/ReportStepJava.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public java.lang.Boolean executeAction() throws Exception

/**
* Returns a string representation of this action
* @return a string representation of this action
*/
@java.lang.Override
public java.lang.String toString()
Expand Down
3 changes: 2 additions & 1 deletion src/javasource/unittesting/actions/RunAllUnitTestsWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public RunAllUnitTestsWrapper(IContext context, IMendixObject testRun)
@java.lang.Override
public java.lang.Boolean executeAction() throws Exception
{
this.testRun = __testRun == null ? null : unittesting.proxies.TestSuite.initialize(getContext(), __testRun);
this.testRun = this.__testRun == null ? null : unittesting.proxies.TestSuite.initialize(getContext(), __testRun);

// BEGIN USER CODE
try {
Expand All @@ -47,6 +47,7 @@ public java.lang.Boolean executeAction() throws Exception

/**
* Returns a string representation of this action
* @return a string representation of this action
*/
@java.lang.Override
public java.lang.String toString()
Expand Down
3 changes: 2 additions & 1 deletion src/javasource/unittesting/actions/RunUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public RunUnitTest(IContext context, IMendixObject unitTest)
@java.lang.Override
public java.lang.Boolean executeAction() throws Exception
{
this.unitTest = __unitTest == null ? null : unittesting.proxies.UnitTest.initialize(getContext(), __unitTest);
this.unitTest = this.__unitTest == null ? null : unittesting.proxies.UnitTest.initialize(getContext(), __unitTest);

// BEGIN USER CODE
TestManager.instance().runTest(getContext(), unitTest);
Expand All @@ -38,6 +38,7 @@ public java.lang.Boolean executeAction() throws Exception

/**
* Returns a string representation of this action
* @return a string representation of this action
*/
@java.lang.Override
public java.lang.String toString()
Expand Down
1 change: 1 addition & 0 deletions src/javasource/unittesting/actions/StartRemoteApiServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public java.lang.Boolean executeAction() throws Exception

/**
* Returns a string representation of this action
* @return a string representation of this action
*/
@java.lang.Override
public java.lang.String toString()
Expand Down
1 change: 1 addition & 0 deletions src/javasource/unittesting/actions/StartRunAllSuites.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public java.lang.Boolean executeAction() throws Exception

/**
* Returns a string representation of this action
* @return a string representation of this action
*/
@java.lang.Override
public java.lang.String toString()
Expand Down
1 change: 1 addition & 0 deletions src/javasource/unittesting/actions/ThrowAssertionFailed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public java.lang.Boolean executeAction() throws Exception

/**
* Returns a string representation of this action
* @return a string representation of this action
*/
@java.lang.Override
public java.lang.String toString()
Expand Down
4 changes: 2 additions & 2 deletions src/project-settings.user.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"suppressions": [],
"suppressAppStoreWarnings": false,
"showSuppressionInfo": true,
"type": "Mendix.Modeler.Suppressions.SuppressionRules, Mendix.Modeler.Core, Version=9.0.5.17836, Culture=neutral, PublicKeyToken=null"
"type": "Mendix.Modeler.Suppressions.SuppressionRules, Mendix.Modeler.Core, Version=9.18.0.0, Culture=neutral, PublicKeyToken=null"
},
{
"suppressions": [],
"disabledBestPractices": [],
"readRecommendations": [],
"suppressedRecommendations": [],
"type": "Mendix.Modeler.MxAssist.PerformanceBot.Serialization.Configuration.PerformanceBotConfiguration, Mendix.Modeler.MxAssist.PerformanceBot.Serialization, Version=9.0.5.17836, Culture=neutral, PublicKeyToken=null"
"type": "Mendix.Modeler.MxAssist.PerformanceBot.Serialization.Configuration.PerformanceBotConfiguration, Mendix.Modeler.MxAssist.PerformanceBot.Serialization, Version=9.18.0.0, Culture=neutral, PublicKeyToken=null"
}
]
}
Loading