Browse Source

Bug 113948 "Repackage AspectJ" (move module root suites out of default package)

tags/pre_pr_153572
mwebster 18 years ago
parent
commit
eb31ec6c3d
25 changed files with 45 additions and 16 deletions
  1. 1
    0
      ajbrowser/testsrc/org/aspectj/tools/ajbrowser/AjbrowserModuleTests.java
  2. 1
    0
      ajde/testsrc/org/aspectj/ajde/AjdeModuleTests.java
  3. 1
    1
      ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocModuleTests.java
  4. 1
    0
      asm/testsrc/org/aspectj/asm/AsmModuleTests.java
  5. 1
    0
      aspectj5rt/testsrc/org/aspectj/runtime/Aspectj5rtModuleTests.java
  6. 1
    0
      bridge/testsrc/org/aspectj/bridge/BridgeModuleTests.java
  7. 1
    1
      build/junit-patterns.properties
  8. 1
    0
      build/testsrc/org/aspectj/build/BuildModuleTests.java
  9. 1
    0
      loadtime/testsrc/org/aspectj/loadtime/LoadtimeModuleTests.java
  10. 1
    0
      loadtime5/testsrc/org/aspectj/loadtime/Loadtime5ModuleTests.java
  11. 1
    0
      org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/EajcModuleTests.java
  12. 1
    0
      org.aspectj.lib/testsrc/org/aspectj/lib/LibModuleTests.java
  13. 20
    3
      run-all-junit-tests/testsrc/AllTests.java
  14. 2
    0
      run-all-junit-tests/testsrc/RunTheseBeforeYouCommitTests.java
  15. 1
    2
      runtime/testsrc/org/aspectj/runtime/RuntimeModuleTests.java
  16. 1
    0
      taskdefs/testsrc/org/aspectj/tools/ant/TaskdefsModuleTests.java
  17. 1
    2
      testing-client/testsrc/org/aspectj/testing/TestingClientModuleTests.java
  18. 1
    0
      testing-drivers/testsrc/org/aspectj/testing/TestingDriversModuleTests.java
  19. 1
    1
      testing-util/testsrc/org/aspectj/testingutil/TestingUtilModuleTests.java
  20. 1
    0
      testing/testsrc/org/aspectj/testing/TestingModuleTests.java
  21. 1
    0
      tests/testsrc/org/aspectj/tests/TestsModuleTests.java
  22. 1
    0
      util/testsrc/org/aspectj/util/UtilModuleTests.java
  23. 1
    1
      weaver/testsrc/org/aspectj/weaver/BcweaverModuleTests.java
  24. 1
    5
      weaver/testsrc/org/aspectj/weaver/BcweaverModuleTests15.java
  25. 1
    0
      weaver5/testsrc/org/aspectj/weaver/Weaver5ModuleTests.java

ajbrowser/testsrc/AjbrowserModuleTests.java → ajbrowser/testsrc/org/aspectj/tools/ajbrowser/AjbrowserModuleTests.java View File

package org.aspectj.tools.ajbrowser;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 1999-2001 Xerox Corporation, * Copyright (c) 1999-2001 Xerox Corporation,
* 2002 Palo Alto Research Center, Incorporated (PARC). * 2002 Palo Alto Research Center, Incorporated (PARC).

ajde/testsrc/AjdeModuleTests.java → ajde/testsrc/org/aspectj/ajde/AjdeModuleTests.java View File

package org.aspectj.ajde;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 1999-2001 Xerox Corporation, * Copyright (c) 1999-2001 Xerox Corporation,
* 2002 Palo Alto Research Center, Incorporated (PARC). * 2002 Palo Alto Research Center, Incorporated (PARC).

ajdoc/testsrc/AjdocModuleTests.java → ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocModuleTests.java View File

package org.aspectj.tools.ajdoc;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 2003 Contributors. * Copyright (c) 2003 Contributors.
* All rights reserved. * All rights reserved.
import junit.framework.Test; import junit.framework.Test;
import junit.framework.TestSuite; import junit.framework.TestSuite;


import org.aspectj.tools.ajdoc.AjdocTests;


