You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2021/11/04 07:16:32 UTC

[cxf-fediz] branch master updated (2d4d0e5 -> 2214002)

This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git.


    from 2d4d0e5  Fixing buildtools
     new a8b5f30  update maven-dependency-plugin to 3.2.0
     new 2214002  fediz-systests-oidc: fix pmd warning

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                            |  4 +--
 .../cxf/fediz/systests/oidc/AbstractOIDCTest.java  | 34 +++++++++++-----------
 2 files changed, 19 insertions(+), 19 deletions(-)

[cxf-fediz] 01/02: update maven-dependency-plugin to 3.2.0

Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git

commit a8b5f300724084634322ca4d7aeaf4fb6c2c03a5
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Thu Nov 4 10:10:55 2021 +0300

    update maven-dependency-plugin to 3.2.0
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7fb4833..c27a41a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -376,7 +376,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -491,7 +491,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
-                    <version>3.14.0</version>
+                    <version>3.15.0</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.cxf.build-utils</groupId>

[cxf-fediz] 02/02: fediz-systests-oidc: fix pmd warning

Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git

commit 22140022cba22bfcae1709d1250ef408e53d3d34
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Thu Nov 4 10:14:48 2021 +0300

    fediz-systests-oidc: fix pmd warning
---
 .../cxf/fediz/systests/oidc/AbstractOIDCTest.java  | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java
