From 986686592b227c64887f3e0fcf446903edbffee8 Mon Sep 17 00:00:00 2001 From: Renaud Pawlak Date: Tue, 24 Nov 2015 09:35:25 +0100 Subject: [PATCH] added test cases for @Root (required test packages refactoring) --- .../org/jsweet/transpiler/JSweetContext.java | 2 +- .../org/jsweet/transpiler/JSweetProblem.java | 20 +++- .../jsweet/transpiler/JSweetTranspiler.java | 2 +- .../typescript/Java2TypeScriptTranslator.java | 34 +++++-- .../java/org/jsweet/transpiler/util/Util.java | 30 ++++-- .../jsweet/test/transpiler/AmbientTests.java | 15 +-- .../org/jsweet/test/transpiler/ApiTests.java | 13 +-- .../jsweet/test/transpiler/CandiesTests.java | 11 +- .../jsweet/test/transpiler/GenericsTests.java | 3 +- .../org/jsweet/test/transpiler/InitTests.java | 29 +++--- .../jsweet/test/transpiler/OverloadTests.java | 7 +- .../jsweet/test/transpiler/RequireTests.java | 53 +++++----- .../org/jsweet/test/transpiler/RootTests.java | 63 ++++++++++++ .../test/transpiler/StructuralTests.java | 94 ++++++------------ .../jsweet/test/transpiler/SyntaxTests.java | 23 +++-- .../test/transpiler/ThrowableTests.java | 5 +- .../test/transpiler/TranspilerTests.java | 5 +- .../test/transpiler/TsComparisonTest.java | 15 +-- .../jsweet/test/transpiler/TypingTests.java | 23 +++-- .../jsweet/test/transpiler/VarargsTests.java | 17 ++-- .../globalclasses/root/package-info.java | 2 - .../rootparent1/InvalidClassLocation.java | 5 - .../root/NoClassesInRootParent.java | 5 - .../rootparent1/root/package-info.java | 2 - .../structural/rootparent2/package-info.java | 2 - .../rootparent2/root/NoRootInRoot.java | 5 - .../rootparent2/root/package-info.java | 2 - .../source/ambient/LibAccess.java | 6 +- .../source/ambient/LibAccessSubModule.java | 12 +-- .../transpiler => }/source/ambient/lib.js | 0 .../source/ambient/lib/Base.java | 2 +- .../source/ambient/lib/Extension.java | 4 +- .../source/ambient/lib/sub/C.java | 2 +- .../transpiler => }/source/ambient/libsub.js | 0 .../ambient}/package-info.java | 4 +- .../source/api/CastMethods.java | 2 +- .../source/api/ForeachIteration.java | 2 +- .../source/api/JdkInvocations.java | 2 +- .../source/api/PrimitiveInstantiation.java | 2 +- .../source/api/QualifiedInstantiation.java | 2 +- .../source/api/WrongJdkInvocations.java | 2 +- .../source/blocksgame/Ball.java | 9 +- .../source/blocksgame/BlockElement.java | 13 ++- .../source/blocksgame/Factory.java | 6 +- .../source/blocksgame/GameArea.java | 9 +- .../source/blocksgame/GameManager.java | 7 +- .../source/blocksgame/Globals.java | 2 +- .../source/blocksgame/Player.java | 13 ++- .../source/blocksgame/breakable-block.png | Bin .../source/blocksgame/breakable-block.svg | 0 .../source/blocksgame/index.html | 0 .../blocksgame}/package-info.java | 4 +- .../source/blocksgame/unbreakable-block.png | Bin .../source/blocksgame/unbreakable-block.svg | 0 .../blocksgame/util/AnimatedElement.java | 2 +- .../source/blocksgame/util/Collisions.java | 2 +- .../source/blocksgame/util/Direction.java | 2 +- .../source/blocksgame/util/Line.java | 2 +- .../source/blocksgame/util/MobileElement.java | 2 +- .../source/blocksgame/util/Point.java | 2 +- .../source/blocksgame/util/Rectangle.java | 2 +- .../source/blocksgame/util/Vector.java | 2 +- .../source/candies/Angular.java | 2 +- .../source/candies/ExpressLib.java | 2 +- .../source/candies/GlobalsImport.java | 2 +- .../source/candies/JQuery.java | 2 +- .../source/candies/QualifiedNames.java | 2 +- .../generics/InstantiationWithGenerics.java | 6 +- .../source/init/Constructor.java | 2 +- .../source/init/ConstructorField.java | 2 +- .../init/ConstructorFieldInInterface.java | 2 +- .../source/init/ConstructorMethod.java | 2 +- .../init/ConstructorMethodInInterface.java | 2 +- .../source/init/Initializer.java | 2 +- .../InitializerStatementConditionError.java | 2 +- .../init/InitializerStatementError.java | 2 +- .../source/init/InterfaceRawConstruction.java | 2 +- .../source/init/MultipleMains.java | 2 +- .../source/init/NoOptionalFieldsInClass.java | 2 +- .../source/init/StaticInitializer.java | 2 +- .../source/overload/Overload.java | 2 +- .../source/overload/WrongOverload.java | 2 +- .../source/overload/WrongOverloads.java | 2 +- .../source/require/TopLevel1.java | 4 +- .../source/require/TopLevel2.java | 4 +- .../transpiler => }/source/require/a/A.java | 2 +- .../source/require/a/Use1.java | 4 +- .../source/require/a/Use2.java | 4 +- .../source/require/a/b/B1.java | 2 +- .../source/require/a/b/B2.java | 2 +- .../source/require/b/ClassImport.java | 4 +- .../require/b/ClassImportImplicitRequire.java | 9 +- .../source/require/b/GlobalsImport.java | 6 +- .../source/require/globals/Globals.java | 2 +- .../require}/package-info.java | 2 +- .../root}/noroot/a/GlobalsInNoRoot.java | 4 +- .../root}/root/a/GlobalsInRoot.java | 4 +- .../java/source/root/root/package-info.java | 2 + .../rootparent1/InvalidClassLocation.java | 5 + .../root/NoClassesInRootParent.java | 5 + .../root/rootparent1/root/package-info.java | 2 + .../source/root/rootparent2/package-info.java | 2 + .../root/rootparent2/root/NoRootInRoot.java | 5 + .../root/rootparent2/root/package-info.java | 2 + .../source/structural/AbstractClass.java | 2 +- .../AutoImportClassesInSamePackage.java | 2 +- .../AutoImportClassesInSamePackageUsed.java | 2 +- .../source/structural/Enums.java | 2 +- .../structural/ExtendsClassInSameFile.java | 2 +- .../source/structural/ExtendsObject.java | 2 +- .../source/structural/GlobalsAccess.java | 4 +- .../source/structural/Inheritance.java | 2 +- .../source/structural/InnerClass.java | 2 +- .../source/structural/NameClashes.java | 2 +- .../structural/NoInstanceofForInterfaces.java | 2 +- .../structural/NoWildcardsInImports.java | 2 +- .../source/structural/OptionalField.java | 2 +- .../source/structural/OptionalFieldError.java | 2 +- .../structural/TwoClassesInSameFile.java | 2 +- .../structural/WrongConstructsInEnums.java | 2 +- .../WrongConstructsInInterfaces.java | 2 +- .../structural/globalclasses/Globals.java | 2 +- .../globalclasses/a/GlobalsConstructor.java | 2 +- .../b/GlobalFunctionStaticGetSet.java | 2 +- .../globalclasses/c/GlobalFunctionGetSet.java | 2 +- .../d/GlobalFunctionAccessFromMain.java | 8 +- .../structural/globalclasses/e/Globals.java | 2 +- .../f/GlobalFunctionStaticDelete.java | 2 +- .../globalclasses/g/GlobalFunctionDelete.java | 2 +- .../syntax/AnnotationQualifiedNames.java | 2 +- .../source/syntax/FinalVariables.java | 2 +- .../source/syntax/FinalVariablesRuntime.java | 2 +- .../source/syntax/GlobalsInvocation.java | 6 +- .../syntax/IndexedAccessInStaticScope.java | 2 +- .../source/syntax/Keywords.java | 2 +- .../transpiler => }/source/syntax/Labels.java | 2 +- .../source/syntax/QualifiedNames.java | 2 +- .../source/syntax/References.java | 2 +- .../source/syntax/SpecialFunctions.java | 2 +- .../source/syntax/ValidIndexedAccesses.java | 2 +- .../source/throwable/InvalidTryCatchTest.java | 2 +- .../source/throwable/TryCatchFinallyTest.java | 2 +- .../source/tscomparison/.tsc-rootfile.js | 0 .../source/tscomparison/.tsc-rootfile.ts | 0 .../source/tscomparison/AbstractClasses.java | 2 +- .../tscomparison/AbstractClasses.js.map | 0 .../source/tscomparison/AbstractClasses.ts | 0 .../source/tscomparison/ActualScoping.java | 2 +- .../source/tscomparison/ActualScoping.ts | 0 .../tscomparison/CompileTimeWarnings.java | 2 +- .../tscomparison/CompileTimeWarnings.ts | 0 .../source/tscomparison/OtherThisExample.java | 2 +- .../source/tscomparison/SaferVarargs.java | 2 +- .../source/tscomparison/SaferVarargs.js.map | 0 .../source/tscomparison/SaferVarargs.ts | 0 .../source/tscomparison/StrongerTyping.java | 2 +- .../source/tscomparison/StrongerTyping.ts | 0 .../source/tscomparison/ThisIsThis.java | 2 +- .../source/tscomparison/ThisIsThis.ts | 0 .../source/tscomparison/AbstractClasses.js | 0 .../tscomparison/AbstractClasses.js.map | 0 .../source/tscomparison/AbstractClasses.ts | 0 .../test/source/tscomparison/ActualScoping.js | 0 .../source/tscomparison/ActualScoping.js.map | 0 .../test/source/tscomparison/ActualScoping.ts | 0 .../source/tscomparison/AbstractClasses.js | 0 .../tscomparison/AbstractClasses.js.map | 0 .../source/tscomparison/AbstractClasses.ts | 0 .../source/tscomparison/OtherThisExample.js | 0 .../tscomparison/OtherThisExample.js.map | 0 .../source/tscomparison/OtherThisExample.ts | 0 .../source/typing/ArraysOfLambdas.java | 2 +- .../source/typing/ClassTypeAsFunction.java | 2 +- .../source/typing/ClassTypeAsTypeOf.java | 2 +- .../source/typing/InvalidIndexedAccesses.java | 2 +- .../source/typing/Lambdas.java | 2 +- .../source/typing/Numbers.java | 2 +- .../source/typing/StringTypesUsage.java | 2 +- .../transpiler => }/source/typing/Tuples.java | 2 +- .../transpiler => }/source/typing/Unions.java | 2 +- .../source/typing/VoidType.java | 2 +- .../source/typing/WrongUnions.java | 2 +- .../varargs/VarargsCalledWithArray.java | 2 +- .../source/varargs/VarargsOfArrays.java | 2 +- .../source/varargs/VarargsOnAnonymous.java | 2 +- .../source/varargs/VarargsOnApi.java | 2 +- .../source/varargs/VarargsOnField.java | 2 +- .../source/varargs/VarargsOnGetter.java | 2 +- .../source/varargs/VarargsOnNew.java | 2 +- .../source/varargs/VarargsOnStaticMethod.java | 2 +- .../source/varargs/VarargsTransmission.java | 2 +- 191 files changed, 481 insertions(+), 391 deletions(-) create mode 100644 src/test/java/org/jsweet/test/transpiler/RootTests.java delete mode 100644 src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/root/package-info.java delete mode 100644 src/test/java/org/jsweet/test/transpiler/source/structural/rootparent1/InvalidClassLocation.java delete mode 100644 src/test/java/org/jsweet/test/transpiler/source/structural/rootparent1/root/NoClassesInRootParent.java delete mode 100644 src/test/java/org/jsweet/test/transpiler/source/structural/rootparent1/root/package-info.java delete mode 100644 src/test/java/org/jsweet/test/transpiler/source/structural/rootparent2/package-info.java delete mode 100644 src/test/java/org/jsweet/test/transpiler/source/structural/rootparent2/root/NoRootInRoot.java delete mode 100644 src/test/java/org/jsweet/test/transpiler/source/structural/rootparent2/root/package-info.java rename src/test/java/{org/jsweet/test/transpiler => }/source/ambient/LibAccess.java (84%) rename src/test/java/{org/jsweet/test/transpiler => }/source/ambient/LibAccessSubModule.java (66%) rename src/test/java/{org/jsweet/test/transpiler => }/source/ambient/lib.js (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/ambient/lib/Base.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/ambient/lib/Extension.java (80%) rename src/test/java/{org/jsweet/test/transpiler => }/source/ambient/lib/sub/C.java (89%) rename src/test/java/{org/jsweet/test/transpiler => }/source/ambient/libsub.js (100%) rename src/test/java/{org/jsweet/test/transpiler/source/require => source/ambient}/package-info.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/api/CastMethods.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/api/ForeachIteration.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/api/JdkInvocations.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/api/PrimitiveInstantiation.java (93%) rename src/test/java/{org/jsweet/test/transpiler => }/source/api/QualifiedInstantiation.java (94%) rename src/test/java/{org/jsweet/test/transpiler => }/source/api/WrongJdkInvocations.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/Ball.java (87%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/BlockElement.java (88%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/Factory.java (88%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/GameArea.java (95%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/GameManager.java (94%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/Globals.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/Player.java (89%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/breakable-block.png (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/breakable-block.svg (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/index.html (100%) rename src/test/java/{org/jsweet/test/transpiler/source/ambient => source/blocksgame}/package-info.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/unbreakable-block.png (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/unbreakable-block.svg (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/util/AnimatedElement.java (93%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/util/Collisions.java (93%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/util/Direction.java (95%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/util/Line.java (93%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/util/MobileElement.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/util/Point.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/util/Rectangle.java (93%) rename src/test/java/{org/jsweet/test/transpiler => }/source/blocksgame/util/Vector.java (93%) rename src/test/java/{org/jsweet/test/transpiler => }/source/candies/Angular.java (94%) rename src/test/java/{org/jsweet/test/transpiler => }/source/candies/ExpressLib.java (93%) rename src/test/java/{org/jsweet/test/transpiler => }/source/candies/GlobalsImport.java (93%) rename src/test/java/{org/jsweet/test/transpiler => }/source/candies/JQuery.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/candies/QualifiedNames.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/generics/InstantiationWithGenerics.java (77%) rename src/test/java/{org/jsweet/test/transpiler => }/source/init/Constructor.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/init/ConstructorField.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/init/ConstructorFieldInInterface.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/init/ConstructorMethod.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/init/ConstructorMethodInInterface.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/init/Initializer.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/init/InitializerStatementConditionError.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/init/InitializerStatementError.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/init/InterfaceRawConstruction.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/init/MultipleMains.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/init/NoOptionalFieldsInClass.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/init/StaticInitializer.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/overload/Overload.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/overload/WrongOverload.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/overload/WrongOverloads.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/require/TopLevel1.java (84%) rename src/test/java/{org/jsweet/test/transpiler => }/source/require/TopLevel2.java (83%) rename src/test/java/{org/jsweet/test/transpiler => }/source/require/a/A.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/require/a/Use1.java (83%) rename src/test/java/{org/jsweet/test/transpiler => }/source/require/a/Use2.java (82%) rename src/test/java/{org/jsweet/test/transpiler => }/source/require/a/b/B1.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/require/a/b/B2.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/require/b/ClassImport.java (85%) rename src/test/java/{org/jsweet/test/transpiler => }/source/require/b/ClassImportImplicitRequire.java (78%) rename src/test/java/{org/jsweet/test/transpiler => }/source/require/b/GlobalsImport.java (76%) rename src/test/java/{org/jsweet/test/transpiler => }/source/require/globals/Globals.java (90%) rename src/test/java/{org/jsweet/test/transpiler/source/blocksgame => source/require}/package-info.java (90%) rename src/test/java/{org/jsweet/test/transpiler/source/structural/globalclasses => source/root}/noroot/a/GlobalsInNoRoot.java (65%) rename src/test/java/{org/jsweet/test/transpiler/source/structural/globalclasses => source/root}/root/a/GlobalsInRoot.java (65%) create mode 100644 src/test/java/source/root/root/package-info.java create mode 100644 src/test/java/source/root/rootparent1/InvalidClassLocation.java create mode 100644 src/test/java/source/root/rootparent1/root/NoClassesInRootParent.java create mode 100644 src/test/java/source/root/rootparent1/root/package-info.java create mode 100644 src/test/java/source/root/rootparent2/package-info.java create mode 100644 src/test/java/source/root/rootparent2/root/NoRootInRoot.java create mode 100644 src/test/java/source/root/rootparent2/root/package-info.java rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/AbstractClass.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/AutoImportClassesInSamePackage.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/AutoImportClassesInSamePackageUsed.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/Enums.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/ExtendsClassInSameFile.java (89%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/ExtendsObject.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/GlobalsAccess.java (86%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/Inheritance.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/InnerClass.java (89%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/NameClashes.java (89%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/NoInstanceofForInterfaces.java (89%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/NoWildcardsInImports.java (77%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/OptionalField.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/OptionalFieldError.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/TwoClassesInSameFile.java (89%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/WrongConstructsInEnums.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/WrongConstructsInInterfaces.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/globalclasses/Globals.java (88%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/globalclasses/a/GlobalsConstructor.java (88%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/globalclasses/b/GlobalFunctionStaticGetSet.java (89%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/globalclasses/c/GlobalFunctionGetSet.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/globalclasses/d/GlobalFunctionAccessFromMain.java (69%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/globalclasses/e/Globals.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/globalclasses/f/GlobalFunctionStaticDelete.java (89%) rename src/test/java/{org/jsweet/test/transpiler => }/source/structural/globalclasses/g/GlobalFunctionDelete.java (89%) rename src/test/java/{org/jsweet/test/transpiler => }/source/syntax/AnnotationQualifiedNames.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/syntax/FinalVariables.java (95%) rename src/test/java/{org/jsweet/test/transpiler => }/source/syntax/FinalVariablesRuntime.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/syntax/GlobalsInvocation.java (83%) rename src/test/java/{org/jsweet/test/transpiler => }/source/syntax/IndexedAccessInStaticScope.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/syntax/Keywords.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/syntax/Labels.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/syntax/QualifiedNames.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/syntax/References.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/syntax/SpecialFunctions.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/syntax/ValidIndexedAccesses.java (94%) rename src/test/java/{org/jsweet/test/transpiler => }/source/throwable/InvalidTryCatchTest.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/throwable/TryCatchFinallyTest.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/.tsc-rootfile.js (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/.tsc-rootfile.ts (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/AbstractClasses.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/AbstractClasses.js.map (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/AbstractClasses.ts (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/ActualScoping.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/ActualScoping.ts (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/CompileTimeWarnings.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/CompileTimeWarnings.ts (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/OtherThisExample.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/SaferVarargs.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/SaferVarargs.js.map (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/SaferVarargs.ts (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/StrongerTyping.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/StrongerTyping.ts (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/ThisIsThis.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/ThisIsThis.ts (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/org/jsweet/test/source/tscomparison/AbstractClasses.js (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/org/jsweet/test/source/tscomparison/AbstractClasses.js.map (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/org/jsweet/test/source/tscomparison/AbstractClasses.ts (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/org/jsweet/test/source/tscomparison/ActualScoping.js (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/org/jsweet/test/source/tscomparison/ActualScoping.js.map (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/org/jsweet/test/source/tscomparison/ActualScoping.ts (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.js (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.js.map (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.ts (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/OtherThisExample.js (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/OtherThisExample.js.map (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/OtherThisExample.ts (100%) rename src/test/java/{org/jsweet/test/transpiler => }/source/typing/ArraysOfLambdas.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/typing/ClassTypeAsFunction.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/typing/ClassTypeAsTypeOf.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/typing/InvalidIndexedAccesses.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/typing/Lambdas.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/typing/Numbers.java (93%) rename src/test/java/{org/jsweet/test/transpiler => }/source/typing/StringTypesUsage.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/typing/Tuples.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/typing/Unions.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/typing/VoidType.java (90%) rename src/test/java/{org/jsweet/test/transpiler => }/source/typing/WrongUnions.java (93%) rename src/test/java/{org/jsweet/test/transpiler => }/source/varargs/VarargsCalledWithArray.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/varargs/VarargsOfArrays.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/varargs/VarargsOnAnonymous.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/varargs/VarargsOnApi.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/varargs/VarargsOnField.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/varargs/VarargsOnGetter.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/varargs/VarargsOnNew.java (92%) rename src/test/java/{org/jsweet/test/transpiler => }/source/varargs/VarargsOnStaticMethod.java (91%) rename src/test/java/{org/jsweet/test/transpiler => }/source/varargs/VarargsTransmission.java (92%) diff --git a/src/main/java/org/jsweet/transpiler/JSweetContext.java b/src/main/java/org/jsweet/transpiler/JSweetContext.java index 2bae133e..5b767666 100644 --- a/src/main/java/org/jsweet/transpiler/JSweetContext.java +++ b/src/main/java/org/jsweet/transpiler/JSweetContext.java @@ -169,7 +169,7 @@ public class JSweetContext extends Context { * Stores the root package namee (i.e. packages contained in the default * package or in a package annotated with the {@link jsweet.lang.Root} annotation). */ - public Set rootPackageNames = new HashSet<>(); + public Set topLevelPackageNames = new HashSet<>(); /** * Globally imported name (in the global namespace). diff --git a/src/main/java/org/jsweet/transpiler/JSweetProblem.java b/src/main/java/org/jsweet/transpiler/JSweetProblem.java index 9fe46b0a..8dd4e382 100644 --- a/src/main/java/org/jsweet/transpiler/JSweetProblem.java +++ b/src/main/java/org/jsweet/transpiler/JSweetProblem.java @@ -11,7 +11,7 @@ * 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.jsweet.transpiler; /** @@ -240,7 +240,15 @@ public enum JSweetProblem { /** * Raised when a wildcard import is used. */ - WILDCARD_IMPORT(Severity.ERROR); + WILDCARD_IMPORT(Severity.ERROR), + /** + * Raised when a @Root package is enclosed in a @Root package. + */ + ENCLOSED_ROOT_PACKAGES(Severity.ERROR), + /** + * Raised when a class is declared in a parent of a @Root package. + */ + CLASS_OUT_OF_ROOT_PACKAGE_SCOPE(Severity.ERROR); private Severity severity; @@ -261,7 +269,9 @@ public enum JSweetProblem { public String getMessage(Object... params) { switch (this) { case JAVA_COMPILER_NOT_FOUND: - return String.format("Java compiler cannot be found: make sure that JAVA_HOME points to a JDK (version>=8) and not a JRE, or sets the transpiler jdkHome option", params); + return String.format( + "Java compiler cannot be found: make sure that JAVA_HOME points to a JDK (version>=8) and not a JRE, or sets the transpiler jdkHome option", + params); case JAVA_ERRORS: return String.format("Java compiler reports %s error(s) that should be fixed before transpiling", params); case INTERNAL_TSC_ERROR: @@ -360,6 +370,10 @@ public enum JSweetProblem { return String.format("a package name cannot contain top-level keyword(s): %s", params); case WILDCARD_IMPORT: return String.format("imports cannot use * wildcards: please import a specific element", params); + case ENCLOSED_ROOT_PACKAGES: + return String.format("invalid package hierarchy: @Root package %s cannot be enclosed in @Root package %s", params); + case CLASS_OUT_OF_ROOT_PACKAGE_SCOPE: + return String.format("invalid package hierarchy: type %s is declared in a parent of @Root package %s", params); } return null; } diff --git a/src/main/java/org/jsweet/transpiler/JSweetTranspiler.java b/src/main/java/org/jsweet/transpiler/JSweetTranspiler.java index dc1b1898..03ab58a7 100644 --- a/src/main/java/org/jsweet/transpiler/JSweetTranspiler.java +++ b/src/main/java/org/jsweet/transpiler/JSweetTranspiler.java @@ -673,7 +673,7 @@ public class JSweetTranspiler { createModuleFile = false; // create only auxiliary module files on modules within a root // package - for (String roots : context.rootPackageNames) { + for (String roots : context.topLevelPackageNames) { File root = new File(tsOutputDir, roots.replace('.', File.separatorChar)); if (rootDir.getPath().startsWith(root.getPath())) { createModuleFile = true; diff --git a/src/main/java/org/jsweet/transpiler/typescript/Java2TypeScriptTranslator.java b/src/main/java/org/jsweet/transpiler/typescript/Java2TypeScriptTranslator.java index 70878928..40acdd76 100644 --- a/src/main/java/org/jsweet/transpiler/typescript/Java2TypeScriptTranslator.java +++ b/src/main/java/org/jsweet/transpiler/typescript/Java2TypeScriptTranslator.java @@ -146,7 +146,7 @@ public class Java2TypeScriptTranslator extends AbstractTreePrinter { private boolean globalModule = false; - private PackageSymbol rootPackage; + private PackageSymbol topLevelPackage; private void useModule(PackageSymbol targetPackage, JCTree sourceTree, String targetName, String moduleName) { if (context.useModules) { @@ -164,12 +164,34 @@ public class Java2TypeScriptTranslator extends AbstractTreePrinter { } } + private void checkRootPackageParent(JCCompilationUnit topLevel, PackageSymbol rootPackage, PackageSymbol parentPackage) { + if (parentPackage == null) { + return; + } + if (Util.hasAnnotationType(parentPackage, JSweetConfig.ANNOTATION_ROOT)) { + report(topLevel.getPackageName(), JSweetProblem.ENCLOSED_ROOT_PACKAGES, rootPackage.getQualifiedName().toString(), + parentPackage.getQualifiedName().toString()); + } + for (Symbol s : parentPackage.getEnclosedElements()) { + if (!(s instanceof PackageSymbol)) { + report(topLevel.getPackageName(), JSweetProblem.CLASS_OUT_OF_ROOT_PACKAGE_SCOPE, s.getQualifiedName().toString(), + rootPackage.getQualifiedName().toString()); + } + } + checkRootPackageParent(topLevel, rootPackage, (PackageSymbol)parentPackage.owner); + } + @Override public void visitTopLevel(JCCompilationUnit topLevel) { printIndent().print("\"Generated from Java with JSweet " + JSweetConfig.getVersionNumber() + " - http://www.jsweet.org\";").println(); - rootPackage = Util.getRootPackage(topLevel.packge); + PackageSymbol rootPackage = Util.getFirstEnclosingRootPackage(topLevel.packge); if (rootPackage != null) { - context.rootPackageNames.add(rootPackage.getQualifiedName().toString()); + checkRootPackageParent(topLevel, rootPackage, (PackageSymbol)rootPackage.owner); + } + + topLevelPackage = Util.getTopLevelPackage(topLevel.packge); + if (topLevelPackage != null) { + context.topLevelPackageNames.add(topLevelPackage.getQualifiedName().toString()); } footer.delete(0, footer.length()); @@ -279,7 +301,7 @@ public class Java2TypeScriptTranslator extends AbstractTreePrinter { if (qualified.sym instanceof ClassSymbol) { ClassSymbol importedClass = (ClassSymbol) qualified.sym; if (Util.isSourceType(importedClass)) { - PackageSymbol targetRootPackage = Util.getRootPackage(importedClass); + PackageSymbol targetRootPackage = Util.getTopLevelPackage(importedClass); if (targetRootPackage == null) { continue; } @@ -882,7 +904,7 @@ public class Java2TypeScriptTranslator extends AbstractTreePrinter { public void visitImport(JCImport importDecl) { imports.add(importDecl); String qualId = importDecl.getQualifiedIdentifier().toString(); - if (qualId.endsWith("*")) { + if (qualId.endsWith("*") && !qualId.endsWith("." + JSweetConfig.GLOBALS_CLASS_NAME + ".*")) { report(importDecl, JSweetProblem.WILDCARD_IMPORT); return; } @@ -897,7 +919,7 @@ public class Java2TypeScriptTranslator extends AbstractTreePrinter { context.registerImportedName(compilationUnit.packge, name); } } else { - if (rootPackage == null) { + if (topLevelPackage == null) { if (context.globalImports.contains(name)) { // Tsc global package does allow multiple import with // the same name in the global namespace (bug?) diff --git a/src/main/java/org/jsweet/transpiler/util/Util.java b/src/main/java/org/jsweet/transpiler/util/Util.java index b8c5a2b9..c54eb1c5 100644 --- a/src/main/java/org/jsweet/transpiler/util/Util.java +++ b/src/main/java/org/jsweet/transpiler/util/Util.java @@ -11,7 +11,7 @@ * 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.jsweet.transpiler.util; import static java.util.Arrays.asList; @@ -385,10 +385,12 @@ public class Util { } /** - * Gets root package (see jsweet.lang.Root) enclosing the given - * symbol. + * Gets the top-level package enclosing the given symbol. The top-level + * package is the one that is enclosed within a root package (see + * jsweet.lang.Root) or the one in the default (unnamed) + * package. */ - public static PackageSymbol getRootPackage(Symbol symbol) { + public static PackageSymbol getTopLevelPackage(Symbol symbol) { if ((symbol instanceof PackageSymbol) && Util.hasAnnotationType(symbol, JSweetConfig.ANNOTATION_ROOT)) { return null; } @@ -407,11 +409,25 @@ public class Util { return null; } } else { - return getRootPackage(parent); + return getTopLevelPackage(parent); } } } + /** + * Finds the first (including itself) enclosing package annotated + * with @Root. + */ + public static PackageSymbol getFirstEnclosingRootPackage(PackageSymbol packageSymbol) { + if (packageSymbol == null) { + return null; + } + if (Util.hasAnnotationType(packageSymbol, JSweetConfig.ANNOTATION_ROOT)) { + return packageSymbol; + } + return getFirstEnclosingRootPackage((PackageSymbol) packageSymbol.owner); + } + private static void getRootRelativeJavaName(StringBuilder sb, Symbol symbol) { if (!Util.hasAnnotationType(symbol, JSweetConfig.ANNOTATION_ROOT)) { if (sb.length() > 0 && !"".equals(symbol.toString())) { @@ -695,7 +711,9 @@ public class Util { /** * Removes the extensions of the given file name. - * @param fileName the given file name (can contain path) + * + * @param fileName + * the given file name (can contain path) * @return the file name without the extension */ public static String removeExtension(String fileName) { diff --git a/src/test/java/org/jsweet/test/transpiler/AmbientTests.java b/src/test/java/org/jsweet/test/transpiler/AmbientTests.java index db4182e6..eaaa8b9d 100644 --- a/src/test/java/org/jsweet/test/transpiler/AmbientTests.java +++ b/src/test/java/org/jsweet/test/transpiler/AmbientTests.java @@ -17,23 +17,24 @@ package org.jsweet.test.transpiler; import java.io.File; import org.apache.commons.io.FileUtils; -import org.jsweet.test.transpiler.source.ambient.LibAccess; -import org.jsweet.test.transpiler.source.ambient.LibAccessSubModule; -import org.jsweet.test.transpiler.source.ambient.lib.Base; -import org.jsweet.test.transpiler.source.ambient.lib.Extension; -import org.jsweet.test.transpiler.source.ambient.lib.sub.C; import org.jsweet.transpiler.ModuleKind; import org.jsweet.transpiler.SourceFile; import org.junit.Assert; import org.junit.Test; +import source.ambient.LibAccess; +import source.ambient.LibAccessSubModule; +import source.ambient.lib.Base; +import source.ambient.lib.Extension; +import source.ambient.lib.sub.C; + public class AmbientTests extends AbstractTest { @Test public void testLibAccess() throws Exception { File target = new File(transpiler.getTsOutputDir(), "lib.js"); FileUtils.deleteQuietly(target); - FileUtils.copyFile(new File(TEST_DIRECTORY_NAME + "/org/jsweet/test/transpiler/source/ambient/lib.js"), target); + FileUtils.copyFile(new File(TEST_DIRECTORY_NAME + "/source/ambient/lib.js"), target); System.out.println("copied to " + target); SourceFile libJs = new SourceFile(null) { @@ -63,7 +64,7 @@ public class AmbientTests extends AbstractTest { public void testLibAccessSubModule() throws Exception { File target = new File(transpiler.getTsOutputDir(), "libsub.js"); FileUtils.deleteQuietly(target); - FileUtils.copyFile(new File(TEST_DIRECTORY_NAME + "/org/jsweet/test/transpiler/source/ambient/libsub.js"), target); + FileUtils.copyFile(new File(TEST_DIRECTORY_NAME + "/source/ambient/libsub.js"), target); System.out.println("copied to " + target); SourceFile libJs = new SourceFile(null) { diff --git a/src/test/java/org/jsweet/test/transpiler/ApiTests.java b/src/test/java/org/jsweet/test/transpiler/ApiTests.java index 2b5daf52..5b93f6e2 100644 --- a/src/test/java/org/jsweet/test/transpiler/ApiTests.java +++ b/src/test/java/org/jsweet/test/transpiler/ApiTests.java @@ -16,16 +16,17 @@ package org.jsweet.test.transpiler; import static org.junit.Assert.assertEquals; -import org.jsweet.test.transpiler.source.api.CastMethods; -import org.jsweet.test.transpiler.source.api.ForeachIteration; -import org.jsweet.test.transpiler.source.api.JdkInvocations; -import org.jsweet.test.transpiler.source.api.PrimitiveInstantiation; -import org.jsweet.test.transpiler.source.api.QualifiedInstantiation; -import org.jsweet.test.transpiler.source.api.WrongJdkInvocations; import org.jsweet.transpiler.JSweetProblem; import org.junit.Assert; import org.junit.Test; +import source.api.CastMethods; +import source.api.ForeachIteration; +import source.api.JdkInvocations; +import source.api.PrimitiveInstantiation; +import source.api.QualifiedInstantiation; +import source.api.WrongJdkInvocations; + public class ApiTests extends AbstractTest { @Test diff --git a/src/test/java/org/jsweet/test/transpiler/CandiesTests.java b/src/test/java/org/jsweet/test/transpiler/CandiesTests.java index 4ac1d546..ecf8096d 100644 --- a/src/test/java/org/jsweet/test/transpiler/CandiesTests.java +++ b/src/test/java/org/jsweet/test/transpiler/CandiesTests.java @@ -16,14 +16,15 @@ package org.jsweet.test.transpiler; import static org.junit.Assert.assertEquals; -import org.jsweet.test.transpiler.source.candies.Angular; -import org.jsweet.test.transpiler.source.candies.ExpressLib; -import org.jsweet.test.transpiler.source.candies.GlobalsImport; -import org.jsweet.test.transpiler.source.candies.JQuery; -import org.jsweet.test.transpiler.source.candies.QualifiedNames; import org.jsweet.transpiler.ModuleKind; import org.junit.Test; +import source.candies.Angular; +import source.candies.ExpressLib; +import source.candies.GlobalsImport; +import source.candies.JQuery; +import source.candies.QualifiedNames; + public class CandiesTests extends AbstractTest { @Test diff --git a/src/test/java/org/jsweet/test/transpiler/GenericsTests.java b/src/test/java/org/jsweet/test/transpiler/GenericsTests.java index c298f18b..211e4d39 100644 --- a/src/test/java/org/jsweet/test/transpiler/GenericsTests.java +++ b/src/test/java/org/jsweet/test/transpiler/GenericsTests.java @@ -16,9 +16,10 @@ package org.jsweet.test.transpiler; import static org.junit.Assert.assertEquals; -import org.jsweet.test.transpiler.source.generics.InstantiationWithGenerics; import org.junit.Test; +import source.generics.InstantiationWithGenerics; + public class GenericsTests extends AbstractTest { @Test diff --git a/src/test/java/org/jsweet/test/transpiler/InitTests.java b/src/test/java/org/jsweet/test/transpiler/InitTests.java index 916e1c0d..4328a186 100644 --- a/src/test/java/org/jsweet/test/transpiler/InitTests.java +++ b/src/test/java/org/jsweet/test/transpiler/InitTests.java @@ -19,25 +19,26 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.jsweet.test.transpiler.source.init.Constructor; -import org.jsweet.test.transpiler.source.init.ConstructorField; -import org.jsweet.test.transpiler.source.init.ConstructorFieldInInterface; -import org.jsweet.test.transpiler.source.init.ConstructorMethod; -import org.jsweet.test.transpiler.source.init.ConstructorMethodInInterface; -import org.jsweet.test.transpiler.source.init.Initializer; -import org.jsweet.test.transpiler.source.init.InitializerStatementConditionError; -import org.jsweet.test.transpiler.source.init.InitializerStatementError; -import org.jsweet.test.transpiler.source.init.InterfaceRawConstruction; -import org.jsweet.test.transpiler.source.init.MultipleMains; -import org.jsweet.test.transpiler.source.init.NoOptionalFieldsInClass; -import org.jsweet.test.transpiler.source.init.StaticInitializer; -import org.jsweet.test.transpiler.source.structural.OptionalField; -import org.jsweet.test.transpiler.source.structural.OptionalFieldError; import org.jsweet.transpiler.JSweetProblem; import org.jsweet.transpiler.util.EvaluationResult; import org.junit.Assert; import org.junit.Test; +import source.init.Constructor; +import source.init.ConstructorField; +import source.init.ConstructorFieldInInterface; +import source.init.ConstructorMethod; +import source.init.ConstructorMethodInInterface; +import source.init.Initializer; +import source.init.InitializerStatementConditionError; +import source.init.InitializerStatementError; +import source.init.InterfaceRawConstruction; +import source.init.MultipleMains; +import source.init.NoOptionalFieldsInClass; +import source.init.StaticInitializer; +import source.structural.OptionalField; +import source.structural.OptionalFieldError; + public class InitTests extends AbstractTest { @Test diff --git a/src/test/java/org/jsweet/test/transpiler/OverloadTests.java b/src/test/java/org/jsweet/test/transpiler/OverloadTests.java index 950bcc7e..c678d5da 100644 --- a/src/test/java/org/jsweet/test/transpiler/OverloadTests.java +++ b/src/test/java/org/jsweet/test/transpiler/OverloadTests.java @@ -17,13 +17,14 @@ package org.jsweet.test.transpiler; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import org.jsweet.test.transpiler.source.overload.Overload; -import org.jsweet.test.transpiler.source.overload.WrongOverload; -import org.jsweet.test.transpiler.source.overload.WrongOverloads; import org.jsweet.transpiler.JSweetProblem; import org.jsweet.transpiler.util.EvaluationResult; import org.junit.Test; +import source.overload.Overload; +import source.overload.WrongOverload; +import source.overload.WrongOverloads; + public class OverloadTests extends AbstractTest { @Test diff --git a/src/test/java/org/jsweet/test/transpiler/RequireTests.java b/src/test/java/org/jsweet/test/transpiler/RequireTests.java index ce37cf3b..3b0cfe56 100644 --- a/src/test/java/org/jsweet/test/transpiler/RequireTests.java +++ b/src/test/java/org/jsweet/test/transpiler/RequireTests.java @@ -17,34 +17,35 @@ package org.jsweet.test.transpiler; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.jsweet.test.transpiler.source.blocksgame.Ball; -import org.jsweet.test.transpiler.source.blocksgame.BlockElement; -import org.jsweet.test.transpiler.source.blocksgame.Factory; -import org.jsweet.test.transpiler.source.blocksgame.GameArea; -import org.jsweet.test.transpiler.source.blocksgame.GameManager; -import org.jsweet.test.transpiler.source.blocksgame.Globals; -import org.jsweet.test.transpiler.source.blocksgame.Player; -import org.jsweet.test.transpiler.source.blocksgame.util.AnimatedElement; -import org.jsweet.test.transpiler.source.blocksgame.util.Collisions; -import org.jsweet.test.transpiler.source.blocksgame.util.Direction; -import org.jsweet.test.transpiler.source.blocksgame.util.Line; -import org.jsweet.test.transpiler.source.blocksgame.util.MobileElement; -import org.jsweet.test.transpiler.source.blocksgame.util.Point; -import org.jsweet.test.transpiler.source.blocksgame.util.Rectangle; -import org.jsweet.test.transpiler.source.blocksgame.util.Vector; -import org.jsweet.test.transpiler.source.require.TopLevel1; -import org.jsweet.test.transpiler.source.require.TopLevel2; -import org.jsweet.test.transpiler.source.require.a.A; -import org.jsweet.test.transpiler.source.require.a.Use1; -import org.jsweet.test.transpiler.source.require.a.Use2; -import org.jsweet.test.transpiler.source.require.a.b.B1; -import org.jsweet.test.transpiler.source.require.a.b.B2; -import org.jsweet.test.transpiler.source.require.b.ClassImport; -import org.jsweet.test.transpiler.source.require.b.ClassImportImplicitRequire; -import org.jsweet.test.transpiler.source.require.b.GlobalsImport; import org.jsweet.transpiler.ModuleKind; import org.junit.Test; +import source.blocksgame.Ball; +import source.blocksgame.BlockElement; +import source.blocksgame.Factory; +import source.blocksgame.GameArea; +import source.blocksgame.GameManager; +import source.blocksgame.Globals; +import source.blocksgame.Player; +import source.blocksgame.util.AnimatedElement; +import source.blocksgame.util.Collisions; +import source.blocksgame.util.Direction; +import source.blocksgame.util.Line; +import source.blocksgame.util.MobileElement; +import source.blocksgame.util.Point; +import source.blocksgame.util.Rectangle; +import source.blocksgame.util.Vector; +import source.require.TopLevel1; +import source.require.TopLevel2; +import source.require.a.A; +import source.require.a.Use1; +import source.require.a.Use2; +import source.require.a.b.B1; +import source.require.a.b.B2; +import source.require.b.ClassImport; +import source.require.b.ClassImportImplicitRequire; +import source.require.b.GlobalsImport; + public class RequireTests extends AbstractTest { @Test @@ -81,7 +82,7 @@ public class RequireTests extends AbstractTest { public void testGlobalsImport() { transpile(logHandler -> { assertEquals("There should be no errors", 0, logHandler.reportedProblems.size()); - } , getSourceFile(org.jsweet.test.transpiler.source.require.globals.Globals.class), getSourceFile(GlobalsImport.class)); + } , getSourceFile(source.require.globals.Globals.class), getSourceFile(GlobalsImport.class)); } @Test diff --git a/src/test/java/org/jsweet/test/transpiler/RootTests.java b/src/test/java/org/jsweet/test/transpiler/RootTests.java new file mode 100644 index 00000000..a25a385c --- /dev/null +++ b/src/test/java/org/jsweet/test/transpiler/RootTests.java @@ -0,0 +1,63 @@ +/* Copyright 2015 CINCHEO SAS + * + * Licensed 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.jsweet.test.transpiler; + +import static org.junit.Assert.assertEquals; + +import org.jsweet.transpiler.JSweetProblem; +import org.junit.Assert; +import org.junit.Test; + +import source.root.noroot.a.GlobalsInNoRoot; +import source.root.root.a.GlobalsInRoot; +import source.root.rootparent1.InvalidClassLocation; +import source.root.rootparent1.root.NoClassesInRootParent; +import source.root.rootparent2.root.NoRootInRoot; + +public class RootTests extends AbstractTest { + + @Test + public void testGlobalsInRoot() { + eval((logHandler, r) -> { + assertEquals("There should be no errors", 0, logHandler.reportedProblems.size()); + Assert.assertEquals(true, r.get("m1")); + Assert.assertEquals(true, r.get("m2")); + } , getSourceFile(GlobalsInRoot.class)); + } + + @Test + public void testGlobalsInNoRoot() { + eval((logHandler, r) -> { + assertEquals("There should be no errors", 0, logHandler.reportedProblems.size()); + Assert.assertEquals(true, r.get("m1")); + Assert.assertEquals(true, r.get("m2")); + } , getSourceFile(GlobalsInNoRoot.class)); + } + + @Test + public void testNoClassesInRootParent() { + transpile((logHandler) -> { + logHandler.assertReportedProblems(JSweetProblem.CLASS_OUT_OF_ROOT_PACKAGE_SCOPE); + } , getSourceFile(InvalidClassLocation.class), getSourceFile(NoClassesInRootParent.class)); + } + + @Test + public void testNoRootInRoot() { + transpile((logHandler) -> { + logHandler.assertReportedProblems(JSweetProblem.ENCLOSED_ROOT_PACKAGES); + } , getSourceFile(NoRootInRoot.class)); + } + +} diff --git a/src/test/java/org/jsweet/test/transpiler/StructuralTests.java b/src/test/java/org/jsweet/test/transpiler/StructuralTests.java index 4e6a4fe1..844de7f6 100644 --- a/src/test/java/org/jsweet/test/transpiler/StructuralTests.java +++ b/src/test/java/org/jsweet/test/transpiler/StructuralTests.java @@ -22,38 +22,38 @@ import static org.jsweet.transpiler.JSweetProblem.GLOBAL_INDEXER_SET; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.jsweet.test.transpiler.source.structural.AbstractClass; -import org.jsweet.test.transpiler.source.structural.AutoImportClassesInSamePackage; -import org.jsweet.test.transpiler.source.structural.AutoImportClassesInSamePackageUsed; -import org.jsweet.test.transpiler.source.structural.Enums; -import org.jsweet.test.transpiler.source.structural.ExtendsClassInSameFile; -import org.jsweet.test.transpiler.source.structural.ExtendsObject; -import org.jsweet.test.transpiler.source.structural.GlobalsAccess; -import org.jsweet.test.transpiler.source.structural.Inheritance; -import org.jsweet.test.transpiler.source.structural.InnerClass; -import org.jsweet.test.transpiler.source.structural.NameClashes; -import org.jsweet.test.transpiler.source.structural.NoInstanceofForInterfaces; -import org.jsweet.test.transpiler.source.structural.NoWildcardsInImports; -import org.jsweet.test.transpiler.source.structural.TwoClassesInSameFile; -import org.jsweet.test.transpiler.source.structural.WrongConstructsInEnums; -import org.jsweet.test.transpiler.source.structural.WrongConstructsInInterfaces; -import org.jsweet.test.transpiler.source.structural.globalclasses.Globals; -import org.jsweet.test.transpiler.source.structural.globalclasses.a.GlobalsConstructor; -import org.jsweet.test.transpiler.source.structural.globalclasses.b.GlobalFunctionStaticGetSet; -import org.jsweet.test.transpiler.source.structural.globalclasses.c.GlobalFunctionGetSet; -import org.jsweet.test.transpiler.source.structural.globalclasses.d.GlobalFunctionAccessFromMain; -import org.jsweet.test.transpiler.source.structural.globalclasses.f.GlobalFunctionStaticDelete; -import org.jsweet.test.transpiler.source.structural.globalclasses.g.GlobalFunctionDelete; -import org.jsweet.test.transpiler.source.structural.globalclasses.noroot.a.GlobalsInNoRoot; -import org.jsweet.test.transpiler.source.structural.globalclasses.root.a.GlobalsInRoot; -import org.jsweet.test.transpiler.source.structural.rootparent1.InvalidClassLocation; -import org.jsweet.test.transpiler.source.structural.rootparent1.root.NoClassesInRootParent; -import org.jsweet.test.transpiler.source.structural.rootparent2.root.NoRootInRoot; import org.jsweet.transpiler.JSweetProblem; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; +import source.root.noroot.a.GlobalsInNoRoot; +import source.root.root.a.GlobalsInRoot; +import source.root.rootparent1.InvalidClassLocation; +import source.root.rootparent1.root.NoClassesInRootParent; +import source.root.rootparent2.root.NoRootInRoot; +import source.structural.AbstractClass; +import source.structural.AutoImportClassesInSamePackage; +import source.structural.AutoImportClassesInSamePackageUsed; +import source.structural.Enums; +import source.structural.ExtendsClassInSameFile; +import source.structural.ExtendsObject; +import source.structural.GlobalsAccess; +import source.structural.Inheritance; +import source.structural.InnerClass; +import source.structural.NameClashes; +import source.structural.NoInstanceofForInterfaces; +import source.structural.NoWildcardsInImports; +import source.structural.TwoClassesInSameFile; +import source.structural.WrongConstructsInEnums; +import source.structural.WrongConstructsInInterfaces; +import source.structural.globalclasses.Globals; +import source.structural.globalclasses.a.GlobalsConstructor; +import source.structural.globalclasses.b.GlobalFunctionStaticGetSet; +import source.structural.globalclasses.c.GlobalFunctionGetSet; +import source.structural.globalclasses.d.GlobalFunctionAccessFromMain; +import source.structural.globalclasses.f.GlobalFunctionStaticDelete; +import source.structural.globalclasses.g.GlobalFunctionDelete; + public class StructuralTests extends AbstractTest { @Test @@ -205,48 +205,14 @@ public class StructuralTests extends AbstractTest { Assert.assertEquals("invoked", r.get("test")); Assert.assertEquals("invoked1_2", r.get("Static")); Assert.assertEquals("invoked1_2", r.get("test2")); - } , getSourceFile(Globals.class), getSourceFile(org.jsweet.test.transpiler.source.structural.globalclasses.e.Globals.class), + } , getSourceFile(Globals.class), getSourceFile(source.structural.globalclasses.e.Globals.class), getSourceFile(GlobalFunctionAccessFromMain.class)); } - @Test - public void testGlobalsInRoot() { - eval((logHandler, r) -> { - assertEquals("There should be no errors", 0, logHandler.reportedProblems.size()); - Assert.assertEquals(true, r.get("m1")); - Assert.assertEquals(true, r.get("m2")); - } , getSourceFile(GlobalsInRoot.class)); - } - - @Test - public void testGlobalsInNoRoot() { - eval((logHandler, r) -> { - assertEquals("There should be no errors", 0, logHandler.reportedProblems.size()); - Assert.assertEquals(true, r.get("m1")); - Assert.assertEquals(true, r.get("m2")); - } , getSourceFile(GlobalsInNoRoot.class)); - } - - @Ignore - @Test - public void testNoClassesInRootParent() { - transpile((logHandler) -> { - assertEquals(1, logHandler.reportedProblems.size()); - } , getSourceFile(InvalidClassLocation.class), getSourceFile(NoClassesInRootParent.class)); - } - - @Ignore - @Test - public void testNoRootInRoot() { - transpile((logHandler) -> { - assertEquals(1, logHandler.reportedProblems.size()); - } , getSourceFile(NoRootInRoot.class)); - } - @Test public void testWildcardsInImports() { transpile((logHandler) -> { - logHandler.assertReportedProblems(JSweetProblem.WILDCARD_IMPORT, JSweetProblem.WILDCARD_IMPORT); + logHandler.assertReportedProblems(JSweetProblem.WILDCARD_IMPORT); } , getSourceFile(NoWildcardsInImports.class)); } diff --git a/src/test/java/org/jsweet/test/transpiler/SyntaxTests.java b/src/test/java/org/jsweet/test/transpiler/SyntaxTests.java index 135ad696..729c384b 100644 --- a/src/test/java/org/jsweet/test/transpiler/SyntaxTests.java +++ b/src/test/java/org/jsweet/test/transpiler/SyntaxTests.java @@ -18,22 +18,23 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -import org.jsweet.test.transpiler.source.syntax.AnnotationQualifiedNames; -import org.jsweet.test.transpiler.source.syntax.FinalVariables; -import org.jsweet.test.transpiler.source.syntax.FinalVariablesRuntime; -import org.jsweet.test.transpiler.source.syntax.GlobalsInvocation; -import org.jsweet.test.transpiler.source.syntax.IndexedAccessInStaticScope; -import org.jsweet.test.transpiler.source.syntax.Keywords; -import org.jsweet.test.transpiler.source.syntax.Labels; -import org.jsweet.test.transpiler.source.syntax.QualifiedNames; -import org.jsweet.test.transpiler.source.syntax.References; -import org.jsweet.test.transpiler.source.syntax.SpecialFunctions; -import org.jsweet.test.transpiler.source.syntax.ValidIndexedAccesses; import org.jsweet.transpiler.JSweetProblem; import org.jsweet.transpiler.util.EvaluationResult; import org.junit.Assert; import org.junit.Test; +import source.syntax.AnnotationQualifiedNames; +import source.syntax.FinalVariables; +import source.syntax.FinalVariablesRuntime; +import source.syntax.GlobalsInvocation; +import source.syntax.IndexedAccessInStaticScope; +import source.syntax.Keywords; +import source.syntax.Labels; +import source.syntax.QualifiedNames; +import source.syntax.References; +import source.syntax.SpecialFunctions; +import source.syntax.ValidIndexedAccesses; + public class SyntaxTests extends AbstractTest { @Test diff --git a/src/test/java/org/jsweet/test/transpiler/ThrowableTests.java b/src/test/java/org/jsweet/test/transpiler/ThrowableTests.java index 4a74eb82..2e3f4bbe 100644 --- a/src/test/java/org/jsweet/test/transpiler/ThrowableTests.java +++ b/src/test/java/org/jsweet/test/transpiler/ThrowableTests.java @@ -16,13 +16,14 @@ package org.jsweet.test.transpiler; import static org.junit.Assert.fail; -import org.jsweet.test.transpiler.source.throwable.InvalidTryCatchTest; -import org.jsweet.test.transpiler.source.throwable.TryCatchFinallyTest; import org.jsweet.transpiler.JSweetProblem; import org.jsweet.transpiler.util.EvaluationResult; import org.junit.Assert; import org.junit.Test; +import source.throwable.InvalidTryCatchTest; +import source.throwable.TryCatchFinallyTest; + public class ThrowableTests extends AbstractTest { @Test diff --git a/src/test/java/org/jsweet/test/transpiler/TranspilerTests.java b/src/test/java/org/jsweet/test/transpiler/TranspilerTests.java index d3da43c5..0fc0372e 100644 --- a/src/test/java/org/jsweet/test/transpiler/TranspilerTests.java +++ b/src/test/java/org/jsweet/test/transpiler/TranspilerTests.java @@ -23,8 +23,6 @@ import java.io.File; import java.util.LinkedList; import org.jsweet.JSweetCommandLineLauncher; -import org.jsweet.test.transpiler.source.overload.Overload; -import org.jsweet.test.transpiler.source.structural.AbstractClass; import org.jsweet.transpiler.JSweetTranspiler; import org.jsweet.transpiler.ModuleKind; import org.jsweet.transpiler.SourceFile; @@ -33,6 +31,9 @@ import org.jsweet.transpiler.util.Util; import org.junit.Ignore; import org.junit.Test; +import source.overload.Overload; +import source.structural.AbstractClass; + public class TranspilerTests extends AbstractTest { @Ignore diff --git a/src/test/java/org/jsweet/test/transpiler/TsComparisonTest.java b/src/test/java/org/jsweet/test/transpiler/TsComparisonTest.java index 393fdab4..f04916ee 100644 --- a/src/test/java/org/jsweet/test/transpiler/TsComparisonTest.java +++ b/src/test/java/org/jsweet/test/transpiler/TsComparisonTest.java @@ -21,18 +21,19 @@ import static org.junit.Assert.fail; import java.io.File; import org.apache.commons.io.FileUtils; -import org.jsweet.test.transpiler.source.tscomparison.AbstractClasses; -import org.jsweet.test.transpiler.source.tscomparison.ActualScoping; -import org.jsweet.test.transpiler.source.tscomparison.CompileTimeWarnings; -import org.jsweet.test.transpiler.source.tscomparison.OtherThisExample; -import org.jsweet.test.transpiler.source.tscomparison.SaferVarargs; -import org.jsweet.test.transpiler.source.tscomparison.StrongerTyping; -import org.jsweet.test.transpiler.source.tscomparison.ThisIsThis; import org.jsweet.transpiler.SourceFile; import org.jsweet.transpiler.util.EvaluationResult; import org.junit.Ignore; import org.junit.Test; +import source.tscomparison.AbstractClasses; +import source.tscomparison.ActualScoping; +import source.tscomparison.CompileTimeWarnings; +import source.tscomparison.OtherThisExample; +import source.tscomparison.SaferVarargs; +import source.tscomparison.StrongerTyping; +import source.tscomparison.ThisIsThis; + public class TsComparisonTest extends AbstractTest { @Ignore diff --git a/src/test/java/org/jsweet/test/transpiler/TypingTests.java b/src/test/java/org/jsweet/test/transpiler/TypingTests.java index 80e65219..7c69aa7e 100644 --- a/src/test/java/org/jsweet/test/transpiler/TypingTests.java +++ b/src/test/java/org/jsweet/test/transpiler/TypingTests.java @@ -16,22 +16,23 @@ package org.jsweet.test.transpiler; import static org.junit.Assert.fail; -import org.jsweet.test.transpiler.source.typing.ArraysOfLambdas; -import org.jsweet.test.transpiler.source.typing.ClassTypeAsFunction; -import org.jsweet.test.transpiler.source.typing.ClassTypeAsTypeOf; -import org.jsweet.test.transpiler.source.typing.InvalidIndexedAccesses; -import org.jsweet.test.transpiler.source.typing.Lambdas; -import org.jsweet.test.transpiler.source.typing.Numbers; -import org.jsweet.test.transpiler.source.typing.StringTypesUsage; -import org.jsweet.test.transpiler.source.typing.Tuples; -import org.jsweet.test.transpiler.source.typing.Unions; -import org.jsweet.test.transpiler.source.typing.VoidType; -import org.jsweet.test.transpiler.source.typing.WrongUnions; import org.jsweet.transpiler.JSweetProblem; import org.jsweet.transpiler.util.EvaluationResult; import org.junit.Assert; import org.junit.Test; +import source.typing.ArraysOfLambdas; +import source.typing.ClassTypeAsFunction; +import source.typing.ClassTypeAsTypeOf; +import source.typing.InvalidIndexedAccesses; +import source.typing.Lambdas; +import source.typing.Numbers; +import source.typing.StringTypesUsage; +import source.typing.Tuples; +import source.typing.Unions; +import source.typing.VoidType; +import source.typing.WrongUnions; + public class TypingTests extends AbstractTest { @Test diff --git a/src/test/java/org/jsweet/test/transpiler/VarargsTests.java b/src/test/java/org/jsweet/test/transpiler/VarargsTests.java index 12f261a8..12784934 100644 --- a/src/test/java/org/jsweet/test/transpiler/VarargsTests.java +++ b/src/test/java/org/jsweet/test/transpiler/VarargsTests.java @@ -16,18 +16,19 @@ package org.jsweet.test.transpiler; import static org.junit.Assert.assertEquals; -import org.jsweet.test.transpiler.source.varargs.VarargsCalledWithArray; -import org.jsweet.test.transpiler.source.varargs.VarargsOnAnonymous; -import org.jsweet.test.transpiler.source.varargs.VarargsOnApi; -import org.jsweet.test.transpiler.source.varargs.VarargsOnField; -import org.jsweet.test.transpiler.source.varargs.VarargsOnGetter; -import org.jsweet.test.transpiler.source.varargs.VarargsOnNew; -import org.jsweet.test.transpiler.source.varargs.VarargsOnStaticMethod; -import org.jsweet.test.transpiler.source.varargs.VarargsTransmission; import org.jsweet.transpiler.util.EvaluationResult; import org.junit.Ignore; import org.junit.Test; +import source.varargs.VarargsCalledWithArray; +import source.varargs.VarargsOnAnonymous; +import source.varargs.VarargsOnApi; +import source.varargs.VarargsOnField; +import source.varargs.VarargsOnGetter; +import source.varargs.VarargsOnNew; +import source.varargs.VarargsOnStaticMethod; +import source.varargs.VarargsTransmission; + public class VarargsTests extends AbstractTest { @Test @Ignore diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/root/package-info.java b/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/root/package-info.java deleted file mode 100644 index b5906c79..00000000 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/root/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@jsweet.lang.Root -package org.jsweet.test.transpiler.source.structural.globalclasses.root; \ No newline at end of file diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/rootparent1/InvalidClassLocation.java b/src/test/java/org/jsweet/test/transpiler/source/structural/rootparent1/InvalidClassLocation.java deleted file mode 100644 index 1bd5206f..00000000 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/rootparent1/InvalidClassLocation.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jsweet.test.transpiler.source.structural.rootparent1; - -public class InvalidClassLocation { - -} diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/rootparent1/root/NoClassesInRootParent.java b/src/test/java/org/jsweet/test/transpiler/source/structural/rootparent1/root/NoClassesInRootParent.java deleted file mode 100644 index 2f7d7f89..00000000 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/rootparent1/root/NoClassesInRootParent.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jsweet.test.transpiler.source.structural.rootparent1.root; - -public class NoClassesInRootParent { - -} diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/rootparent1/root/package-info.java b/src/test/java/org/jsweet/test/transpiler/source/structural/rootparent1/root/package-info.java deleted file mode 100644 index d1a06638..00000000 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/rootparent1/root/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@jsweet.lang.Root -package org.jsweet.test.transpiler.source.structural.rootparent1.root; \ No newline at end of file diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/rootparent2/package-info.java b/src/test/java/org/jsweet/test/transpiler/source/structural/rootparent2/package-info.java deleted file mode 100644 index 8855e9f6..00000000 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/rootparent2/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@jsweet.lang.Root -package org.jsweet.test.transpiler.source.structural.rootparent2; \ No newline at end of file diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/rootparent2/root/NoRootInRoot.java b/src/test/java/org/jsweet/test/transpiler/source/structural/rootparent2/root/NoRootInRoot.java deleted file mode 100644 index f53dd333..00000000 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/rootparent2/root/NoRootInRoot.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jsweet.test.transpiler.source.structural.rootparent2.root; - -public class NoRootInRoot { - -} diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/rootparent2/root/package-info.java b/src/test/java/org/jsweet/test/transpiler/source/structural/rootparent2/root/package-info.java deleted file mode 100644 index 593a1d7d..00000000 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/rootparent2/root/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@jsweet.lang.Root -package org.jsweet.test.transpiler.source.structural.rootparent2.root; \ No newline at end of file diff --git a/src/test/java/org/jsweet/test/transpiler/source/ambient/LibAccess.java b/src/test/java/source/ambient/LibAccess.java similarity index 84% rename from src/test/java/org/jsweet/test/transpiler/source/ambient/LibAccess.java rename to src/test/java/source/ambient/LibAccess.java index 02c54793..6e2259f4 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/ambient/LibAccess.java +++ b/src/test/java/source/ambient/LibAccess.java @@ -12,18 +12,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.ambient; +package source.ambient; import jsweet.lang.Ambient; public class LibAccess { public static void main(String[] args) { - Base m = new org.jsweet.test.transpiler.source.ambient.Base(); + Base m = new source.ambient.Base(); m.m1(); //MixinInterface.class.cast(m).extension(); - ((org.jsweet.test.transpiler.source.ambient.Extension) m).m2(); + ((source.ambient.Extension) m).m2(); //MixinInterface.class.cast(get()).extension(); diff --git a/src/test/java/org/jsweet/test/transpiler/source/ambient/LibAccessSubModule.java b/src/test/java/source/ambient/LibAccessSubModule.java similarity index 66% rename from src/test/java/org/jsweet/test/transpiler/source/ambient/LibAccessSubModule.java rename to src/test/java/source/ambient/LibAccessSubModule.java index 9bbf427b..dbf4ee1f 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/ambient/LibAccessSubModule.java +++ b/src/test/java/source/ambient/LibAccessSubModule.java @@ -12,18 +12,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.ambient; +package source.ambient; -import org.jsweet.test.transpiler.source.ambient.lib.Base; -import org.jsweet.test.transpiler.source.ambient.lib.Extension; -import org.jsweet.test.transpiler.source.ambient.lib.sub.C; +import source.ambient.lib.Base; +import source.ambient.lib.Extension; +import source.ambient.lib.sub.C; public class LibAccessSubModule { public static void main(String[] args) { - Base m = new org.jsweet.test.transpiler.source.ambient.lib.Base(); + Base m = new source.ambient.lib.Base(); m.m1(); - ((org.jsweet.test.transpiler.source.ambient.lib.Extension) m).m2(); + ((source.ambient.lib.Extension) m).m2(); ((Extension) get()).m2(); } diff --git a/src/test/java/org/jsweet/test/transpiler/source/ambient/lib.js b/src/test/java/source/ambient/lib.js similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/ambient/lib.js rename to src/test/java/source/ambient/lib.js diff --git a/src/test/java/org/jsweet/test/transpiler/source/ambient/lib/Base.java b/src/test/java/source/ambient/lib/Base.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/ambient/lib/Base.java rename to src/test/java/source/ambient/lib/Base.java index b2eb2790..91d8a057 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/ambient/lib/Base.java +++ b/src/test/java/source/ambient/lib/Base.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.ambient.lib; +package source.ambient.lib; import jsweet.lang.Ambient; diff --git a/src/test/java/org/jsweet/test/transpiler/source/ambient/lib/Extension.java b/src/test/java/source/ambient/lib/Extension.java similarity index 80% rename from src/test/java/org/jsweet/test/transpiler/source/ambient/lib/Extension.java rename to src/test/java/source/ambient/lib/Extension.java index 9d0ed8ff..0fd26c34 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/ambient/lib/Extension.java +++ b/src/test/java/source/ambient/lib/Extension.java @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.ambient.lib; +package source.ambient.lib; import jsweet.lang.Ambient; @Ambient // @Interface -public class Extension extends org.jsweet.test.transpiler.source.ambient.lib.Base { +public class Extension extends source.ambient.lib.Base { native public void m2(); } diff --git a/src/test/java/org/jsweet/test/transpiler/source/ambient/lib/sub/C.java b/src/test/java/source/ambient/lib/sub/C.java similarity index 89% rename from src/test/java/org/jsweet/test/transpiler/source/ambient/lib/sub/C.java rename to src/test/java/source/ambient/lib/sub/C.java index 8d929756..af6cf9c9 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/ambient/lib/sub/C.java +++ b/src/test/java/source/ambient/lib/sub/C.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.ambient.lib.sub; +package source.ambient.lib.sub; import jsweet.lang.Ambient; diff --git a/src/test/java/org/jsweet/test/transpiler/source/ambient/libsub.js b/src/test/java/source/ambient/libsub.js similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/ambient/libsub.js rename to src/test/java/source/ambient/libsub.js diff --git a/src/test/java/org/jsweet/test/transpiler/source/require/package-info.java b/src/test/java/source/ambient/package-info.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/require/package-info.java rename to src/test/java/source/ambient/package-info.java index 2962985a..19a54a4c 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/require/package-info.java +++ b/src/test/java/source/ambient/package-info.java @@ -12,5 +12,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@jsweet.lang.Root -package org.jsweet.test.transpiler.source.require; \ No newline at end of file +@jsweet.lang.Root +package source.ambient; diff --git a/src/test/java/org/jsweet/test/transpiler/source/api/CastMethods.java b/src/test/java/source/api/CastMethods.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/api/CastMethods.java rename to src/test/java/source/api/CastMethods.java index 4808df56..d23e4972 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/api/CastMethods.java +++ b/src/test/java/source/api/CastMethods.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.api; +package source.api; import jsweet.lang.Boolean; import jsweet.lang.Number; diff --git a/src/test/java/org/jsweet/test/transpiler/source/api/ForeachIteration.java b/src/test/java/source/api/ForeachIteration.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/api/ForeachIteration.java rename to src/test/java/source/api/ForeachIteration.java index 05a3ac23..06d9afcf 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/api/ForeachIteration.java +++ b/src/test/java/source/api/ForeachIteration.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.api; +package source.api; import jsweet.lang.Array; import jsweet.lang.IArguments; diff --git a/src/test/java/org/jsweet/test/transpiler/source/api/JdkInvocations.java b/src/test/java/source/api/JdkInvocations.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/api/JdkInvocations.java rename to src/test/java/source/api/JdkInvocations.java index 6c10f074..11283e14 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/api/JdkInvocations.java +++ b/src/test/java/source/api/JdkInvocations.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.api; +package source.api; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/api/PrimitiveInstantiation.java b/src/test/java/source/api/PrimitiveInstantiation.java similarity index 93% rename from src/test/java/org/jsweet/test/transpiler/source/api/PrimitiveInstantiation.java rename to src/test/java/source/api/PrimitiveInstantiation.java index ca0143f8..a888e985 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/api/PrimitiveInstantiation.java +++ b/src/test/java/source/api/PrimitiveInstantiation.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.api; +package source.api; import jsweet.lang.Function; import jsweet.lang.String; diff --git a/src/test/java/org/jsweet/test/transpiler/source/api/QualifiedInstantiation.java b/src/test/java/source/api/QualifiedInstantiation.java similarity index 94% rename from src/test/java/org/jsweet/test/transpiler/source/api/QualifiedInstantiation.java rename to src/test/java/source/api/QualifiedInstantiation.java index 1dd45ca1..8e7067b3 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/api/QualifiedInstantiation.java +++ b/src/test/java/source/api/QualifiedInstantiation.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.api; +package source.api; public class QualifiedInstantiation { diff --git a/src/test/java/org/jsweet/test/transpiler/source/api/WrongJdkInvocations.java b/src/test/java/source/api/WrongJdkInvocations.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/api/WrongJdkInvocations.java rename to src/test/java/source/api/WrongJdkInvocations.java index d7ec7e23..b51364ba 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/api/WrongJdkInvocations.java +++ b/src/test/java/source/api/WrongJdkInvocations.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.api; +package source.api; import java.io.FileInputStream; import java.util.Iterator; diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/Ball.java b/src/test/java/source/blocksgame/Ball.java similarity index 87% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/Ball.java rename to src/test/java/source/blocksgame/Ball.java index 79df71a9..8b5bc396 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/Ball.java +++ b/src/test/java/source/blocksgame/Ball.java @@ -12,14 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.blocksgame; - -import org.jsweet.test.transpiler.source.blocksgame.util.MobileElement; -import org.jsweet.test.transpiler.source.blocksgame.util.Point; -import org.jsweet.test.transpiler.source.blocksgame.util.Vector; +package source.blocksgame; import jsweet.dom.CanvasRenderingContext2D; import jsweet.lang.Math; +import source.blocksgame.util.MobileElement; +import source.blocksgame.util.Point; +import source.blocksgame.util.Vector; public class Ball extends MobileElement { diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/BlockElement.java b/src/test/java/source/blocksgame/BlockElement.java similarity index 88% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/BlockElement.java rename to src/test/java/source/blocksgame/BlockElement.java index 6524b46f..2a52ff44 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/BlockElement.java +++ b/src/test/java/source/blocksgame/BlockElement.java @@ -12,18 +12,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.blocksgame; +package source.blocksgame; import static jsweet.dom.Globals.document; -import org.jsweet.test.transpiler.source.blocksgame.util.AnimatedElement; -import org.jsweet.test.transpiler.source.blocksgame.util.Collisions; -import org.jsweet.test.transpiler.source.blocksgame.util.MobileElement; -import org.jsweet.test.transpiler.source.blocksgame.util.Point; -import org.jsweet.test.transpiler.source.blocksgame.util.Vector; - import jsweet.dom.CanvasRenderingContext2D; import jsweet.dom.HTMLImageElement; +import source.blocksgame.util.AnimatedElement; +import source.blocksgame.util.Collisions; +import source.blocksgame.util.MobileElement; +import source.blocksgame.util.Point; +import source.blocksgame.util.Vector; public class BlockElement extends AnimatedElement { diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/Factory.java b/src/test/java/source/blocksgame/Factory.java similarity index 88% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/Factory.java rename to src/test/java/source/blocksgame/Factory.java index 77ec3a65..2215b7e3 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/Factory.java +++ b/src/test/java/source/blocksgame/Factory.java @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.blocksgame; +package source.blocksgame; -import org.jsweet.test.transpiler.source.blocksgame.util.Direction; -import org.jsweet.test.transpiler.source.blocksgame.util.Point; +import source.blocksgame.util.Direction; +import source.blocksgame.util.Point; public class Factory { diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/GameArea.java b/src/test/java/source/blocksgame/GameArea.java similarity index 95% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/GameArea.java rename to src/test/java/source/blocksgame/GameArea.java index 010893ee..48faa42c 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/GameArea.java +++ b/src/test/java/source/blocksgame/GameArea.java @@ -12,17 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.blocksgame; +package source.blocksgame; import static jsweet.dom.Globals.console; import static jsweet.dom.Globals.document; import static jsweet.util.Globals.array; import static jsweet.util.StringTypes._2d; -import org.jsweet.test.transpiler.source.blocksgame.util.Direction; -import org.jsweet.test.transpiler.source.blocksgame.util.Point; -import org.jsweet.test.transpiler.source.blocksgame.util.Rectangle; - import jsweet.dom.CanvasRenderingContext2D; import jsweet.dom.Event; import jsweet.dom.HTMLElement; @@ -31,6 +27,9 @@ import jsweet.dom.Touch; import jsweet.dom.TouchEvent; import jsweet.lang.Date; import jsweet.lang.Math; +import source.blocksgame.util.Direction; +import source.blocksgame.util.Point; +import source.blocksgame.util.Rectangle; public class GameArea { diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/GameManager.java b/src/test/java/source/blocksgame/GameManager.java similarity index 94% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/GameManager.java rename to src/test/java/source/blocksgame/GameManager.java index ab6e6457..fbed80e7 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/GameManager.java +++ b/src/test/java/source/blocksgame/GameManager.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.blocksgame; +package source.blocksgame; import static jsweet.dom.Globals.console; import static jsweet.dom.Globals.document; @@ -22,9 +22,7 @@ import static jsweet.util.StringTypes.mouseup; import static jsweet.util.StringTypes.touchend; import static jsweet.util.StringTypes.touchmove; import static jsweet.util.StringTypes.touchstart; -import static org.jsweet.test.transpiler.source.blocksgame.Globals.animate; - -import org.jsweet.test.transpiler.source.blocksgame.util.Point; +import static source.blocksgame.Globals.animate; import jsweet.dom.Event; import jsweet.dom.HTMLCanvasElement; @@ -33,6 +31,7 @@ import jsweet.dom.MouseEvent; import jsweet.dom.NodeList; import jsweet.dom.TouchEvent; import jsweet.lang.Math; +import source.blocksgame.util.Point; public class GameManager { diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/Globals.java b/src/test/java/source/blocksgame/Globals.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/Globals.java rename to src/test/java/source/blocksgame/Globals.java index 1945891b..091c3522 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/Globals.java +++ b/src/test/java/source/blocksgame/Globals.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.blocksgame; +package source.blocksgame; import static jsweet.dom.Globals.console; import static jsweet.dom.Globals.window; diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/Player.java b/src/test/java/source/blocksgame/Player.java similarity index 89% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/Player.java rename to src/test/java/source/blocksgame/Player.java index 83e97a47..a12b1bf1 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/Player.java +++ b/src/test/java/source/blocksgame/Player.java @@ -12,18 +12,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.blocksgame; +package source.blocksgame; import static jsweet.dom.Globals.console; -import org.jsweet.test.transpiler.source.blocksgame.util.Collisions; -import org.jsweet.test.transpiler.source.blocksgame.util.Direction; -import org.jsweet.test.transpiler.source.blocksgame.util.MobileElement; -import org.jsweet.test.transpiler.source.blocksgame.util.Point; -import org.jsweet.test.transpiler.source.blocksgame.util.Vector; - import jsweet.dom.CanvasRenderingContext2D; import jsweet.lang.Math; +import source.blocksgame.util.Collisions; +import source.blocksgame.util.Direction; +import source.blocksgame.util.MobileElement; +import source.blocksgame.util.Point; +import source.blocksgame.util.Vector; public class Player extends MobileElement { diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/breakable-block.png b/src/test/java/source/blocksgame/breakable-block.png similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/breakable-block.png rename to src/test/java/source/blocksgame/breakable-block.png diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/breakable-block.svg b/src/test/java/source/blocksgame/breakable-block.svg similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/breakable-block.svg rename to src/test/java/source/blocksgame/breakable-block.svg diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/index.html b/src/test/java/source/blocksgame/index.html similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/index.html rename to src/test/java/source/blocksgame/index.html diff --git a/src/test/java/org/jsweet/test/transpiler/source/ambient/package-info.java b/src/test/java/source/blocksgame/package-info.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/ambient/package-info.java rename to src/test/java/source/blocksgame/package-info.java index c1d4ee77..6dbfa3c8 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/ambient/package-info.java +++ b/src/test/java/source/blocksgame/package-info.java @@ -12,5 +12,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@jsweet.lang.Root -package org.jsweet.test.transpiler.source.ambient; +@jsweet.lang.Root +package source.blocksgame; \ No newline at end of file diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/unbreakable-block.png b/src/test/java/source/blocksgame/unbreakable-block.png similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/unbreakable-block.png rename to src/test/java/source/blocksgame/unbreakable-block.png diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/unbreakable-block.svg b/src/test/java/source/blocksgame/unbreakable-block.svg similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/unbreakable-block.svg rename to src/test/java/source/blocksgame/unbreakable-block.svg diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/AnimatedElement.java b/src/test/java/source/blocksgame/util/AnimatedElement.java similarity index 93% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/AnimatedElement.java rename to src/test/java/source/blocksgame/util/AnimatedElement.java index 26ad44da..5fff9908 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/AnimatedElement.java +++ b/src/test/java/source/blocksgame/util/AnimatedElement.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.blocksgame.util; +package source.blocksgame.util; import jsweet.dom.CanvasRenderingContext2D; diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/Collisions.java b/src/test/java/source/blocksgame/util/Collisions.java similarity index 93% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/Collisions.java rename to src/test/java/source/blocksgame/util/Collisions.java index c12f3e37..c5bcdc8b 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/Collisions.java +++ b/src/test/java/source/blocksgame/util/Collisions.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.blocksgame.util; +package source.blocksgame.util; import jsweet.lang.Math; diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/Direction.java b/src/test/java/source/blocksgame/util/Direction.java similarity index 95% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/Direction.java rename to src/test/java/source/blocksgame/util/Direction.java index f67662f4..7d1e7504 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/Direction.java +++ b/src/test/java/source/blocksgame/util/Direction.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.blocksgame.util; +package source.blocksgame.util; import jsweet.lang.Math; diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/Line.java b/src/test/java/source/blocksgame/util/Line.java similarity index 93% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/Line.java rename to src/test/java/source/blocksgame/util/Line.java index 3f21f40a..f7109a05 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/Line.java +++ b/src/test/java/source/blocksgame/util/Line.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.blocksgame.util; +package source.blocksgame.util; import jsweet.lang.Error; diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/MobileElement.java b/src/test/java/source/blocksgame/util/MobileElement.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/MobileElement.java rename to src/test/java/source/blocksgame/util/MobileElement.java index 7c6e6305..2bde89ee 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/MobileElement.java +++ b/src/test/java/source/blocksgame/util/MobileElement.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.blocksgame.util; +package source.blocksgame.util; public class MobileElement extends AnimatedElement { diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/Point.java b/src/test/java/source/blocksgame/util/Point.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/Point.java rename to src/test/java/source/blocksgame/util/Point.java index 6048ce68..be00258f 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/Point.java +++ b/src/test/java/source/blocksgame/util/Point.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.blocksgame.util; +package source.blocksgame.util; import jsweet.lang.Math; diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/Rectangle.java b/src/test/java/source/blocksgame/util/Rectangle.java similarity index 93% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/Rectangle.java rename to src/test/java/source/blocksgame/util/Rectangle.java index d4c707a7..e22f514b 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/Rectangle.java +++ b/src/test/java/source/blocksgame/util/Rectangle.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.blocksgame.util; +package source.blocksgame.util; import jsweet.lang.Math; diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/Vector.java b/src/test/java/source/blocksgame/util/Vector.java similarity index 93% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/Vector.java rename to src/test/java/source/blocksgame/util/Vector.java index 12f80afd..0c004a69 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/util/Vector.java +++ b/src/test/java/source/blocksgame/util/Vector.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.blocksgame.util; +package source.blocksgame.util; import jsweet.lang.Math; diff --git a/src/test/java/org/jsweet/test/transpiler/source/candies/Angular.java b/src/test/java/source/candies/Angular.java similarity index 94% rename from src/test/java/org/jsweet/test/transpiler/source/candies/Angular.java rename to src/test/java/source/candies/Angular.java index 2cf42ef5..66f56ccc 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/candies/Angular.java +++ b/src/test/java/source/candies/Angular.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.candies; +package source.candies; import static def.angularjs.Globals.angular; import static jsweet.util.Globals.array; diff --git a/src/test/java/org/jsweet/test/transpiler/source/candies/ExpressLib.java b/src/test/java/source/candies/ExpressLib.java similarity index 93% rename from src/test/java/org/jsweet/test/transpiler/source/candies/ExpressLib.java rename to src/test/java/source/candies/ExpressLib.java index a311c626..c19a17af 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/candies/ExpressLib.java +++ b/src/test/java/source/candies/ExpressLib.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.candies; +package source.candies; import static def.body_parser.body_parser.Globals.json; import static def.body_parser.body_parser.Globals.urlencoded; diff --git a/src/test/java/org/jsweet/test/transpiler/source/candies/GlobalsImport.java b/src/test/java/source/candies/GlobalsImport.java similarity index 93% rename from src/test/java/org/jsweet/test/transpiler/source/candies/GlobalsImport.java rename to src/test/java/source/candies/GlobalsImport.java index e26f246b..81d3ab93 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/candies/GlobalsImport.java +++ b/src/test/java/source/candies/GlobalsImport.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.candies; +package source.candies; import static def.body_parser.body_parser.Globals.json; import static def.body_parser.body_parser.Globals.urlencoded; diff --git a/src/test/java/org/jsweet/test/transpiler/source/candies/JQuery.java b/src/test/java/source/candies/JQuery.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/candies/JQuery.java rename to src/test/java/source/candies/JQuery.java index ee021f3e..992eee78 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/candies/JQuery.java +++ b/src/test/java/source/candies/JQuery.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.candies; +package source.candies; import static def.jquery.Globals.$; diff --git a/src/test/java/org/jsweet/test/transpiler/source/candies/QualifiedNames.java b/src/test/java/source/candies/QualifiedNames.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/candies/QualifiedNames.java rename to src/test/java/source/candies/QualifiedNames.java index 3e29a8e1..7bce1df3 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/candies/QualifiedNames.java +++ b/src/test/java/source/candies/QualifiedNames.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.candies; +package source.candies; import static def.socket_io.Globals.socket_io; diff --git a/src/test/java/org/jsweet/test/transpiler/source/generics/InstantiationWithGenerics.java b/src/test/java/source/generics/InstantiationWithGenerics.java similarity index 77% rename from src/test/java/org/jsweet/test/transpiler/source/generics/InstantiationWithGenerics.java rename to src/test/java/source/generics/InstantiationWithGenerics.java index 6ece8adf..34fb9471 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/generics/InstantiationWithGenerics.java +++ b/src/test/java/source/generics/InstantiationWithGenerics.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.generics; +package source.generics; @SuppressWarnings("unused") public class InstantiationWithGenerics { @@ -27,8 +27,8 @@ public class InstantiationWithGenerics { public static void main(String[] args) { InstantiationWithGenerics foo = new InstantiationWithGenerics("lolo", 4); - org.jsweet.test.transpiler.source.generics.InstantiationWithGenerics bar - = new org.jsweet.test.transpiler.source.generics.InstantiationWithGenerics("lolo", 4); + source.generics.InstantiationWithGenerics bar + = new source.generics.InstantiationWithGenerics("lolo", 4); C c = new C(); } } diff --git a/src/test/java/org/jsweet/test/transpiler/source/init/Constructor.java b/src/test/java/source/init/Constructor.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/init/Constructor.java rename to src/test/java/source/init/Constructor.java index ae8779c7..98904947 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/init/Constructor.java +++ b/src/test/java/source/init/Constructor.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.init; +package source.init; public class Constructor { diff --git a/src/test/java/org/jsweet/test/transpiler/source/init/ConstructorField.java b/src/test/java/source/init/ConstructorField.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/init/ConstructorField.java rename to src/test/java/source/init/ConstructorField.java index f3991eb8..701f0603 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/init/ConstructorField.java +++ b/src/test/java/source/init/ConstructorField.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.init; +package source.init; public class ConstructorField { diff --git a/src/test/java/org/jsweet/test/transpiler/source/init/ConstructorFieldInInterface.java b/src/test/java/source/init/ConstructorFieldInInterface.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/init/ConstructorFieldInInterface.java rename to src/test/java/source/init/ConstructorFieldInInterface.java index 749bad4d..cde9ce5a 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/init/ConstructorFieldInInterface.java +++ b/src/test/java/source/init/ConstructorFieldInInterface.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.init; +package source.init; import jsweet.lang.Interface; diff --git a/src/test/java/org/jsweet/test/transpiler/source/init/ConstructorMethod.java b/src/test/java/source/init/ConstructorMethod.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/init/ConstructorMethod.java rename to src/test/java/source/init/ConstructorMethod.java index c4c92e58..41a0c687 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/init/ConstructorMethod.java +++ b/src/test/java/source/init/ConstructorMethod.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.init; +package source.init; public class ConstructorMethod { diff --git a/src/test/java/org/jsweet/test/transpiler/source/init/ConstructorMethodInInterface.java b/src/test/java/source/init/ConstructorMethodInInterface.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/init/ConstructorMethodInInterface.java rename to src/test/java/source/init/ConstructorMethodInInterface.java index 736b3a5d..39c7aaab 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/init/ConstructorMethodInInterface.java +++ b/src/test/java/source/init/ConstructorMethodInInterface.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.init; +package source.init; import jsweet.lang.Interface; diff --git a/src/test/java/org/jsweet/test/transpiler/source/init/Initializer.java b/src/test/java/source/init/Initializer.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/init/Initializer.java rename to src/test/java/source/init/Initializer.java index d644e2ec..be4e53c8 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/init/Initializer.java +++ b/src/test/java/source/init/Initializer.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.init; +package source.init; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/init/InitializerStatementConditionError.java b/src/test/java/source/init/InitializerStatementConditionError.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/init/InitializerStatementConditionError.java rename to src/test/java/source/init/InitializerStatementConditionError.java index f253e075..81565a47 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/init/InitializerStatementConditionError.java +++ b/src/test/java/source/init/InitializerStatementConditionError.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.init; +package source.init; import jsweet.lang.Interface; diff --git a/src/test/java/org/jsweet/test/transpiler/source/init/InitializerStatementError.java b/src/test/java/source/init/InitializerStatementError.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/init/InitializerStatementError.java rename to src/test/java/source/init/InitializerStatementError.java index d55a94f5..63a605e3 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/init/InitializerStatementError.java +++ b/src/test/java/source/init/InitializerStatementError.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.init; +package source.init; import jsweet.lang.Interface; diff --git a/src/test/java/org/jsweet/test/transpiler/source/init/InterfaceRawConstruction.java b/src/test/java/source/init/InterfaceRawConstruction.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/init/InterfaceRawConstruction.java rename to src/test/java/source/init/InterfaceRawConstruction.java index a46062e6..bbd5fb30 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/init/InterfaceRawConstruction.java +++ b/src/test/java/source/init/InterfaceRawConstruction.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.init; +package source.init; import jsweet.lang.Interface; diff --git a/src/test/java/org/jsweet/test/transpiler/source/init/MultipleMains.java b/src/test/java/source/init/MultipleMains.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/init/MultipleMains.java rename to src/test/java/source/init/MultipleMains.java index 86189367..1dd3319d 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/init/MultipleMains.java +++ b/src/test/java/source/init/MultipleMains.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.init; +package source.init; import jsweet.lang.Disabled; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/init/NoOptionalFieldsInClass.java b/src/test/java/source/init/NoOptionalFieldsInClass.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/init/NoOptionalFieldsInClass.java rename to src/test/java/source/init/NoOptionalFieldsInClass.java index 76a21113..5531ef5e 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/init/NoOptionalFieldsInClass.java +++ b/src/test/java/source/init/NoOptionalFieldsInClass.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.init; +package source.init; import jsweet.lang.Optional; diff --git a/src/test/java/org/jsweet/test/transpiler/source/init/StaticInitializer.java b/src/test/java/source/init/StaticInitializer.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/init/StaticInitializer.java rename to src/test/java/source/init/StaticInitializer.java index 849ffd98..48ccbe68 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/init/StaticInitializer.java +++ b/src/test/java/source/init/StaticInitializer.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.init; +package source.init; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/overload/Overload.java b/src/test/java/source/overload/Overload.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/overload/Overload.java rename to src/test/java/source/overload/Overload.java index 0b618dd7..ea2c13af 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/overload/Overload.java +++ b/src/test/java/source/overload/Overload.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.overload; +package source.overload; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/overload/WrongOverload.java b/src/test/java/source/overload/WrongOverload.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/overload/WrongOverload.java rename to src/test/java/source/overload/WrongOverload.java index fb2dfc26..2e8a1617 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/overload/WrongOverload.java +++ b/src/test/java/source/overload/WrongOverload.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.overload; +package source.overload; public class WrongOverload { diff --git a/src/test/java/org/jsweet/test/transpiler/source/overload/WrongOverloads.java b/src/test/java/source/overload/WrongOverloads.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/overload/WrongOverloads.java rename to src/test/java/source/overload/WrongOverloads.java index 43ae3560..95604356 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/overload/WrongOverloads.java +++ b/src/test/java/source/overload/WrongOverloads.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.overload; +package source.overload; public class WrongOverloads { diff --git a/src/test/java/org/jsweet/test/transpiler/source/require/TopLevel1.java b/src/test/java/source/require/TopLevel1.java similarity index 84% rename from src/test/java/org/jsweet/test/transpiler/source/require/TopLevel1.java rename to src/test/java/source/require/TopLevel1.java index 105da03b..51161eaf 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/require/TopLevel1.java +++ b/src/test/java/source/require/TopLevel1.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.require; +package source.require; -import org.jsweet.test.transpiler.source.require.a.A; +import source.require.a.A; public class TopLevel1 { diff --git a/src/test/java/org/jsweet/test/transpiler/source/require/TopLevel2.java b/src/test/java/source/require/TopLevel2.java similarity index 83% rename from src/test/java/org/jsweet/test/transpiler/source/require/TopLevel2.java rename to src/test/java/source/require/TopLevel2.java index bd025375..bb9d70e8 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/require/TopLevel2.java +++ b/src/test/java/source/require/TopLevel2.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.require; +package source.require; -import org.jsweet.test.transpiler.source.require.a.A; +import source.require.a.A; public class TopLevel2 { diff --git a/src/test/java/org/jsweet/test/transpiler/source/require/a/A.java b/src/test/java/source/require/a/A.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/require/a/A.java rename to src/test/java/source/require/a/A.java index 58d58ecf..90c17dbe 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/require/a/A.java +++ b/src/test/java/source/require/a/A.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.require.a; +package source.require.a; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/require/a/Use1.java b/src/test/java/source/require/a/Use1.java similarity index 83% rename from src/test/java/org/jsweet/test/transpiler/source/require/a/Use1.java rename to src/test/java/source/require/a/Use1.java index 4902f99e..dfdcc698 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/require/a/Use1.java +++ b/src/test/java/source/require/a/Use1.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.require.a; +package source.require.a; -import org.jsweet.test.transpiler.source.require.a.b.B1; +import source.require.a.b.B1; public class Use1 { diff --git a/src/test/java/org/jsweet/test/transpiler/source/require/a/Use2.java b/src/test/java/source/require/a/Use2.java similarity index 82% rename from src/test/java/org/jsweet/test/transpiler/source/require/a/Use2.java rename to src/test/java/source/require/a/Use2.java index 05830af3..67ef5b77 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/require/a/Use2.java +++ b/src/test/java/source/require/a/Use2.java @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.require.a; +package source.require.a; -import org.jsweet.test.transpiler.source.require.a.b.B1; +import source.require.a.b.B1; public class Use2 { diff --git a/src/test/java/org/jsweet/test/transpiler/source/require/a/b/B1.java b/src/test/java/source/require/a/b/B1.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/require/a/b/B1.java rename to src/test/java/source/require/a/b/B1.java index c183a6b9..697dc934 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/require/a/b/B1.java +++ b/src/test/java/source/require/a/b/B1.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.require.a.b; +package source.require.a.b; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/require/a/b/B2.java b/src/test/java/source/require/a/b/B2.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/require/a/b/B2.java rename to src/test/java/source/require/a/b/B2.java index 8ac210cc..6656d9b7 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/require/a/b/B2.java +++ b/src/test/java/source/require/a/b/B2.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.require.a.b; +package source.require.a.b; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/require/b/ClassImport.java b/src/test/java/source/require/b/ClassImport.java similarity index 85% rename from src/test/java/org/jsweet/test/transpiler/source/require/b/ClassImport.java rename to src/test/java/source/require/b/ClassImport.java index c5f27a52..26e83f60 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/require/b/ClassImport.java +++ b/src/test/java/source/require/b/ClassImport.java @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.require.b; +package source.require.b; import static jsweet.util.Globals.$export; -import org.jsweet.test.transpiler.source.require.a.A; +import source.require.a.A; public class ClassImport { diff --git a/src/test/java/org/jsweet/test/transpiler/source/require/b/ClassImportImplicitRequire.java b/src/test/java/source/require/b/ClassImportImplicitRequire.java similarity index 78% rename from src/test/java/org/jsweet/test/transpiler/source/require/b/ClassImportImplicitRequire.java rename to src/test/java/source/require/b/ClassImportImplicitRequire.java index dc0d1fdd..d7fcddf7 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/require/b/ClassImportImplicitRequire.java +++ b/src/test/java/source/require/b/ClassImportImplicitRequire.java @@ -12,16 +12,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.require.b; +package source.require.b; import static def.express.Globals.express; import static jsweet.util.Globals.$export; -import org.jsweet.test.transpiler.source.require.a.A; -import org.jsweet.test.transpiler.source.require.a.b.B1; -import org.jsweet.test.transpiler.source.require.a.b.B2; - import def.express.express.Express; +import source.require.a.A; +import source.require.a.b.B1; +import source.require.a.b.B2; public class ClassImportImplicitRequire { diff --git a/src/test/java/org/jsweet/test/transpiler/source/require/b/GlobalsImport.java b/src/test/java/source/require/b/GlobalsImport.java similarity index 76% rename from src/test/java/org/jsweet/test/transpiler/source/require/b/GlobalsImport.java rename to src/test/java/source/require/b/GlobalsImport.java index 95f0b544..37cd8f39 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/require/b/GlobalsImport.java +++ b/src/test/java/source/require/b/GlobalsImport.java @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.require.b; +package source.require.b; import static jsweet.dom.Globals.console; -import static org.jsweet.test.transpiler.source.require.globals.Globals.animate; +import static source.require.globals.Globals.animate; -import org.jsweet.test.transpiler.source.require.globals.Globals; +import source.require.globals.Globals; public class GlobalsImport { diff --git a/src/test/java/org/jsweet/test/transpiler/source/require/globals/Globals.java b/src/test/java/source/require/globals/Globals.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/require/globals/Globals.java rename to src/test/java/source/require/globals/Globals.java index ee642910..06e0a50a 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/require/globals/Globals.java +++ b/src/test/java/source/require/globals/Globals.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.require.globals; +package source.require.globals; import static jsweet.dom.Globals.window; diff --git a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/package-info.java b/src/test/java/source/require/package-info.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/blocksgame/package-info.java rename to src/test/java/source/require/package-info.java index f67fde17..7fa1565e 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/blocksgame/package-info.java +++ b/src/test/java/source/require/package-info.java @@ -13,4 +13,4 @@ * limitations under the License. */ @jsweet.lang.Root -package org.jsweet.test.transpiler.source.blocksgame; \ No newline at end of file +package source.require; \ No newline at end of file diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/noroot/a/GlobalsInNoRoot.java b/src/test/java/source/root/noroot/a/GlobalsInNoRoot.java similarity index 65% rename from src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/noroot/a/GlobalsInNoRoot.java rename to src/test/java/source/root/noroot/a/GlobalsInNoRoot.java index fce66457..7d0ada4d 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/noroot/a/GlobalsInNoRoot.java +++ b/src/test/java/source/root/noroot/a/GlobalsInNoRoot.java @@ -1,7 +1,7 @@ -package org.jsweet.test.transpiler.source.structural.globalclasses.noroot.a; +package source.root.noroot.a; import static jsweet.util.Globals.$export; -import static org.jsweet.test.transpiler.source.structural.globalclasses.noroot.a.Globals.m2; +import static source.root.noroot.a.Globals.m2; public class GlobalsInNoRoot { diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/root/a/GlobalsInRoot.java b/src/test/java/source/root/root/a/GlobalsInRoot.java similarity index 65% rename from src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/root/a/GlobalsInRoot.java rename to src/test/java/source/root/root/a/GlobalsInRoot.java index 4a173e6d..88db49bf 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/root/a/GlobalsInRoot.java +++ b/src/test/java/source/root/root/a/GlobalsInRoot.java @@ -1,7 +1,7 @@ -package org.jsweet.test.transpiler.source.structural.globalclasses.root.a; +package source.root.root.a; import static jsweet.util.Globals.$export; -import static org.jsweet.test.transpiler.source.structural.globalclasses.root.a.Globals.m2; +import static source.root.root.a.Globals.m2; public class GlobalsInRoot { diff --git a/src/test/java/source/root/root/package-info.java b/src/test/java/source/root/root/package-info.java new file mode 100644 index 00000000..39920e50 --- /dev/null +++ b/src/test/java/source/root/root/package-info.java @@ -0,0 +1,2 @@ +@jsweet.lang.Root +package source.root.root; \ No newline at end of file diff --git a/src/test/java/source/root/rootparent1/InvalidClassLocation.java b/src/test/java/source/root/rootparent1/InvalidClassLocation.java new file mode 100644 index 00000000..b76dad9d --- /dev/null +++ b/src/test/java/source/root/rootparent1/InvalidClassLocation.java @@ -0,0 +1,5 @@ +package source.root.rootparent1; + +public class InvalidClassLocation { + +} diff --git a/src/test/java/source/root/rootparent1/root/NoClassesInRootParent.java b/src/test/java/source/root/rootparent1/root/NoClassesInRootParent.java new file mode 100644 index 00000000..2ef5aa5d --- /dev/null +++ b/src/test/java/source/root/rootparent1/root/NoClassesInRootParent.java @@ -0,0 +1,5 @@ +package source.root.rootparent1.root; + +public class NoClassesInRootParent { + +} diff --git a/src/test/java/source/root/rootparent1/root/package-info.java b/src/test/java/source/root/rootparent1/root/package-info.java new file mode 100644 index 00000000..2f9e2148 --- /dev/null +++ b/src/test/java/source/root/rootparent1/root/package-info.java @@ -0,0 +1,2 @@ +@jsweet.lang.Root +package source.root.rootparent1.root; \ No newline at end of file diff --git a/src/test/java/source/root/rootparent2/package-info.java b/src/test/java/source/root/rootparent2/package-info.java new file mode 100644 index 00000000..cc4b8fb1 --- /dev/null +++ b/src/test/java/source/root/rootparent2/package-info.java @@ -0,0 +1,2 @@ +@jsweet.lang.Root +package source.root.rootparent2; \ No newline at end of file diff --git a/src/test/java/source/root/rootparent2/root/NoRootInRoot.java b/src/test/java/source/root/rootparent2/root/NoRootInRoot.java new file mode 100644 index 00000000..bdc805df --- /dev/null +++ b/src/test/java/source/root/rootparent2/root/NoRootInRoot.java @@ -0,0 +1,5 @@ +package source.root.rootparent2.root; + +public class NoRootInRoot { + +} diff --git a/src/test/java/source/root/rootparent2/root/package-info.java b/src/test/java/source/root/rootparent2/root/package-info.java new file mode 100644 index 00000000..25c78689 --- /dev/null +++ b/src/test/java/source/root/rootparent2/root/package-info.java @@ -0,0 +1,2 @@ +@jsweet.lang.Root +package source.root.rootparent2.root; \ No newline at end of file diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/AbstractClass.java b/src/test/java/source/structural/AbstractClass.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/structural/AbstractClass.java rename to src/test/java/source/structural/AbstractClass.java index 7f6f6e45..14058eae 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/AbstractClass.java +++ b/src/test/java/source/structural/AbstractClass.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural; +package source.structural; public abstract class AbstractClass { diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/AutoImportClassesInSamePackage.java b/src/test/java/source/structural/AutoImportClassesInSamePackage.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/structural/AutoImportClassesInSamePackage.java rename to src/test/java/source/structural/AutoImportClassesInSamePackage.java index dafdb856..2f845c71 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/AutoImportClassesInSamePackage.java +++ b/src/test/java/source/structural/AutoImportClassesInSamePackage.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural; +package source.structural; public class AutoImportClassesInSamePackage { diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/AutoImportClassesInSamePackageUsed.java b/src/test/java/source/structural/AutoImportClassesInSamePackageUsed.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/structural/AutoImportClassesInSamePackageUsed.java rename to src/test/java/source/structural/AutoImportClassesInSamePackageUsed.java index 304b9745..f7d115d3 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/AutoImportClassesInSamePackageUsed.java +++ b/src/test/java/source/structural/AutoImportClassesInSamePackageUsed.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural; +package source.structural; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/Enums.java b/src/test/java/source/structural/Enums.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/structural/Enums.java rename to src/test/java/source/structural/Enums.java index 4310bce8..67e74420 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/Enums.java +++ b/src/test/java/source/structural/Enums.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural; +package source.structural; import static jsweet.util.Globals.array; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/ExtendsClassInSameFile.java b/src/test/java/source/structural/ExtendsClassInSameFile.java similarity index 89% rename from src/test/java/org/jsweet/test/transpiler/source/structural/ExtendsClassInSameFile.java rename to src/test/java/source/structural/ExtendsClassInSameFile.java index 6d88ccd3..cb5cbf41 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/ExtendsClassInSameFile.java +++ b/src/test/java/source/structural/ExtendsClassInSameFile.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural; +package source.structural; class Foo1 { } diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/ExtendsObject.java b/src/test/java/source/structural/ExtendsObject.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/structural/ExtendsObject.java rename to src/test/java/source/structural/ExtendsObject.java index 0a6a6fec..614f3c6a 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/ExtendsObject.java +++ b/src/test/java/source/structural/ExtendsObject.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural; +package source.structural; public class ExtendsObject extends Object { diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/GlobalsAccess.java b/src/test/java/source/structural/GlobalsAccess.java similarity index 86% rename from src/test/java/org/jsweet/test/transpiler/source/structural/GlobalsAccess.java rename to src/test/java/source/structural/GlobalsAccess.java index fd75cff0..1905a911 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/GlobalsAccess.java +++ b/src/test/java/source/structural/GlobalsAccess.java @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural; +package source.structural; import static jsweet.util.Globals.$export; import static jsweet.util.Globals.string; -import static org.jsweet.test.transpiler.source.structural.Globals.toTitleCase; +import static source.structural.Globals.toTitleCase; import jsweet.lang.RegExp; diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/Inheritance.java b/src/test/java/source/structural/Inheritance.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/structural/Inheritance.java rename to src/test/java/source/structural/Inheritance.java index 134c7fee..bed2602b 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/Inheritance.java +++ b/src/test/java/source/structural/Inheritance.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural; +package source.structural; import jsweet.lang.Interface; diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/InnerClass.java b/src/test/java/source/structural/InnerClass.java similarity index 89% rename from src/test/java/org/jsweet/test/transpiler/source/structural/InnerClass.java rename to src/test/java/source/structural/InnerClass.java index cf6c098d..e186cabf 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/InnerClass.java +++ b/src/test/java/source/structural/InnerClass.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural; +package source.structural; public class InnerClass { diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/NameClashes.java b/src/test/java/source/structural/NameClashes.java similarity index 89% rename from src/test/java/org/jsweet/test/transpiler/source/structural/NameClashes.java rename to src/test/java/source/structural/NameClashes.java index 2d0a1d26..22ededb6 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/NameClashes.java +++ b/src/test/java/source/structural/NameClashes.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural; +package source.structural; public class NameClashes { diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/NoInstanceofForInterfaces.java b/src/test/java/source/structural/NoInstanceofForInterfaces.java similarity index 89% rename from src/test/java/org/jsweet/test/transpiler/source/structural/NoInstanceofForInterfaces.java rename to src/test/java/source/structural/NoInstanceofForInterfaces.java index 452dc6e1..52cc6f72 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/NoInstanceofForInterfaces.java +++ b/src/test/java/source/structural/NoInstanceofForInterfaces.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural; +package source.structural; import jsweet.lang.Interface; diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/NoWildcardsInImports.java b/src/test/java/source/structural/NoWildcardsInImports.java similarity index 77% rename from src/test/java/org/jsweet/test/transpiler/source/structural/NoWildcardsInImports.java rename to src/test/java/source/structural/NoWildcardsInImports.java index 21b2b8c7..c80ac08b 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/NoWildcardsInImports.java +++ b/src/test/java/source/structural/NoWildcardsInImports.java @@ -1,4 +1,4 @@ -package org.jsweet.test.transpiler.source.structural; +package source.structural; import static jsweet.dom.Globals.*; import jsweet.dom.*; diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/OptionalField.java b/src/test/java/source/structural/OptionalField.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/structural/OptionalField.java rename to src/test/java/source/structural/OptionalField.java index 1fa51539..980fa1e2 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/OptionalField.java +++ b/src/test/java/source/structural/OptionalField.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural; +package source.structural; import jsweet.lang.Interface; import jsweet.lang.Optional; diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/OptionalFieldError.java b/src/test/java/source/structural/OptionalFieldError.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/structural/OptionalFieldError.java rename to src/test/java/source/structural/OptionalFieldError.java index a055f6a9..fd11e32c 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/OptionalFieldError.java +++ b/src/test/java/source/structural/OptionalFieldError.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural; +package source.structural; import jsweet.lang.Interface; diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/TwoClassesInSameFile.java b/src/test/java/source/structural/TwoClassesInSameFile.java similarity index 89% rename from src/test/java/org/jsweet/test/transpiler/source/structural/TwoClassesInSameFile.java rename to src/test/java/source/structural/TwoClassesInSameFile.java index a1352de1..311bed61 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/TwoClassesInSameFile.java +++ b/src/test/java/source/structural/TwoClassesInSameFile.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural; +package source.structural; class Foo { } diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/WrongConstructsInEnums.java b/src/test/java/source/structural/WrongConstructsInEnums.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/structural/WrongConstructsInEnums.java rename to src/test/java/source/structural/WrongConstructsInEnums.java index 46e7796f..b9462622 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/WrongConstructsInEnums.java +++ b/src/test/java/source/structural/WrongConstructsInEnums.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural; +package source.structural; public enum WrongConstructsInEnums { diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/WrongConstructsInInterfaces.java b/src/test/java/source/structural/WrongConstructsInInterfaces.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/structural/WrongConstructsInInterfaces.java rename to src/test/java/source/structural/WrongConstructsInInterfaces.java index 553596b0..7a8ea3f5 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/WrongConstructsInInterfaces.java +++ b/src/test/java/source/structural/WrongConstructsInInterfaces.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural; +package source.structural; import jsweet.lang.Interface; diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/Globals.java b/src/test/java/source/structural/globalclasses/Globals.java similarity index 88% rename from src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/Globals.java rename to src/test/java/source/structural/globalclasses/Globals.java index 702c93df..0aa1cf57 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/Globals.java +++ b/src/test/java/source/structural/globalclasses/Globals.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural.globalclasses; +package source.structural.globalclasses; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/a/GlobalsConstructor.java b/src/test/java/source/structural/globalclasses/a/GlobalsConstructor.java similarity index 88% rename from src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/a/GlobalsConstructor.java rename to src/test/java/source/structural/globalclasses/a/GlobalsConstructor.java index d0d09ffc..20eedd05 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/a/GlobalsConstructor.java +++ b/src/test/java/source/structural/globalclasses/a/GlobalsConstructor.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural.globalclasses.a; +package source.structural.globalclasses.a; import static jsweet.util.Globals.$set; diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/b/GlobalFunctionStaticGetSet.java b/src/test/java/source/structural/globalclasses/b/GlobalFunctionStaticGetSet.java similarity index 89% rename from src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/b/GlobalFunctionStaticGetSet.java rename to src/test/java/source/structural/globalclasses/b/GlobalFunctionStaticGetSet.java index 74a1f275..e380faee 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/b/GlobalFunctionStaticGetSet.java +++ b/src/test/java/source/structural/globalclasses/b/GlobalFunctionStaticGetSet.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural.globalclasses.b; +package source.structural.globalclasses.b; import static jsweet.util.Globals.$get; import static jsweet.util.Globals.$set; diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/c/GlobalFunctionGetSet.java b/src/test/java/source/structural/globalclasses/c/GlobalFunctionGetSet.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/c/GlobalFunctionGetSet.java rename to src/test/java/source/structural/globalclasses/c/GlobalFunctionGetSet.java index 0ae9758b..a7a56148 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/c/GlobalFunctionGetSet.java +++ b/src/test/java/source/structural/globalclasses/c/GlobalFunctionGetSet.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural.globalclasses.c; +package source.structural.globalclasses.c; @SuppressWarnings("all") class Globals extends jsweet.lang.Object { diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/d/GlobalFunctionAccessFromMain.java b/src/test/java/source/structural/globalclasses/d/GlobalFunctionAccessFromMain.java similarity index 69% rename from src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/d/GlobalFunctionAccessFromMain.java rename to src/test/java/source/structural/globalclasses/d/GlobalFunctionAccessFromMain.java index c837592e..4511028a 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/d/GlobalFunctionAccessFromMain.java +++ b/src/test/java/source/structural/globalclasses/d/GlobalFunctionAccessFromMain.java @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural.globalclasses.d; +package source.structural.globalclasses.d; import static jsweet.util.Globals.$export; -import static org.jsweet.test.transpiler.source.structural.globalclasses.Globals.test; -import static org.jsweet.test.transpiler.source.structural.globalclasses.e.Globals.Static; -import static org.jsweet.test.transpiler.source.structural.globalclasses.e.Globals.test2; +import static source.structural.globalclasses.Globals.test; +import static source.structural.globalclasses.e.Globals.Static; +import static source.structural.globalclasses.e.Globals.test2; public class GlobalFunctionAccessFromMain { diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/e/Globals.java b/src/test/java/source/structural/globalclasses/e/Globals.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/e/Globals.java rename to src/test/java/source/structural/globalclasses/e/Globals.java index 742cd000..1713daa1 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/e/Globals.java +++ b/src/test/java/source/structural/globalclasses/e/Globals.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural.globalclasses.e; +package source.structural.globalclasses.e; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/f/GlobalFunctionStaticDelete.java b/src/test/java/source/structural/globalclasses/f/GlobalFunctionStaticDelete.java similarity index 89% rename from src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/f/GlobalFunctionStaticDelete.java rename to src/test/java/source/structural/globalclasses/f/GlobalFunctionStaticDelete.java index c6d2df00..b4d52b76 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/f/GlobalFunctionStaticDelete.java +++ b/src/test/java/source/structural/globalclasses/f/GlobalFunctionStaticDelete.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural.globalclasses.f; +package source.structural.globalclasses.f; import static jsweet.util.Globals.$delete; diff --git a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/g/GlobalFunctionDelete.java b/src/test/java/source/structural/globalclasses/g/GlobalFunctionDelete.java similarity index 89% rename from src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/g/GlobalFunctionDelete.java rename to src/test/java/source/structural/globalclasses/g/GlobalFunctionDelete.java index b566df65..6a38faf2 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/g/GlobalFunctionDelete.java +++ b/src/test/java/source/structural/globalclasses/g/GlobalFunctionDelete.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.structural.globalclasses.g; +package source.structural.globalclasses.g; @SuppressWarnings("all") class Globals extends jsweet.lang.Object { diff --git a/src/test/java/org/jsweet/test/transpiler/source/syntax/AnnotationQualifiedNames.java b/src/test/java/source/syntax/AnnotationQualifiedNames.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/syntax/AnnotationQualifiedNames.java rename to src/test/java/source/syntax/AnnotationQualifiedNames.java index 8210c325..d00644aa 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/syntax/AnnotationQualifiedNames.java +++ b/src/test/java/source/syntax/AnnotationQualifiedNames.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.syntax; +package source.syntax; @jsweet.lang.Interface public abstract class AnnotationQualifiedNames { diff --git a/src/test/java/org/jsweet/test/transpiler/source/syntax/FinalVariables.java b/src/test/java/source/syntax/FinalVariables.java similarity index 95% rename from src/test/java/org/jsweet/test/transpiler/source/syntax/FinalVariables.java rename to src/test/java/source/syntax/FinalVariables.java index dffb059c..e17bc7bb 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/syntax/FinalVariables.java +++ b/src/test/java/source/syntax/FinalVariables.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.syntax; +package source.syntax; import static jsweet.dom.Globals.console; import static jsweet.dom.Globals.document; diff --git a/src/test/java/org/jsweet/test/transpiler/source/syntax/FinalVariablesRuntime.java b/src/test/java/source/syntax/FinalVariablesRuntime.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/syntax/FinalVariablesRuntime.java rename to src/test/java/source/syntax/FinalVariablesRuntime.java index a0efacb0..ea68ba5a 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/syntax/FinalVariablesRuntime.java +++ b/src/test/java/source/syntax/FinalVariablesRuntime.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.syntax; +package source.syntax; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/syntax/GlobalsInvocation.java b/src/test/java/source/syntax/GlobalsInvocation.java similarity index 83% rename from src/test/java/org/jsweet/test/transpiler/source/syntax/GlobalsInvocation.java rename to src/test/java/source/syntax/GlobalsInvocation.java index 33d7d727..62ef6653 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/syntax/GlobalsInvocation.java +++ b/src/test/java/source/syntax/GlobalsInvocation.java @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.syntax; +package source.syntax; -import static org.jsweet.test.transpiler.source.syntax.Globals.toTitleCase; import jsweet.lang.RegExp; import static jsweet.util.Globals.string; +import static source.syntax.Globals.toTitleCase; public class GlobalsInvocation { @@ -29,7 +29,7 @@ public class GlobalsInvocation { public void m() { Globals.m(); - org.jsweet.test.transpiler.source.syntax.Globals.m(); + source.syntax.Globals.m(); } } diff --git a/src/test/java/org/jsweet/test/transpiler/source/syntax/IndexedAccessInStaticScope.java b/src/test/java/source/syntax/IndexedAccessInStaticScope.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/syntax/IndexedAccessInStaticScope.java rename to src/test/java/source/syntax/IndexedAccessInStaticScope.java index 2bb6dea6..e8b7b97f 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/syntax/IndexedAccessInStaticScope.java +++ b/src/test/java/source/syntax/IndexedAccessInStaticScope.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.syntax; +package source.syntax; import static jsweet.util.Globals.$get; import static jsweet.util.Globals.$set; diff --git a/src/test/java/org/jsweet/test/transpiler/source/syntax/Keywords.java b/src/test/java/source/syntax/Keywords.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/syntax/Keywords.java rename to src/test/java/source/syntax/Keywords.java index 3f2a24da..814f3b25 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/syntax/Keywords.java +++ b/src/test/java/source/syntax/Keywords.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.syntax; +package source.syntax; public class Keywords { diff --git a/src/test/java/org/jsweet/test/transpiler/source/syntax/Labels.java b/src/test/java/source/syntax/Labels.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/syntax/Labels.java rename to src/test/java/source/syntax/Labels.java index 9964c106..cc4ce380 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/syntax/Labels.java +++ b/src/test/java/source/syntax/Labels.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.syntax; +package source.syntax; public class Labels { diff --git a/src/test/java/org/jsweet/test/transpiler/source/syntax/QualifiedNames.java b/src/test/java/source/syntax/QualifiedNames.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/syntax/QualifiedNames.java rename to src/test/java/source/syntax/QualifiedNames.java index 194a19ca..fbf7f894 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/syntax/QualifiedNames.java +++ b/src/test/java/source/syntax/QualifiedNames.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.syntax; +package source.syntax; public class QualifiedNames { diff --git a/src/test/java/org/jsweet/test/transpiler/source/syntax/References.java b/src/test/java/source/syntax/References.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/syntax/References.java rename to src/test/java/source/syntax/References.java index e90df0c5..f3a679cc 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/syntax/References.java +++ b/src/test/java/source/syntax/References.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.syntax; +package source.syntax; import static jsweet.util.Globals.$export; import java.util.function.BiConsumer; diff --git a/src/test/java/org/jsweet/test/transpiler/source/syntax/SpecialFunctions.java b/src/test/java/source/syntax/SpecialFunctions.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/syntax/SpecialFunctions.java rename to src/test/java/source/syntax/SpecialFunctions.java index 0d241674..ba7cc315 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/syntax/SpecialFunctions.java +++ b/src/test/java/source/syntax/SpecialFunctions.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.syntax; +package source.syntax; public class SpecialFunctions { diff --git a/src/test/java/org/jsweet/test/transpiler/source/syntax/ValidIndexedAccesses.java b/src/test/java/source/syntax/ValidIndexedAccesses.java similarity index 94% rename from src/test/java/org/jsweet/test/transpiler/source/syntax/ValidIndexedAccesses.java rename to src/test/java/source/syntax/ValidIndexedAccesses.java index c6faef19..cb787773 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/syntax/ValidIndexedAccesses.java +++ b/src/test/java/source/syntax/ValidIndexedAccesses.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.syntax; +package source.syntax; import static jsweet.util.Globals.$delete; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/throwable/InvalidTryCatchTest.java b/src/test/java/source/throwable/InvalidTryCatchTest.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/throwable/InvalidTryCatchTest.java rename to src/test/java/source/throwable/InvalidTryCatchTest.java index 9b6e0210..76538acb 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/throwable/InvalidTryCatchTest.java +++ b/src/test/java/source/throwable/InvalidTryCatchTest.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.throwable; +package source.throwable; import java.io.BufferedReader; import java.io.FileReader; diff --git a/src/test/java/org/jsweet/test/transpiler/source/throwable/TryCatchFinallyTest.java b/src/test/java/source/throwable/TryCatchFinallyTest.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/throwable/TryCatchFinallyTest.java rename to src/test/java/source/throwable/TryCatchFinallyTest.java index 4375ec98..dcf959a3 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/throwable/TryCatchFinallyTest.java +++ b/src/test/java/source/throwable/TryCatchFinallyTest.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.throwable; +package source.throwable; import jsweet.lang.Error; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/.tsc-rootfile.js b/src/test/java/source/tscomparison/.tsc-rootfile.js similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/.tsc-rootfile.js rename to src/test/java/source/tscomparison/.tsc-rootfile.js diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/.tsc-rootfile.ts b/src/test/java/source/tscomparison/.tsc-rootfile.ts similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/.tsc-rootfile.ts rename to src/test/java/source/tscomparison/.tsc-rootfile.ts diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.java b/src/test/java/source/tscomparison/AbstractClasses.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.java rename to src/test/java/source/tscomparison/AbstractClasses.java index 9e18896a..517ea0c6 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.java +++ b/src/test/java/source/tscomparison/AbstractClasses.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.tscomparison; +package source.tscomparison; abstract class AbstractClass { diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.js.map b/src/test/java/source/tscomparison/AbstractClasses.js.map similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.js.map rename to src/test/java/source/tscomparison/AbstractClasses.js.map diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.ts b/src/test/java/source/tscomparison/AbstractClasses.ts similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.ts rename to src/test/java/source/tscomparison/AbstractClasses.ts diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/ActualScoping.java b/src/test/java/source/tscomparison/ActualScoping.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/ActualScoping.java rename to src/test/java/source/tscomparison/ActualScoping.java index 38a9f481..e24b9f86 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/ActualScoping.java +++ b/src/test/java/source/tscomparison/ActualScoping.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.tscomparison; +package source.tscomparison; import static jsweet.dom.Globals.console; import static jsweet.dom.Globals.document; diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/ActualScoping.ts b/src/test/java/source/tscomparison/ActualScoping.ts similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/ActualScoping.ts rename to src/test/java/source/tscomparison/ActualScoping.ts diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/CompileTimeWarnings.java b/src/test/java/source/tscomparison/CompileTimeWarnings.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/CompileTimeWarnings.java rename to src/test/java/source/tscomparison/CompileTimeWarnings.java index 28b32760..51573503 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/CompileTimeWarnings.java +++ b/src/test/java/source/tscomparison/CompileTimeWarnings.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.tscomparison; +package source.tscomparison; import static jsweet.dom.Globals.alert; import static jsweet.dom.Globals.console; diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/CompileTimeWarnings.ts b/src/test/java/source/tscomparison/CompileTimeWarnings.ts similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/CompileTimeWarnings.ts rename to src/test/java/source/tscomparison/CompileTimeWarnings.ts diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/OtherThisExample.java b/src/test/java/source/tscomparison/OtherThisExample.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/OtherThisExample.java rename to src/test/java/source/tscomparison/OtherThisExample.java index 50d025c3..ecc031ae 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/OtherThisExample.java +++ b/src/test/java/source/tscomparison/OtherThisExample.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.tscomparison; +package source.tscomparison; import static jsweet.util.Globals.$export; import static jsweet.util.Globals.array; diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/SaferVarargs.java b/src/test/java/source/tscomparison/SaferVarargs.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/SaferVarargs.java rename to src/test/java/source/tscomparison/SaferVarargs.java index a141cdc3..dd965fff 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/SaferVarargs.java +++ b/src/test/java/source/tscomparison/SaferVarargs.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.tscomparison; +package source.tscomparison; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/SaferVarargs.js.map b/src/test/java/source/tscomparison/SaferVarargs.js.map similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/SaferVarargs.js.map rename to src/test/java/source/tscomparison/SaferVarargs.js.map diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/SaferVarargs.ts b/src/test/java/source/tscomparison/SaferVarargs.ts similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/SaferVarargs.ts rename to src/test/java/source/tscomparison/SaferVarargs.ts diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/StrongerTyping.java b/src/test/java/source/tscomparison/StrongerTyping.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/StrongerTyping.java rename to src/test/java/source/tscomparison/StrongerTyping.java index db7b6f92..1827ab0f 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/StrongerTyping.java +++ b/src/test/java/source/tscomparison/StrongerTyping.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.tscomparison; +package source.tscomparison; import static jsweet.dom.Globals.console; import static jsweet.util.Globals.$set; diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/StrongerTyping.ts b/src/test/java/source/tscomparison/StrongerTyping.ts similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/StrongerTyping.ts rename to src/test/java/source/tscomparison/StrongerTyping.ts diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/ThisIsThis.java b/src/test/java/source/tscomparison/ThisIsThis.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/ThisIsThis.java rename to src/test/java/source/tscomparison/ThisIsThis.java index 2dbe8fbf..9f573172 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/ThisIsThis.java +++ b/src/test/java/source/tscomparison/ThisIsThis.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.tscomparison; +package source.tscomparison; import static jsweet.dom.Globals.console; diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/ThisIsThis.ts b/src/test/java/source/tscomparison/ThisIsThis.ts similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/ThisIsThis.ts rename to src/test/java/source/tscomparison/ThisIsThis.ts diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/source/tscomparison/AbstractClasses.js b/src/test/java/source/tscomparison/org/jsweet/test/source/tscomparison/AbstractClasses.js similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/source/tscomparison/AbstractClasses.js rename to src/test/java/source/tscomparison/org/jsweet/test/source/tscomparison/AbstractClasses.js diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/source/tscomparison/AbstractClasses.js.map b/src/test/java/source/tscomparison/org/jsweet/test/source/tscomparison/AbstractClasses.js.map similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/source/tscomparison/AbstractClasses.js.map rename to src/test/java/source/tscomparison/org/jsweet/test/source/tscomparison/AbstractClasses.js.map diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/source/tscomparison/AbstractClasses.ts b/src/test/java/source/tscomparison/org/jsweet/test/source/tscomparison/AbstractClasses.ts similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/source/tscomparison/AbstractClasses.ts rename to src/test/java/source/tscomparison/org/jsweet/test/source/tscomparison/AbstractClasses.ts diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/source/tscomparison/ActualScoping.js b/src/test/java/source/tscomparison/org/jsweet/test/source/tscomparison/ActualScoping.js similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/source/tscomparison/ActualScoping.js rename to src/test/java/source/tscomparison/org/jsweet/test/source/tscomparison/ActualScoping.js diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/source/tscomparison/ActualScoping.js.map b/src/test/java/source/tscomparison/org/jsweet/test/source/tscomparison/ActualScoping.js.map similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/source/tscomparison/ActualScoping.js.map rename to src/test/java/source/tscomparison/org/jsweet/test/source/tscomparison/ActualScoping.js.map diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/source/tscomparison/ActualScoping.ts b/src/test/java/source/tscomparison/org/jsweet/test/source/tscomparison/ActualScoping.ts similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/source/tscomparison/ActualScoping.ts rename to src/test/java/source/tscomparison/org/jsweet/test/source/tscomparison/ActualScoping.ts diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.js b/src/test/java/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.js similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.js rename to src/test/java/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.js diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.js.map b/src/test/java/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.js.map similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.js.map rename to src/test/java/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.js.map diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.ts b/src/test/java/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.ts similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.ts rename to src/test/java/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/AbstractClasses.ts diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/OtherThisExample.js b/src/test/java/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/OtherThisExample.js similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/OtherThisExample.js rename to src/test/java/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/OtherThisExample.js diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/OtherThisExample.js.map b/src/test/java/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/OtherThisExample.js.map similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/OtherThisExample.js.map rename to src/test/java/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/OtherThisExample.js.map diff --git a/src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/OtherThisExample.ts b/src/test/java/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/OtherThisExample.ts similarity index 100% rename from src/test/java/org/jsweet/test/transpiler/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/OtherThisExample.ts rename to src/test/java/source/tscomparison/org/jsweet/test/transpiler/source/tscomparison/OtherThisExample.ts diff --git a/src/test/java/org/jsweet/test/transpiler/source/typing/ArraysOfLambdas.java b/src/test/java/source/typing/ArraysOfLambdas.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/typing/ArraysOfLambdas.java rename to src/test/java/source/typing/ArraysOfLambdas.java index 7197ec7c..104c593b 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/typing/ArraysOfLambdas.java +++ b/src/test/java/source/typing/ArraysOfLambdas.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.typing; +package source.typing; import static jsweet.util.Globals.array; import jsweet.lang.Array; diff --git a/src/test/java/org/jsweet/test/transpiler/source/typing/ClassTypeAsFunction.java b/src/test/java/source/typing/ClassTypeAsFunction.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/typing/ClassTypeAsFunction.java rename to src/test/java/source/typing/ClassTypeAsFunction.java index 719e17bf..80a46b35 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/typing/ClassTypeAsFunction.java +++ b/src/test/java/source/typing/ClassTypeAsFunction.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.typing; +package source.typing; import static jsweet.util.Globals.function; import jsweet.lang.Function; diff --git a/src/test/java/org/jsweet/test/transpiler/source/typing/ClassTypeAsTypeOf.java b/src/test/java/source/typing/ClassTypeAsTypeOf.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/typing/ClassTypeAsTypeOf.java rename to src/test/java/source/typing/ClassTypeAsTypeOf.java index f37510cd..83a6e3a1 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/typing/ClassTypeAsTypeOf.java +++ b/src/test/java/source/typing/ClassTypeAsTypeOf.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.typing; +package source.typing; public class ClassTypeAsTypeOf { diff --git a/src/test/java/org/jsweet/test/transpiler/source/typing/InvalidIndexedAccesses.java b/src/test/java/source/typing/InvalidIndexedAccesses.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/typing/InvalidIndexedAccesses.java rename to src/test/java/source/typing/InvalidIndexedAccesses.java index 7a7a0672..56670255 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/typing/InvalidIndexedAccesses.java +++ b/src/test/java/source/typing/InvalidIndexedAccesses.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.typing; +package source.typing; import static jsweet.dom.Globals.document; import static jsweet.util.StringTypes.div; diff --git a/src/test/java/org/jsweet/test/transpiler/source/typing/Lambdas.java b/src/test/java/source/typing/Lambdas.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/typing/Lambdas.java rename to src/test/java/source/typing/Lambdas.java index 7c9ce2b5..08c751a3 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/typing/Lambdas.java +++ b/src/test/java/source/typing/Lambdas.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.typing; +package source.typing; import java.util.function.Function; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/typing/Numbers.java b/src/test/java/source/typing/Numbers.java similarity index 93% rename from src/test/java/org/jsweet/test/transpiler/source/typing/Numbers.java rename to src/test/java/source/typing/Numbers.java index dd175daf..a5712b98 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/typing/Numbers.java +++ b/src/test/java/source/typing/Numbers.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.typing; +package source.typing; import static jsweet.dom.Globals.console; import java.util.function.Function; diff --git a/src/test/java/org/jsweet/test/transpiler/source/typing/StringTypesUsage.java b/src/test/java/source/typing/StringTypesUsage.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/typing/StringTypesUsage.java rename to src/test/java/source/typing/StringTypesUsage.java index b52bb2fe..803c97dc 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/typing/StringTypesUsage.java +++ b/src/test/java/source/typing/StringTypesUsage.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.typing; +package source.typing; import static jsweet.util.StringTypes.pointerleave; import jsweet.dom.CanvasRenderingContext2D; diff --git a/src/test/java/org/jsweet/test/transpiler/source/typing/Tuples.java b/src/test/java/source/typing/Tuples.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/typing/Tuples.java rename to src/test/java/source/typing/Tuples.java index d7a4bf34..16a3948a 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/typing/Tuples.java +++ b/src/test/java/source/typing/Tuples.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.typing; +package source.typing; import jsweet.util.tuple.Tuple2; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/typing/Unions.java b/src/test/java/source/typing/Unions.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/typing/Unions.java rename to src/test/java/source/typing/Unions.java index 4c750930..27e80fa2 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/typing/Unions.java +++ b/src/test/java/source/typing/Unions.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.typing; +package source.typing; import static jsweet.util.Globals.$export; import static jsweet.util.Globals.union; diff --git a/src/test/java/org/jsweet/test/transpiler/source/typing/VoidType.java b/src/test/java/source/typing/VoidType.java similarity index 90% rename from src/test/java/org/jsweet/test/transpiler/source/typing/VoidType.java rename to src/test/java/source/typing/VoidType.java index c18dbd97..7ba83548 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/typing/VoidType.java +++ b/src/test/java/source/typing/VoidType.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.typing; +package source.typing; public class VoidType { diff --git a/src/test/java/org/jsweet/test/transpiler/source/typing/WrongUnions.java b/src/test/java/source/typing/WrongUnions.java similarity index 93% rename from src/test/java/org/jsweet/test/transpiler/source/typing/WrongUnions.java rename to src/test/java/source/typing/WrongUnions.java index e4972931..c15eaacc 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/typing/WrongUnions.java +++ b/src/test/java/source/typing/WrongUnions.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.typing; +package source.typing; import static jsweet.util.Globals.union; import jsweet.util.union.Union; diff --git a/src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsCalledWithArray.java b/src/test/java/source/varargs/VarargsCalledWithArray.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsCalledWithArray.java rename to src/test/java/source/varargs/VarargsCalledWithArray.java index 52d6dcc3..67305c34 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsCalledWithArray.java +++ b/src/test/java/source/varargs/VarargsCalledWithArray.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.varargs; +package source.varargs; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOfArrays.java b/src/test/java/source/varargs/VarargsOfArrays.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOfArrays.java rename to src/test/java/source/varargs/VarargsOfArrays.java index b9b63433..6a9c32d3 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOfArrays.java +++ b/src/test/java/source/varargs/VarargsOfArrays.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.varargs; +package source.varargs; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOnAnonymous.java b/src/test/java/source/varargs/VarargsOnAnonymous.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOnAnonymous.java rename to src/test/java/source/varargs/VarargsOnAnonymous.java index 6389ab43..62fbff57 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOnAnonymous.java +++ b/src/test/java/source/varargs/VarargsOnAnonymous.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.varargs; +package source.varargs; public class VarargsOnAnonymous { public static void main(String[] args) { diff --git a/src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOnApi.java b/src/test/java/source/varargs/VarargsOnApi.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOnApi.java rename to src/test/java/source/varargs/VarargsOnApi.java index 01f88a3a..3d2a109d 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOnApi.java +++ b/src/test/java/source/varargs/VarargsOnApi.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.varargs; +package source.varargs; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOnField.java b/src/test/java/source/varargs/VarargsOnField.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOnField.java rename to src/test/java/source/varargs/VarargsOnField.java index 744cc053..d3f7d817 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOnField.java +++ b/src/test/java/source/varargs/VarargsOnField.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.varargs; +package source.varargs; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOnGetter.java b/src/test/java/source/varargs/VarargsOnGetter.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOnGetter.java rename to src/test/java/source/varargs/VarargsOnGetter.java index 6325dbd2..bf13d276 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOnGetter.java +++ b/src/test/java/source/varargs/VarargsOnGetter.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.varargs; +package source.varargs; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOnNew.java b/src/test/java/source/varargs/VarargsOnNew.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOnNew.java rename to src/test/java/source/varargs/VarargsOnNew.java index 82f55b6a..3f9efc6d 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOnNew.java +++ b/src/test/java/source/varargs/VarargsOnNew.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.varargs; +package source.varargs; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOnStaticMethod.java b/src/test/java/source/varargs/VarargsOnStaticMethod.java similarity index 91% rename from src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOnStaticMethod.java rename to src/test/java/source/varargs/VarargsOnStaticMethod.java index 12e064dc..5107d70f 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsOnStaticMethod.java +++ b/src/test/java/source/varargs/VarargsOnStaticMethod.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.varargs; +package source.varargs; import static jsweet.util.Globals.$export; diff --git a/src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsTransmission.java b/src/test/java/source/varargs/VarargsTransmission.java similarity index 92% rename from src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsTransmission.java rename to src/test/java/source/varargs/VarargsTransmission.java index 1f9887db..9e91ba9e 100644 --- a/src/test/java/org/jsweet/test/transpiler/source/varargs/VarargsTransmission.java +++ b/src/test/java/source/varargs/VarargsTransmission.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jsweet.test.transpiler.source.varargs; +package source.varargs; import static jsweet.util.Globals.$export;