/** /**
* @author Mik Kersten * @author Mik Kersten

asm/testsrc/AsmModuleTests.java → asm/testsrc/org/aspectj/asm/AsmModuleTests.java View File

package org.aspectj.asm;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 1999-2001 Xerox Corporation, * Copyright (c) 1999-2001 Xerox Corporation,
* 2002 Palo Alto Research Center, Incorporated (PARC). * 2002 Palo Alto Research Center, Incorporated (PARC).

aspectj5rt/testsrc/Aspectj5rtModuleTests.java → aspectj5rt/testsrc/org/aspectj/runtime/Aspectj5rtModuleTests.java View File

package org.aspectj.runtime;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 2005 Contributors. * Copyright (c) 2005 Contributors.
* All rights reserved. * All rights reserved.

bridge/testsrc/BridgeModuleTests.java → bridge/testsrc/org/aspectj/bridge/BridgeModuleTests.java View File

package org.aspectj.bridge;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 1999-2001 Xerox Corporation, * Copyright (c) 1999-2001 Xerox Corporation,
* 2002 Palo Alto Research Center, Incorporated (PARC). * 2002 Palo Alto Research Center, Incorporated (PARC).

+ 1
- 1
build/junit-patterns.properties View File

junit.leaves=false junit.leaves=false


# define the root suite for for each module testsrc/ # define the root suite for for each module testsrc/
junit.rootSuites=*ModuleTests.java
junit.rootSuites=**/*ModuleTests.java


# define leaf tests for each module testsrc/ # define leaf tests for each module testsrc/
junit.includes=**/*Tests.java,**/*TestCase.java junit.includes=**/*Tests.java,**/*TestCase.java

build/testsrc/BuildModuleTests.java → build/testsrc/org/aspectj/build/BuildModuleTests.java View File

package org.aspectj.build;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 1999-2001 Xerox Corporation, * Copyright (c) 1999-2001 Xerox Corporation,
* 2002 Palo Alto Research Center, Incorporated (PARC). * 2002 Palo Alto Research Center, Incorporated (PARC).

loadtime/testsrc/LoadtimeModuleTests.java → loadtime/testsrc/org/aspectj/loadtime/LoadtimeModuleTests.java View File

package org.aspectj.loadtime;
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2005 Contributors. * Copyright (c) 2005 Contributors.
* All rights reserved. * All rights reserved.

loadtime5/testsrc/Loadtime5ModuleTests.java → loadtime5/testsrc/org/aspectj/loadtime/Loadtime5ModuleTests.java View File

package org.aspectj.loadtime;
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2005 Contributors. * Copyright (c) 2005 Contributors.
* All rights reserved. * All rights reserved.

org.aspectj.ajdt.core/testsrc/EajcModuleTests.java → org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/EajcModuleTests.java View File

package org.aspectj.ajdt;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 1999-2001 Xerox Corporation, * Copyright (c) 1999-2001 Xerox Corporation,
* 2002 Palo Alto Research Center, Incorporated (PARC). * 2002 Palo Alto Research Center, Incorporated (PARC).

org.aspectj.lib/testsrc/LibModuleTests.java → org.aspectj.lib/testsrc/org/aspectj/lib/LibModuleTests.java View File

package org.aspectj.lib;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 2005 Contributors. * Copyright (c) 2005 Contributors.
* All rights reserved. * All rights reserved.

+ 20
- 3
run-all-junit-tests/testsrc/AllTests.java View File



// default package // default package
import org.aspectj.util.LangUtil; import org.aspectj.util.LangUtil;
import org.aspectj.util.UtilModuleTests;
import org.aspectj.weaver.BcweaverModuleTests;
import org.aspectj.weaver.BcweaverModuleTests15;
import org.aspectj.ajde.AjdeModuleTests;
import org.aspectj.ajdt.EajcModuleTests;
import org.aspectj.asm.AsmModuleTests;
import org.aspectj.bridge.BridgeModuleTests;
import org.aspectj.build.BuildModuleTests;
import org.aspectj.loadtime.LoadtimeModuleTests;
import org.aspectj.runtime.RuntimeModuleTests;
import org.aspectj.testing.TestingClientModuleTests;
import org.aspectj.testing.TestingDriversModuleTests;
import org.aspectj.testing.TestingModuleTests;
import org.aspectj.testing.util.TestUtil; import org.aspectj.testing.util.TestUtil;
import org.aspectj.testingutil.TestingUtilModuleTests;
import org.aspectj.tools.ajbrowser.AjbrowserModuleTests;
import org.aspectj.tools.ajdoc.AjdocModuleTests;
import org.aspectj.tools.ant.TaskdefsModuleTests;


