Replace testng with junit5 for gateway ha module #62

andythsu · 2023-10-04T03:05:04Z

No description provided.

mosabua · 2023-10-04T16:37:06Z

Can you squash commits and update message to follow standard format. See https://github.com/trinodb/trino/blob/master/.github/DEVELOPMENT.md#format-git-commit-messages

mosabua · 2023-10-04T16:37:36Z

gateway-ha/pom.xml

+            <artifactId>junit-jupiter-params</artifactId>
+            <scope>test</scope>
+        </dependency>
+
        <dependency>


Remove testng

@mosabua It will throw testng exception if we remove it at this time. I think it is best to remove testng from pom once we remove all imports. We still use testng in baseapp module, and I'll fix it after this PR

No .. lets clean it up in this module completely. Remove all imports in this module and if necessary override the surefire config. Lets clean it up for real... that way nobody can accidentally add a testng test in again

andythsu · 2023-10-04T18:55:42Z

Can you squash commits and update message to follow standard format. See https://github.com/trinodb/trino/blob/master/.github/DEVELOPMENT.md#format-git-commit-messages

I've fixed the commit messages. Let me know if it needs to fixed again

andythsu · 2023-10-06T03:17:00Z

pom.xml

-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-testng</artifactId>
-                        <version>${dep.plugin.surefire.version}</version>
-                    </dependency>


have to get rid of testng from parent pom otherwise gateway-ha will inherit and throw exception because we removed all testng related deps from gateway-ha

andythsu · 2023-10-06T03:17:54Z

proxyserver/pom.xml

+                        <version>${dep.plugin.surefire.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>


have to add testng dep to this module because it no longer inherits this from parent pom. Can get rid of this once we migrate this module from testng to junit5

willmostly

Looks good overall, a few minor comments. The Ordering could be left in and fixed in a separate PR, I just wanted to note it while we're here.

willmostly · 2023-10-06T17:19:01Z

gateway-ha/src/test/java/io/trino/gateway/ha/TestGatewayHaMultipleBackend.java

@@ -1,17 +1,21 @@
 package io.trino.gateway.ha;

+import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.TestInstance.*;


Explicitly import what is needed, don't use .*

willmostly · 2023-10-06T17:23:10Z

gateway-ha/src/test/java/io/trino/gateway/ha/router/TestHaGatewayManager.java

@@ -1,21 +1,28 @@
 package io.trino.gateway.ha.router;

+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.TestInstance.*;


Same as above - use explicit imports.

willmostly · 2023-10-06T17:35:13Z

gateway-ha/src/test/java/io/trino/gateway/ha/router/TestHaGatewayManager.java


-@Test
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+@TestInstance(Lifecycle.PER_CLASS)


These test methods can't be run independently - we should rework them to test from a consistent starting point and use Lifecycle.PER_METHOD or a @BeforeEach method to reset the state of the backend DB.

Should this be taken care of in another PR?

Yes, that would be cleaner.

willmostly · 2023-10-06T17:35:32Z

gateway-ha/src/test/java/io/trino/gateway/ha/router/TestHaRoutingManager.java

@@ -1,23 +1,26 @@
 package io.trino.gateway.ha.router;

+import static org.junit.jupiter.api.TestInstance.*;


willmostly · 2023-10-06T17:37:55Z

gateway-ha/src/test/java/io/trino/gateway/ha/router/TestResourceGroupsManager.java

@@ -35,6 +42,7 @@ public void setUp() {
  }

  @Test
+  @Order(1)


Same comment as above w.r.t. Ordering

willmostly · 2023-10-06T17:43:35Z

gateway-ha/src/test/java/io/trino/gateway/ha/router/TestRoutingGroupSelector.java

  }

  //Todo: The functionality of reading the file before every request needs to be smarter
-  @Test(enabled = false)
+  @Disabled


Can this be enabled?

This was initially disabled. Will have to look into why it was disabled, but I think it's out of the scope of this PR

yeah, looking again I guess it is related to that threadsafety issue. I have a PR open to fix that, so you can ignore my comment here.

willmostly · 2023-10-06T17:51:31Z

gateway-ha/src/test/java/io/trino/gateway/ha/router/TestTcpChecks.java

@@ -47,15 +51,15 @@ public void testConnectionCheckerSucess() throws
    ConnectionChecker checker = new ConnectionChecker();
    ConnectionCheck check = spy(checker.getChecker("abc", 1111, checkInterval, 1, 0));
    doReturn(mock(Socket.class)).when(check).makeSocket("abc", 1111);
-    Assert.assertTrue(check.tcpCheck() == ConnectionCheck.TCP_CHECK_SUCCESS);
+    assertTrue(check.tcpCheck() == ConnectionCheck.TCP_CHECK_SUCCESS);


Why not use AssertEquals and AssertNotEqual vs using == and !=?

willmostly · 2023-10-06T18:05:00Z

gateway-ha/src/test/java/io/trino/gateway/ha/router/TestRoutingGroupSelector.java

  }

  //Todo: The functionality of reading the file before every request needs to be smarter
-  @Test(enabled = false)
+  @Disabled


Can this be enabled?

willmostly · 2023-10-06T18:06:01Z

gateway-ha/src/test/java/io/trino/gateway/ha/router/TestTcpChecks.java

