Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 81069 invoked from network); 9 Jan 2009 07:31:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Jan 2009 07:31:52 -0000 Received: (qmail 69038 invoked by uid 500); 9 Jan 2009 07:31:45 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 69017 invoked by uid 500); 9 Jan 2009 07:31:44 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 68992 invoked by uid 99); 9 Jan 2009 07:31:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jan 2009 23:31:44 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jan 2009 07:31:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5D87E23888A5; Thu, 8 Jan 2009 23:31:21 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r732941 - in /harmony/enhanced/drlvm/trunk/src/test/regression/H6020: Child_ArrayCase.java Child_ObjectCase.java CircularClassInitTest.java Parent_ArrayCase.java Parent_ObjectCase.java Date: Fri, 09 Jan 2009 07:31:21 -0000 To: commits@harmony.apache.org From: chunrong@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090109073121.5D87E23888A5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chunrong Date: Thu Jan 8 23:31:20 2009 New Revision: 732941 URL: http://svn.apache.org/viewvc?rev=732941&view=rev Log: Refine the regression test for HARMONY-6020 Added: harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Child_ArrayCase.java harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Child_ObjectCase.java harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Parent_ArrayCase.java harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Parent_ObjectCase.java Modified: harmony/enhanced/drlvm/trunk/src/test/regression/H6020/CircularClassInitTest.java Added: harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Child_ArrayCase.java URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Child_ArrayCase.java?rev=732941&view=auto ============================================================================== --- harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Child_ArrayCase.java (added) +++ harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Child_ArrayCase.java Thu Jan 8 23:31:20 2009 @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.harmony.drlvm.tests.regression.h6020; + +public class Child_ArrayCase { + public static final Child_ArrayCase ROOT = Parent_ArrayCase.createChild(); +} + Added: harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Child_ObjectCase.java URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Child_ObjectCase.java?rev=732941&view=auto ============================================================================== --- harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Child_ObjectCase.java (added) +++ harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Child_ObjectCase.java Thu Jan 8 23:31:20 2009 @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.harmony.drlvm.tests.regression.h6020; + +class Child_ObjectCase { + public static final Child_ObjectCase ROOT = Parent_ObjectCase.createChild(); +} + Modified: harmony/enhanced/drlvm/trunk/src/test/regression/H6020/CircularClassInitTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/src/test/regression/H6020/CircularClassInitTest.java?rev=732941&r1=732940&r2=732941&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/src/test/regression/H6020/CircularClassInitTest.java (original) +++ harmony/enhanced/drlvm/trunk/src/test/regression/H6020/CircularClassInitTest.java Thu Jan 8 23:31:20 2009 @@ -21,44 +21,20 @@ public class CircularClassInitTest extends TestCase{ public static void main(String[] args) { - CircularClassInitTest.testObject(); - CircularClassInitTest.testArray(); + CircularClassInitTest.testObjectCase(); + CircularClassInitTest.testArrayCase(); System.out.println("PASSED"); } - public static void testObject() { + public static void testObjectCase() { Child_ObjectCase c = Parent_ObjectCase.createChild(); if(c.ROOT != null) { fail(); } } - public static void testArray() { + public static void testArrayCase() { Child_ArrayCase c = Parent_ArrayCase.createChild(); } } -class Parent_ObjectCase { - private static final Child_ObjectCase childCache = new Child_ObjectCase(); - - public static Child_ObjectCase createChild(){ - return childCache; - } -} - -class Child_ObjectCase { - public static final Child_ObjectCase ROOT = Parent_ObjectCase.createChild(); -} - -class Parent_ArrayCase { - private static final Child_ArrayCase[] childCache = new Child_ArrayCase[5]; - - public static Child_ArrayCase createChild(){ - return childCache[0]; - } -} - -class Child_ArrayCase { - public static final Child_ArrayCase ROOT = Parent_ArrayCase.createChild(); -} - Added: harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Parent_ArrayCase.java URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Parent_ArrayCase.java?rev=732941&view=auto ============================================================================== --- harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Parent_ArrayCase.java (added) +++ harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Parent_ArrayCase.java Thu Jan 8 23:31:20 2009 @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.harmony.drlvm.tests.regression.h6020; + +public class Parent_ArrayCase { + private static final Child_ArrayCase[] childCache = new Child_ArrayCase[5]; + + public static Child_ArrayCase createChild(){ + return childCache[0]; + } +} + Added: harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Parent_ObjectCase.java URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Parent_ObjectCase.java?rev=732941&view=auto ============================================================================== --- harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Parent_ObjectCase.java (added) +++ harmony/enhanced/drlvm/trunk/src/test/regression/H6020/Parent_ObjectCase.java Thu Jan 8 23:31:20 2009 @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.harmony.drlvm.tests.regression.h6020; + +class Parent_ObjectCase { + private static final Child_ObjectCase childCache = new Child_ObjectCase(); + + public static Child_ObjectCase createChild(){ + return childCache; + } +} +