index 3513cdd..70e23f9 100644
--- a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java
+++ b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/AbstractOIDCTest.java
@@ -264,8 +264,8 @@ abstract class AbstractOIDCTest {
     private static String getClientIdByName(String clientName, HtmlPage registeredClientsPage) {
         final HtmlTable table = registeredClientsPage.getHtmlElementById("registered_clients");
         for (final HtmlTableRow row : table.getRows()) {
-            if (clientName.equals(row.getCell(0).asText())) {
-                final String clientId = row.getCell(1).asText();
+            if (clientName.equals(row.getCell(0).asNormalizedText())) {
+                final String clientId = row.getCell(1).asNormalizedText();
                 assertNotNull(clientId);
                 return clientId;
             }
@@ -275,8 +275,8 @@ abstract class AbstractOIDCTest {
 
     private static String getClientSecret(final HtmlPage registeredClientPage, String clientId) throws IOException {
         final HtmlTable table = registeredClientPage.getHtmlElementById("client");
-        assertEquals(clientId, table.getCellAt(1, 0).asText());
-        return table.getCellAt(1, 2).asText();
+        assertEquals(clientId, table.getCellAt(1, 0).asNormalizedText());
+        return table.getCellAt(1, 2).asNormalizedText();
     }
 
     private static HtmlPage registerConfidentialClient(HtmlPage registerPage,
@@ -319,9 +319,9 @@ abstract class AbstractOIDCTest {
 
             // Get the client identifier
             HtmlTable table = registeredClientsPage.getHtmlElementById("registered_clients");
-            String clientId = table.getCellAt(1, 1).asText();
+            String clientId = table.getCellAt(1, 1).asNormalizedText();
             assertNotNull(clientId);
-            String clientId2 = table.getCellAt(2, 1).asText();
+            String clientId2 = table.getCellAt(2, 1).asNormalizedText();
             assertNotNull(clientId2);
 
             // Now go to the specific client page
@@ -367,18 +367,18 @@ abstract class AbstractOIDCTest {
             assertEquals(table.getRows().size(), 3);
 
             // Now check the first client
-            String clientId = table.getCellAt(1, 1).asText();
+            String clientId = table.getCellAt(1, 1).asNormalizedText();
             assertNotNull(clientId);
 
             // Check the Date
-            String date = table.getCellAt(1, 2).asText();
+            String date = table.getCellAt(1, 2).asNormalizedText();
             SimpleDateFormat dateFormat = new SimpleDateFormat("dd MMM yyyy", Locale.US);
             dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
             assertEquals(dateFormat.format(new Date()), date);
 
             // Check the redirect URI
-            String redirectURI = table.getCellAt(1, 3).asText().trim(); // <br/>
-            assertTrue(REDIRECT_URL.equals(redirectURI));
+            String redirectURI = table.getCellAt(1, 3).asNormalizedText().trim(); // <br/>
+            assertEquals(REDIRECT_URL, redirectURI);
         }
     }
 
@@ -414,7 +414,7 @@ abstract class AbstractOIDCTest {
             assertEquals("2 clients", table.getRows().size(), 3);
             boolean updatedClientFound = false;
             for (final HtmlTableRow row : table.getRows()) {
-                if (newClientName.equals(row.getCell(0).asText())) {
+                if (newClientName.equals(row.getCell(0).asNormalizedText())) {
                     updatedClientFound = true;
                     break;
                 }
@@ -539,7 +539,7 @@ abstract class AbstractOIDCTest {
             // Now try to register a new client
             HtmlPage errorPage = registerConfidentialClient(registerPage, "asfxyz", "https://127.0.0.1//",
                           "https://cxf.apache.org", "https://localhost:12345");
-            assertTrue(errorPage.asText().contains("Invalid Client Registration"));
+            assertTrue(errorPage.asNormalizedText().contains("Invalid Client Registration"));
         }
     }
 
@@ -552,7 +552,7 @@ abstract class AbstractOIDCTest {
             // Now try to register a new client
             HtmlPage errorPage = registerConfidentialClient(registerPage, "asfxyz", "https://127.0.0.1#fragment",
                           "https://cxf.apache.org", "https://localhost:12345");
-            assertTrue(errorPage.asText().contains("Invalid Client Registration"));
+            assertTrue(errorPage.asNormalizedText().contains("Invalid Client Registration"));
         }
     }
 
@@ -565,7 +565,7 @@ abstract class AbstractOIDCTest {
             // Now try to register a new client
             HtmlPage errorPage = registerConfidentialClient(registerPage, "asfxyz", "https://127.0.0.1/",
                           "https://cxf.apache.org//", "https://localhost:12345");
-            assertTrue(errorPage.asText().contains("Invalid Client Registration"));
+            assertTrue(errorPage.asNormalizedText().contains("Invalid Client Registration"));
         }
     }
 
@@ -578,7 +578,7 @@ abstract class AbstractOIDCTest {
             // Now try to register a new client
             HtmlPage errorPage = registerConfidentialClient(registerPage, "asfxyz", "https://127.0.0.1/",
                           "https://cxf.apache.org/", "https://localhost:12345//");
-            assertTrue(errorPage.asText().contains("Invalid Client Registration"));
+            assertTrue(errorPage.asNormalizedText().contains("Invalid Client Registration"));
         }
     }
 
@@ -591,7 +591,7 @@ abstract class AbstractOIDCTest {
             // Now try to register a new client
             HtmlPage errorPage = registerConfidentialClient(registerPage, "asfxyz", "https://127.0.0.1",
                           "https://cxf.apache.org#fragment", "https://localhost:12345");
-            assertTrue(errorPage.asText().contains("Invalid Client Registration"));
+            assertTrue(errorPage.asNormalizedText().contains("Invalid Client Registration"));
         }
     }
 
@@ -630,7 +630,7 @@ abstract class AbstractOIDCTest {
             // Register a client with an unsupported TLD
             HtmlPage errorPage = registerConfidentialClient(registerPage, "tld2", "https://www.apache.corp2",
                                                    "https://cxf.apache.org", "https://localhost:12345");
-            assertTrue(errorPage.asText().contains("Invalid Client Registration"));
+            assertTrue(errorPage.asNormalizedText().contains("Invalid Client Registration"));
 
             // Delete the first client above
             deleteClient(webClient.getPage(clientsUrl.resolveTemplate("path", clientId).build().toURL()));