MONDRIAN: Oops, missed a log file.

[git-p4: depot-paths = "//open/mondrian/": change = 10428]
pentaho · Jan 13, 2008 · 5aec00c · 5aec00c
1 parent 8aa47b6
commit 5aec00c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/testsrc/main/mondrian/xmla/XmlaBasicTest.java b/testsrc/main/mondrian/xmla/XmlaBasicTest.java
@@ -274,7 +274,7 @@ public void testMDFunction() throws Exception {
      * @throws Exception on error
      */
     public void testMDFunctions() throws Exception {
-        if (Util.PreJdk15) {
+        if (Util.PreJdk15 || Util.Retrowoven) {
             // MDSCHEMA_FUNCTIONS produces different output in JDK 1.4.
             return;
         }
@@ -297,7 +297,7 @@ public void testMDFunctions() throws Exception {
      * @throws Exception on error
      */
     public void testMDFunctionsJdk14() throws Exception {
-        if (!Util.PreJdk15) {
+        if (!(Util.PreJdk15 || Util.Retrowoven)) {
             // MDSCHEMA_FUNCTIONS produces different output in JDK 1.4.
             return;
         }

diff --git a/testsrc/main/mondrian/xmla/XmlaExcelXPTest.ref.xml b/testsrc/main/mondrian/xmla/XmlaExcelXPTest.ref.xml
@@ -3228,13 +3228,6 @@ The default value for this property is an empty string.</PropertyDescription>
                                     <LNum name="[Time].[LEVEL_NUMBER]"/>
                                     <DisplayInfo name="[Time].[DISPLAY_INFO]"/>
                                 </HierarchyInfo>
-                                <HierarchyInfo name="Time.Weekly">
-                                    <UName name="[Time.Weekly].[MEMBER_UNIQUE_NAME]"/>
-                                    <Caption name="[Time.Weekly].[MEMBER_CAPTION]"/>
-                                    <LName name="[Time.Weekly].[LEVEL_UNIQUE_NAME]"/>
-                                    <LNum name="[Time.Weekly].[LEVEL_NUMBER]"/>
-                                    <DisplayInfo name="[Time.Weekly].[DISPLAY_INFO]"/>
-                                </HierarchyInfo>
                                 <HierarchyInfo name="Product">
                                     <UName name="[Product].[MEMBER_UNIQUE_NAME]"/>
                                     <Caption name="[Product].[MEMBER_CAPTION]"/>
@@ -3429,13 +3422,6 @@ The default value for this property is an empty string.</PropertyDescription>
                                     <LNum>0</LNum>
                                     <DisplayInfo>4</DisplayInfo>
                                     </Member>
-                                    <Member Hierarchy="Time.Weekly">
-                                    <UName>[Time.Weekly].[All Time.Weeklys].[1997]</UName>
-                                    <Caption>1997</Caption>
-                                    <LName>[Time.Weekly].[Year]</LName>
-                                    <LNum>1</LNum>
-                                    <DisplayInfo>52</DisplayInfo>
-                                    </Member>
                                     <Member Hierarchy="Product">
                                     <UName>[Product].[All Products]</UName>
                                     <Caption>All Products</Caption>