diff --git a/modules/jfx.incubator.richtext/src/main/java/jfx/incubator/scene/control/richtext/CodeArea.java b/modules/jfx.incubator.richtext/src/main/java/jfx/incubator/scene/control/richtext/CodeArea.java
index e35231651ba..3ee442abc5c 100644
--- a/modules/jfx.incubator.richtext/src/main/java/jfx/incubator/scene/control/richtext/CodeArea.java
+++ b/modules/jfx.incubator.richtext/src/main/java/jfx/incubator/scene/control/richtext/CodeArea.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
  */
 package jfx.incubator.scene.control.richtext;
 
+import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.util.List;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
@@ -45,6 +47,7 @@
 import javafx.scene.control.Labeled;
 import javafx.scene.text.Font;
 import com.sun.jfx.incubator.scene.control.richtext.Params;
+import com.sun.jfx.incubator.scene.control.richtext.StringBuilderStyledOutput;
 import com.sun.jfx.incubator.scene.control.richtext.util.RichUtils;
 import jfx.incubator.scene.control.richtext.model.CodeTextModel;
 import jfx.incubator.scene.control.richtext.model.StyledTextModel;
@@ -413,20 +416,23 @@ public StyleableProperty<Number> getStyleableProperty(CodeArea n) {
     }
 
     /**
-     * Returns plain text.
+     * Returns plain text.  This method returns an empty string when the model is {@code null}.
      * @return plain text
      */
     public final String getText() {
-        // TODO or use save(DataFormat, Writer) ?
         StyledTextModel m = getModel();
-        StringBuilder sb = new StringBuilder(4096);
-        int sz = m.size();
-        for(int i=0; i<sz; i++) {
-            String s = m.getPlainText(i);
-            sb.append(s);
-            sb.append('\n');
+        if (m == null) {
+            return "";
+        }
+        TextPos end = m.getDocumentEnd();
+        try (StringBuilderStyledOutput out = new StringBuilderStyledOutput()) {
+            out.setLineSeparator("\n");
+            m.export(TextPos.ZERO, end, out);
+            return out.toString();
+        } catch (IOException e) {
+            // should not happen
+            throw new UncheckedIOException(e);
         }
-        return sb.toString();
     }
 
     /**
diff --git a/modules/jfx.incubator.richtext/src/main/java/jfx/incubator/scene/control/richtext/model/StyledTextModel.java b/modules/jfx.incubator.richtext/src/main/java/jfx/incubator/scene/control/richtext/model/StyledTextModel.java
index 2b97589b17e..6f315ff9b74 100644
--- a/modules/jfx.incubator.richtext/src/main/java/jfx/incubator/scene/control/richtext/model/StyledTextModel.java
+++ b/modules/jfx.incubator.richtext/src/main/java/jfx/incubator/scene/control/richtext/model/StyledTextModel.java
@@ -550,25 +550,31 @@ public final Marker getMarker(TextPos pos) {
      */
     public final TextPos clamp(TextPos p) {
         Objects.nonNull(p);
+        int len;
         int ct = size();
         int ix = p.index();
         if (ix < 0) {
             return TextPos.ZERO;
         } else if (ix < ct) {
-            int len = getParagraphLength(ix);
+            len = getParagraphLength(ix);
             if (p.offset() < len) {
                 return p;
             }
-            return TextPos.ofLeading(ix, len);
         } else {
             if (ct == 0) {
                 return TextPos.ZERO;
             } else {
                 ix = ct - 1;
-                int len = getParagraphLength(ix);
-                return TextPos.ofLeading(ix, len);
+                len = getParagraphLength(ix);
             }
         }
+
+        int cix = len - 1;
+        if (cix < 0) {
+            return TextPos.ofLeading(ix, len);
+        } else {
+            return new TextPos(ix, len, cix, false);
+        }
     }
 
     /**
diff --git a/modules/jfx.incubator.richtext/src/test/addExports b/modules/jfx.incubator.richtext/src/test/addExports
index bd6ff3e0806..5da465f18d6 100644
--- a/modules/jfx.incubator.richtext/src/test/addExports
+++ b/modules/jfx.incubator.richtext/src/test/addExports
@@ -1,6 +1,7 @@
 --add-exports javafx.base/com.sun.javafx=ALL-UNNAMED
 #
 --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.font=ALL-UNNAMED
 --add-exports javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED
 --add-exports javafx.graphics/com.sun.javafx.perf=ALL-UNNAMED
 --add-exports javafx.graphics/com.sun.javafx.scene.text=ALL-UNNAMED
diff --git a/modules/jfx.incubator.richtext/src/test/java/test/jfx/incubator/scene/control/richtext/CodeAreaTest.java b/modules/jfx.incubator.richtext/src/test/java/test/jfx/incubator/scene/control/richtext/CodeAreaTest.java
index e62ae56b853..88b427af6e0 100644
--- a/modules/jfx.incubator.richtext/src/test/java/test/jfx/incubator/scene/control/richtext/CodeAreaTest.java
+++ b/modules/jfx.incubator.richtext/src/test/java/test/jfx/incubator/scene/control/richtext/CodeAreaTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package test.jfx.incubator.scene.control.richtext;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -32,18 +33,23 @@
 import jfx.incubator.scene.control.richtext.CodeArea;
 import jfx.incubator.scene.control.richtext.model.CodeTextModel;
 import jfx.incubator.scene.control.richtext.model.RichTextModel;
+import jfx.incubator.scene.control.richtext.skin.CodeAreaSkin;
 
 /**
  * Tests CodeArea.
  */
 public class CodeAreaTest {
+    private CodeArea control;
+
     @BeforeEach
     public void beforeEach() {
         setUncaughtExceptionHandler();
+        control = new CodeArea();
+        control.setSkin(new CodeAreaSkin(control));
     }
 
     @AfterEach
-    public void cleanup() {
+    public void afterEach() {
         removeUncaughtExceptionHandler();
     }
 
@@ -61,6 +67,29 @@ private void removeUncaughtExceptionHandler() {
         Thread.currentThread().setUncaughtExceptionHandler(null);
     }
 
+    @Test
+    public void getText() {
+        control.setText("123");
+        String s = control.getText();
+        assertEquals("123", s);
+
+        control.setText(null);
+        s = control.getText();
+        assertEquals("", s);
+
+        control.setText("1\n2\n3\n4");
+        s = control.getText();
+        assertEquals("1\n2\n3\n4", s);
+
+        control.setText("1\r\n2\r\n3\r\n4");
+        s = control.getText();
+        assertEquals("1\n2\n3\n4", s);
+
+        control.setModel(null);
+        s = control.getText();
+        assertEquals("", s);
+    }
+
     /** can set a null and non-null CodeTextModel */
     @Test
     public void nullModel() {
diff --git a/modules/jfx.incubator.richtext/src/test/java/test/com/sun/jfx/incubator/scene/control/richtext/TestRichTextArea.java b/modules/jfx.incubator.richtext/src/test/java/test/jfx/incubator/scene/control/richtext/RichTextAreaTest.java
similarity index 53%
rename from modules/jfx.incubator.richtext/src/test/java/test/com/sun/jfx/incubator/scene/control/richtext/TestRichTextArea.java
rename to modules/jfx.incubator.richtext/src/test/java/test/jfx/incubator/scene/control/richtext/RichTextAreaTest.java
index 1fe9bb56b8e..37076509e37 100644
--- a/modules/jfx.incubator.richtext/src/test/java/test/com/sun/jfx/incubator/scene/control/richtext/TestRichTextArea.java
+++ b/modules/jfx.incubator.richtext/src/test/java/test/jfx/incubator/scene/control/richtext/RichTextAreaTest.java
@@ -23,17 +23,61 @@
  * questions.
  */
 
-package test.com.sun.jfx.incubator.scene.control.richtext;
+package test.jfx.incubator.scene.control.richtext;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import com.sun.jfx.incubator.scene.control.richtext.VFlow;
 import jfx.incubator.scene.control.richtext.RichTextArea;
 import jfx.incubator.scene.control.richtext.RichTextAreaShim;
+import jfx.incubator.scene.control.richtext.SelectionSegment;
+import jfx.incubator.scene.control.richtext.TextPos;
+import jfx.incubator.scene.control.richtext.model.StyleAttributeMap;
+import jfx.incubator.scene.control.richtext.skin.RichTextAreaSkin;
 
 /**
  * Tests RichTextArea control.
  */
-public class TestRichTextArea {
+public class RichTextAreaTest {
+    private RichTextArea control;
+
+    @BeforeEach
+    public void beforeEach() {
+        control = new RichTextArea();
+        control.setSkin(new RichTextAreaSkin(control));
+    }
+
+    @AfterEach
+    public void afterEach() {
+    }
+
+    @Test
+    public void execute() {
+        control.appendText("a");
+        control.execute(RichTextArea.Tag.SELECT_ALL);
+
+        SelectionSegment sel = control.getSelection();
+        TextPos end = control.getDocumentEnd();
+        assertNotNull(end);
+        assertEquals(TextPos.ZERO, sel.getMin());
+        assertEquals(end, sel.getMax());
+    }
+
+    @Test
+    public void selectAll() {
+        control.appendText("a");
+        control.selectAll();
+
+        SelectionSegment sel = control.getSelection();
+        TextPos end = control.getDocumentEnd();
+        assertNotNull(end);
+        assertEquals(TextPos.ZERO, sel.getMin());
+        assertEquals(end, sel.getMax());
+    }
+
     /**
      * Tests the shim.
      */
diff --git a/modules/jfx.incubator.richtext/src/test/java/test/jfx/incubator/scene/control/richtext/model/TestRichTextModel.java b/modules/jfx.incubator.richtext/src/test/java/test/jfx/incubator/scene/control/richtext/model/TestRichTextModel.java
index c0bfff3f0a4..80fe8ad2553 100644
--- a/modules/jfx.incubator.richtext/src/test/java/test/jfx/incubator/scene/control/richtext/model/TestRichTextModel.java
+++ b/modules/jfx.incubator.richtext/src/test/java/test/jfx/incubator/scene/control/richtext/model/TestRichTextModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package test.jfx.incubator.scene.control.richtext.model;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
@@ -35,7 +36,6 @@
 import jfx.incubator.scene.control.richtext.model.RichParagraph;
 import jfx.incubator.scene.control.richtext.model.RichTextModel;
 import jfx.incubator.scene.control.richtext.model.RichTextModelShim;
-import jfx.incubator.scene.control.richtext.model.StyleAttribute;
 import jfx.incubator.scene.control.richtext.model.StyleAttributeMap;
 import jfx.incubator.scene.control.richtext.model.StyledInput;
 import jfx.incubator.scene.control.richtext.model.StyledSegment;
@@ -253,4 +253,23 @@ private static String checkEquals(List<RichParagraph> expected, List<RichParagra
 
         return null;
     }
+
+    private RichTextModel createModel(String text) {
+        RichTextModel m = new RichTextModel();
+        m.replace(null, TextPos.ZERO, TextPos.ZERO, text, false);
+        return m;
+    }
+
+    @Test
+    public void clamp() {
+        RichTextModel m = createModel("1\n2222\n");
+        assertEquals(TextPos.ofLeading(0, 0), m.clamp(TextPos.ofLeading(0, 0)));
+        assertEquals(new TextPos(0, 1, 0, false), m.clamp(TextPos.ofLeading(0, 100)));
+
+        assertEquals(TextPos.ofLeading(1, 0), m.clamp(TextPos.ofLeading(1, 0)));
+        assertEquals(TextPos.ofLeading(1, 1), m.clamp(TextPos.ofLeading(1, 1)));
+        assertEquals(new TextPos(1, 4, 3, false), m.clamp(TextPos.ofLeading(1, 100)));
+
+        assertEquals(TextPos.ofLeading(2, 0), m.clamp(TextPos.ofLeading(2, 100)));
+    }
 }