import junit.framework.TestCase; import junit.framework.TestCase;
import junit.framework.TestSuite; import junit.framework.TestSuite;
// these only require 1.3, but in Eclipse they are built // these only require 1.3, but in Eclipse they are built
// with 1.5, i.e., wrong class version to load under 1.3 // with 1.5, i.e., wrong class version to load under 1.3
// so the class name can only be used reflectively // so the class name can only be used reflectively
TestUtil.loadTestsReflectively(suite, "Aspectj5rtModuleTests", false);
TestUtil.loadTestsReflectively(suite, "Loadtime5ModuleTests", false);
TestUtil.loadTestsReflectively(suite, "org.aspectj.runtime.Aspectj5rtModuleTests", false);
TestUtil.loadTestsReflectively(suite, "org.aspectj.loadtime.Loadtime5ModuleTests", false);
// this next one is built normally, but needs 1.5 rt.jar to pass // this next one is built normally, but needs 1.5 rt.jar to pass
suite.addTest(BcweaverModuleTests15.suite()); suite.addTest(BcweaverModuleTests15.suite());
TestUtil.loadTestsReflectively(suite, "Weaver5ModuleTests",false);
TestUtil.loadTestsReflectively(suite, "org.aspectj.weaver.Weaver5ModuleTests",false);
} else { } else {
suite.addTest(TestUtil.skipTest("for 1.5")); suite.addTest(TestUtil.skipTest("for 1.5"));
} }

+ 2
- 0
run-all-junit-tests/testsrc/RunTheseBeforeYouCommitTests.java View File

* *
* ******************************************************************/ * ******************************************************************/


import org.aspectj.tests.TestsModuleTests;

import junit.framework.Test; import junit.framework.Test;
import junit.framework.TestSuite; import junit.framework.TestSuite;



runtime/testsrc/RuntimeModuleTests.java → runtime/testsrc/org/aspectj/runtime/RuntimeModuleTests.java View File

package org.aspectj.runtime;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 1999-2001 Xerox Corporation, * Copyright (c) 1999-2001 Xerox Corporation,
* 2002 Palo Alto Research Center, Incorporated (PARC). * 2002 Palo Alto Research Center, Incorporated (PARC).
* Xerox/PARC initial implementation * Xerox/PARC initial implementation
* ******************************************************************/ * ******************************************************************/


// default package

import java.io.*; import java.io.*;


import org.aspectj.lang.*; import org.aspectj.lang.*;

taskdefs/testsrc/TaskdefsModuleTests.java → taskdefs/testsrc/org/aspectj/tools/ant/TaskdefsModuleTests.java View File

package org.aspectj.tools.ant;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 1999-2001 Xerox Corporation, * Copyright (c) 1999-2001 Xerox Corporation,
* 2002 Palo Alto Research Center, Incorporated (PARC). * 2002 Palo Alto Research Center, Incorporated (PARC).

testing-client/testsrc/TestingClientModuleTests.java → testing-client/testsrc/org/aspectj/testing/TestingClientModuleTests.java View File

package org.aspectj.testing;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 1999-2001 Xerox Corporation, * Copyright (c) 1999-2001 Xerox Corporation,
* 2002 Palo Alto Research Center, Incorporated (PARC). * 2002 Palo Alto Research Center, Incorporated (PARC).
// default package // default package


import junit.framework.*; import junit.framework.*;
import junit.framework.Test;
import org.aspectj.testing.TestingTests;


