/*******************************************************************************
 * Copyright (c) 1998, 2010 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:
 *     James Sutherland (Oracle) - initial API and implementation  
 ******************************************************************************/  
package org.eclipse.persistence.testing.models.jpa.xml.advanced;

import org.eclipse.persistence.config.DescriptorCustomizer;
import org.eclipse.persistence.descriptors.ClassDescriptor;
import org.eclipse.persistence.descriptors.changetracking.DeferredChangeDetectionPolicy;
import org.eclipse.persistence.testing.framework.junit.JUnitTestCase;

/**
 * This customizer will revert change tracking to deferred if weaving was not used.
 * @author James Sutherland
 */
public class ChangeTrackingCustomizer implements DescriptorCustomizer {
    public ChangeTrackingCustomizer() {}
    
    public void customize(ClassDescriptor descriptor) {
        if (!JUnitTestCase.isWeavingEnabled()) {
            descriptor.setObjectChangePolicy(new DeferredChangeDetectionPolicy());
        }
    }
}

@@ -998,79 +998,8 @@
 cy;%0D
-%0Aimport org.eclipse.persistence.testing.framework.junit.JUnitTestCase;%0D
 %0A%0D%0A/
@@ -1315,41 +1315,53 @@
 if (
-!JUnitTestCase.isWeavingEnabled()
+System.getProperty(%22TEST_NO_WEAVING%22) != null
 ) %7B%0D

Test fix.