@@ -47,15 +51,15 @@ public void testConnectionCheckerSucess() throws
    ConnectionChecker checker = new ConnectionChecker();
    ConnectionCheck check = spy(checker.getChecker("abc", 1111, checkInterval, 1, 0));
    doReturn(mock(Socket.class)).when(check).makeSocket("abc", 1111);
-    Assert.assertTrue(check.tcpCheck() == ConnectionCheck.TCP_CHECK_SUCCESS);
+    assertTrue(check.tcpCheck() == ConnectionCheck.TCP_CHECK_SUCCESS);


Can AssertEquals/AssertNotEqual be used here and below instead of ==/!=?

andythsu · 2023-10-06T21:12:50Z

got rid of importing .*; and used assertEquals whenever possible.

mosabua

Looks good now. Thank you. We will clean this up even more over time.

mosabua · 2023-10-10T15:13:45Z

This PR fails on GHA and also locally for me.

I get

TestTcpChecks.testConnectionCheckerFailures:104 expected: <io.trino.gateway.ha.router.ConnectionCheck@40a923e6> but was: <io.trino.gateway.ha.router.ConnectionCheck@7414167a>

Can you look at that @andythsu ?

willmostly

One change, then this should be good to merge

willmostly · 2023-10-10T20:20:00Z

gateway-ha/src/test/java/io/trino/gateway/ha/router/TestTcpChecks.java

-    Assert.assertFalse(checkObj == checker.getChecker(host, port, checkInterval + 10,
+    assertEquals(checkObj, checker.getChecker(host, port, checkInterval + 10,


@andythsu i believe the test failure was right here. The original was assertFalse(checkObj == checker...), so these should have been changed to assertNotEquals. The intent of the test should be clearer this way :)

ahh I see. Got tripped over the assertFalse and ==

good catch! Thanks @willmostly

mosabua

Great work. All green and good to go now. Merging.

cla-bot bot added the cla-signed label Oct 4, 2023

mosabua reviewed Oct 4, 2023

View reviewed changes

andythsu force-pushed the remove_testng_for_gateway_ha branch from b246636 to 12b14c8 Compare October 4, 2023 18:54

andythsu force-pushed the remove_testng_for_gateway_ha branch from 12b14c8 to a2da2a3 Compare October 6, 2023 03:16

andythsu commented Oct 6, 2023

View reviewed changes

willmostly requested changes Oct 6, 2023

View reviewed changes

andythsu force-pushed the remove_testng_for_gateway_ha branch from a2da2a3 to 0a9be1f Compare October 6, 2023 21:12

mosabua approved these changes Oct 10, 2023

View reviewed changes

willmostly requested changes Oct 10, 2023

View reviewed changes

andythsu force-pushed the remove_testng_for_gateway_ha branch 2 times, most recently from cc4e5d1 to 1d79314 Compare October 11, 2023 03:03

Replace testng with junit5 for gateway-ha module

796c8ec

andythsu force-pushed the remove_testng_for_gateway_ha branch from 1d79314 to 796c8ec Compare October 11, 2023 03:05

mosabua approved these changes Oct 11, 2023

View reviewed changes

mosabua merged commit ef77b29 into trinodb:main Oct 11, 2023
2 checks passed

mosabua mentioned this pull request Nov 21, 2023

Add release notes for Trino Gateway 4 #73

Merged

andythsu deleted the remove_testng_for_gateway_ha branch September 18, 2024 20:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace testng with junit5 for gateway ha module #62

Replace testng with junit5 for gateway ha module #62

andythsu commented Oct 4, 2023

mosabua commented Oct 4, 2023

mosabua Oct 4, 2023

andythsu Oct 4, 2023

mosabua Oct 4, 2023

andythsu Oct 6, 2023

andythsu commented Oct 4, 2023 •

edited

Loading

andythsu Oct 6, 2023

andythsu Oct 6, 2023

willmostly left a comment

willmostly Oct 6, 2023

willmostly Oct 6, 2023

willmostly Oct 6, 2023

andythsu Oct 6, 2023

willmostly Oct 10, 2023

willmostly Oct 6, 2023

willmostly Oct 6, 2023

willmostly Oct 6, 2023

andythsu Oct 6, 2023

willmostly Oct 10, 2023

willmostly Oct 6, 2023

willmostly Oct 6, 2023

willmostly Oct 6, 2023

andythsu commented Oct 6, 2023

mosabua left a comment

mosabua commented Oct 10, 2023

willmostly left a comment

willmostly Oct 10, 2023

andythsu Oct 11, 2023

andythsu Oct 11, 2023

mosabua left a comment

		@@ -1,23 +1,26 @@
		package io.trino.gateway.ha.router;

		import static org.junit.jupiter.api.TestInstance.*;

		Assert.assertFalse(checkObj == checker.getChecker(host, port, checkInterval + 10,
		assertEquals(checkObj, checker.getChecker(host, port, checkInterval + 10,

Replace testng with junit5 for gateway ha module #62

Replace testng with junit5 for gateway ha module #62

Conversation

andythsu commented Oct 4, 2023

mosabua commented Oct 4, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andythsu commented Oct 4, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

willmostly left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andythsu commented Oct 6, 2023

mosabua left a comment

Choose a reason for hiding this comment

mosabua commented Oct 10, 2023

willmostly left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mosabua left a comment

Choose a reason for hiding this comment

andythsu commented Oct 4, 2023 •

edited

Loading