Index: openacs-4/packages/calendar-portlet/tcl/test/calendar-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/tcl/test/calendar-portlet-procs.tcl,v
diff -u -N -r1.5.2.9 -r1.5.2.10
--- openacs-4/packages/calendar-portlet/tcl/test/calendar-portlet-procs.tcl	30 Mar 2023 15:26:28 -0000	1.5.2.9
+++ openacs-4/packages/calendar-portlet/tcl/test/calendar-portlet-procs.tcl	12 Apr 2023 12:49:31 -0000	1.5.2.10
@@ -499,19 +499,18 @@
                              -calendar_name __test_portlet_calendar \
                              -package_id $package_id]
 
-        aa_section "Standard Portlet"
+        aa_section "Admin Portlet"
 
         foreach default_view {day list week month} {
             set cf [list \
                         calendar_id $calendar_id \
-                        default_view $default_view \
-                        shaded_p false
+                        default_view $default_view
                    ]
 
             set portlet [acs_sc::invoke \
                              -contract portal_datasource \
                              -operation Show \
-                             -impl [calendar_portlet::get_my_name] \
+                             -impl [calendar_admin_portlet::get_my_name] \
                              -call_args [list $cf]]
 
             aa_log "Portlet returns: [ns_quotehtml $portlet]"
@@ -520,85 +519,104 @@
                 [string first "Error in include template" $portlet] >= 0
             }
 
-            aa_true "View: $default_view - Portlet looks like HTML" \
-                [ad_looks_like_html_p $portlet]
+            aa_true "View: $default_view - Portlet contains something" {
+                [string length [string trim $portlet]] > 0
+            }
         }
 
+        foreach shaded_p {true false} {
+            set section_name "Standard Portlet"
+            if {$shaded_p} {
+                append section_name " (shaded)"
+            }
+            aa_section $section_name
 
-        aa_section "Admin Portlet"
+            foreach default_view {day list week month} {
+                set cf [list \
+                            calendar_id $calendar_id \
+                            default_view $default_view \
+                            shaded_p $shaded_p
+                       ]
 
-        foreach default_view {day list week month} {
-            set cf [list \
-                        calendar_id $calendar_id \
-                        default_view $default_view
-                   ]
+                set portlet [acs_sc::invoke \
+                                 -contract portal_datasource \
+                                 -operation Show \
+                                 -impl [calendar_portlet::get_my_name] \
+                                 -call_args [list $cf]]
 
-            set portlet [acs_sc::invoke \
-                             -contract portal_datasource \
-                             -operation Show \
-                             -impl [calendar_admin_portlet::get_my_name] \
-                             -call_args [list $cf]]
+                aa_log "Portlet returns: [ns_quotehtml $portlet]"
 
-            aa_log "Portlet returns: [ns_quotehtml $portlet]"
+                aa_false "View: $default_view - No error was returned" {
+                    [string first "Error in include template" $portlet] >= 0
+                }
 
-            aa_false "View: $default_view - No error was returned" {
-                [string first "Error in include template" $portlet] >= 0
+                aa_true "View: $default_view - Portlet contains something" {
+                    [string length [string trim $portlet]] > 0
+                }
             }
 
-            aa_true "View: $default_view - Portlet looks like HTML" \
-                [ad_looks_like_html_p $portlet]
-        }
+            set section_name "List Portlet"
+            if {$shaded_p} {
+                append section_name " (shaded)"
+            }
+            aa_section $section_name
 
-        aa_section "List Portlet"
+            foreach default_view {day list week month} {
+                set cf [list \
+                            calendar_id $calendar_id \
+                            default_view $default_view \
+                            scoped_p false \
+                            shaded_p $shaded_p \
+                           ]
 
-        foreach default_view {day list week month} {
-            set cf [list \
-                        calendar_id $calendar_id \
-                        default_view $default_view \
-                        scoped_p false \
-                        shaded_p false \
-                       ]
+                set portlet [acs_sc::invoke \
+                                 -contract portal_datasource \
+                                 -operation Show \
+                                 -impl [calendar_list_portlet::get_my_name] \
+                                 -call_args [list $cf]]
 
-            set portlet [acs_sc::invoke \
-                             -contract portal_datasource \
-                             -operation Show \
-                             -impl [calendar_list_portlet::get_my_name] \
-                             -call_args [list $cf]]
+                aa_log "Portlet returns: [ns_quotehtml $portlet]"
 
-            aa_log "Portlet returns: [ns_quotehtml $portlet]"
+                aa_false "View: $default_view - No error was returned" {
+                    [string first "Error in include template" $portlet] >= 0
+                }
 
-            aa_false "View: $default_view - No error was returned" {
-                [string first "Error in include template" $portlet] >= 0
+                aa_true "View: $default_view - Portlet contains something" {
+                    [string length [string trim $portlet]] > 0
+                }
             }
 
-            aa_true "View: $default_view - Portlet looks like HTML" \
-                [ad_looks_like_html_p $portlet]
-        }
+            set section_name "Full Portlet"
+            if {$shaded_p} {
+                append section_name " (shaded)"
+            }
+            aa_section $section_name
 
-        aa_section "Full Portlet"
+            foreach default_view {day list week month} {
+                set cf [list \
+                            calendar_id $calendar_id \
+                            default_view $default_view \
+                            scoped_p false \
+                            shaded_p $shaded_p \
+                           ]
 
-        foreach default_view {day list week month} {
-            set cf [list \
-                        calendar_id $calendar_id \
-                        default_view $default_view \
-                        scoped_p false \
-                        shaded_p false \
-                       ]
+                set portlet [acs_sc::invoke \
+                                 -contract portal_datasource \
+                                 -operation Show \
+                                 -impl [calendar_full_portlet::get_my_name] \
+                                 -call_args [list $cf]]
 
-            set portlet [acs_sc::invoke \
-                             -contract portal_datasource \
-                             -operation Show \
-                             -impl [calendar_full_portlet::get_my_name] \
-                             -call_args [list $cf]]
+                aa_log "Portlet returns: [ns_quotehtml $portlet]"
 
-            aa_log "Portlet returns: [ns_quotehtml $portlet]"
+                aa_false "View: $default_view - No error was returned" {
+                    [string first "Error in include template" $portlet] >= 0
+                }
 
-            aa_false "View: $default_view - No error was returned" {
-                [string first "Error in include template" $portlet] >= 0
+                aa_true "View: $default_view - Portlet contains something" {
+                    [string length [string trim $portlet]] > 0
+                }
             }
 
-            aa_true "View: $default_view - Portlet looks like HTML" \
-                [ad_looks_like_html_p $portlet]
         }
     } -teardown_code {
         ad_conn -set user_id $orig_user_id