/*******************************************************************************
 * Copyright (c) 1998, 2008 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the 
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
 * which accompanies this distribution. 
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at 
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     dtwelves - Sept 2008 creation of MOXy OXM SRG
 ******************************************************************************/  
package org.eclipse.persistence.testing.oxm;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestResult;
import junit.framework.TestSuite;
import org.eclipse.persistence.testing.oxm.inheritance.InheritanceTestSuite;
import org.eclipse.persistence.testing.oxm.xmlmarshaller.XMLMarshallerTestSuite;
import org.eclipse.persistence.testing.oxm.descriptor.rootelement.RootElementTestSuite;
import org.eclipse.persistence.testing.oxm.xpathengine.XPathEngineTestSuite;
import org.eclipse.persistence.testing.oxm.xmllogin.XMLLoginTestSuite;
import org.eclipse.persistence.testing.oxm.converter.ConverterTestSuite;

public class OXMSRGTestSuite extends TestCase {
    public OXMSRGTestSuite(String name) {
        super(name);
    }

    public static void main(String[] args) {
        junit.textui.TestRunner.main(new String[] { "-c", "org.eclipse.persistence.testing.oxm.OXMSRGTestSuite" });
    }

    public static Test suite() {
        TestSuite suite = new TestSuite("OXM SRG Test Suite");

        //suite.addTest(InheritanceTestSuite.suite());
        suite.addTest(XMLMarshallerTestSuite.suite()); 
        suite.addTest(RootElementTestSuite.suite());
        suite.addTest(XPathEngineTestSuite.suite());
        suite.addTest(XMLLoginTestSuite.suite());
        //suite.addTest(ConverterTestSuite.suite());
     
        return suite;
    }
}
@@ -938,36 +938,197 @@
 ritance.
-InheritanceTestSuite
+*;%0D%0Aimport org.eclipse.persistence.testing.oxm.inheritance.typetests.TypeTestSuite;%0D%0Aimport org.eclipse.persistence.testing.oxm.inheritance.classextractor.CarClassExtractorTestCases
 ;%0D%0Aimpor
@@ -1496,34 +1496,116 @@
 nverter.
-ConverterTestSuite
+*;%0D%0Aimport org.eclipse.persistence.testing.oxm.converter.typesafeenum.TypeSafeEnumConverterTestCases
 ;%0D%0A%0D%0Apub
@@ -1998,62 +1998,848 @@
 );%0D%0A
-%0D%0A        //suite.addTest(InheritanceTestSuite.suite()
+        //line 40 and 55 are commented out due to test logic validation error, add individual inheritance and converter tests instead%0D%0A        //suite.addTest(InheritanceTestSuite.suite());%0D%0A        //suite.addTestSuite(InheritanceTestCases.class);%0D%0A        suite.addTestSuite(InheritanceMissingDescriptorTestCases.class);%0D%0A        suite.addTestSuite(InheritanceCarTestCases.class);%0D%0A        suite.addTestSuite(InheritanceCarDiffPrefixTestCases.class);%0D%0A        suite.addTestSuite(InheritanceCarNoPrefixTestCases.class);%0D%0A        suite.addTestSuite(InheritanceVehicleTestCases.class);%0D%0A        suite.addTestSuite(InheritanceVehicleDiffPrefixTestCases.class);%0D%0A        suite.addTestSuite(InheritanceDiffPrefixNonRootTestCases.class);%0D%0A        suite.addTest(TypeTestSuite.suite());%0D%0A        suite.addTestSuite(CarClassExtractorTestCases.class
 );%0D%0A
@@ -3113,16 +3113,143 @@
 ;%0D%0A     
+   //suite.addTestSuite(ObjectTypeConverterTestCases.class);%0D%0A        suite.addTestSuite(TypeSafeEnumConverterTestCases.class);
 %0D%0A      

Comment out two tests which have validation error in ASKERNEL SRG per Yiping's request