public class TestingClientModuleTests extends TestCase { public class TestingClientModuleTests extends TestCase {



testing-drivers/testsrc/TestingDriversModuleTests.java → testing-drivers/testsrc/org/aspectj/testing/TestingDriversModuleTests.java View File

package org.aspectj.testing;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 1999-2001 Xerox Corporation, * Copyright (c) 1999-2001 Xerox Corporation,
* 2002 Palo Alto Research Center, Incorporated (PARC). * 2002 Palo Alto Research Center, Incorporated (PARC).

testing-util/testsrc/TestingUtilModuleTests.java → testing-util/testsrc/org/aspectj/testingutil/TestingUtilModuleTests.java View File

package org.aspectj.testingutil;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 1999-2001 Xerox Corporation, * Copyright (c) 1999-2001 Xerox Corporation,
* 2002 Palo Alto Research Center, Incorporated (PARC). * 2002 Palo Alto Research Center, Incorporated (PARC).
import junit.framework.Test; import junit.framework.Test;
import junit.framework.TestCase; import junit.framework.TestCase;
import junit.framework.TestSuite; import junit.framework.TestSuite;
import org.aspectj.testingutil.UtilTests;


public class TestingUtilModuleTests extends TestCase { public class TestingUtilModuleTests extends TestCase {



testing/testsrc/TestingModuleTests.java → testing/testsrc/org/aspectj/testing/TestingModuleTests.java View File

package org.aspectj.testing;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 1999-2001 Xerox Corporation, * Copyright (c) 1999-2001 Xerox Corporation,
* 2002 Palo Alto Research Center, Incorporated (PARC). * 2002 Palo Alto Research Center, Incorporated (PARC).

tests/testsrc/TestsModuleTests.java → tests/testsrc/org/aspectj/tests/TestsModuleTests.java View File

package org.aspectj.tests;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 2005 Contributors. * Copyright (c) 2005 Contributors.
* All rights reserved. * All rights reserved.

util/testsrc/UtilModuleTests.java → util/testsrc/org/aspectj/util/UtilModuleTests.java View File

package org.aspectj.util;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 1999-2001 Xerox Corporation, * Copyright (c) 1999-2001 Xerox Corporation,
* 2002 Palo Alto Research Center, Incorporated (PARC). * 2002 Palo Alto Research Center, Incorporated (PARC).

weaver/testsrc/BcweaverModuleTests.java → weaver/testsrc/org/aspectj/weaver/BcweaverModuleTests.java View File

package org.aspectj.weaver;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
* All rights reserved. * All rights reserved.
import junit.framework.TestCase; import junit.framework.TestCase;
import junit.framework.TestSuite; import junit.framework.TestSuite;


import org.aspectj.weaver.LocaleTest;
import org.aspectj.weaver.tools.ToolsTests; import org.aspectj.weaver.tools.ToolsTests;


public class BcweaverModuleTests extends TestCase { public class BcweaverModuleTests extends TestCase {

weaver/testsrc/BcweaverModuleTests15.java → weaver/testsrc/org/aspectj/weaver/BcweaverModuleTests15.java View File

package org.aspectj.weaver;
/* ******************************************************************* /* *******************************************************************
* Copyright (c) 2005 Contributors. * Copyright (c) 2005 Contributors.
* All rights reserved. * All rights reserved.


import org.aspectj.testing.util.TestUtil; import org.aspectj.testing.util.TestUtil;
import org.aspectj.util.LangUtil; import org.aspectj.util.LangUtil;
import org.aspectj.weaver.BoundedReferenceTypeTestCase;
import org.aspectj.weaver.MemberTestCase15;
import org.aspectj.weaver.ReferenceTypeTestCase;
import org.aspectj.weaver.TypeVariableReferenceTypeTestCase;
import org.aspectj.weaver.TypeVariableTestCase;
import org.aspectj.weaver.bcel.BcelGenericSignatureToTypeXTestCase; import org.aspectj.weaver.bcel.BcelGenericSignatureToTypeXTestCase;
import org.aspectj.weaver.patterns.WildTypePatternResolutionTestCase; import org.aspectj.weaver.patterns.WildTypePatternResolutionTestCase;



weaver5/testsrc/Weaver5ModuleTests.java → weaver5/testsrc/org/aspectj/weaver/Weaver5ModuleTests.java View File

package org.aspectj.weaver;
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2005 Contributors. * Copyright (c) 2005 Contributors.
* All rights reserved. * All rights reserved.

Loading…
Cancel
Save