Skip to content

Commit

Permalink
Merge pull request #41 from mendix/release/9.3.0
Browse files Browse the repository at this point in the history
[UIA-434] Upgraded to Mendix version 9.18.0 for Mendix 10 compatibility
  • Loading branch information
MxMurshed authored Apr 14, 2023
2 parents ad34240 + be7e9ef commit bcaaa68
Show file tree
Hide file tree
Showing 123 changed files with 17,542 additions and 13,006 deletions.
2 changes: 1 addition & 1 deletion pom.xml
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
Binary file not shown.
1 change: 1 addition & 0 deletions src/javasource/system/actions/VerifyPassword.java
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
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
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
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
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
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
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
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
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
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

0 comments on commit bcaaa68

Please sign in to comment.