Droog71
/
Terasology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor! move engine code in to org.terasology.engine package 

Packages that were formerly org.terasology.engine are now
org.terasology.engine.core.
develop
Kevin Turner 2021-03-04 20:39:07 -08:00
parent 2ca3945485
commit 66e5f5d868
2166 changed files with 12041 additions and 25699 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/runConfigurations/TerasologyPC.xml
View File

@ -7,7 +7,7 @@
<option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" /> <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="org.terasology.engine.*" /> <option name="PATTERN" value="org.terasology.engine.core.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>

2
.idea/runConfigurations/TerasologyPC__2nd_client_.xml
View File

@ -7,7 +7,7 @@
<option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" /> <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="org.terasology.engine.*" /> <option name="PATTERN" value="org.terasology.engine.core.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>

2
.idea/runConfigurations/TerasologyPC__2nd_client_for_mac.xml
View File

@ -7,7 +7,7 @@
<option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m -XstartOnFirstThread -Djava.awt.headless=true" /> <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m -XstartOnFirstThread -Djava.awt.headless=true" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="org.terasology.engine.*" /> <option name="PATTERN" value="org.terasology.engine.core.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>

2
.idea/runConfigurations/TerasologyPC__3rd_client_.xml
View File

@ -7,7 +7,7 @@
<option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" /> <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="org.terasology.engine.*" /> <option name="PATTERN" value="org.terasology.engine.core.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>

2
.idea/runConfigurations/TerasologyPC__CR_enabled_.xml
View File

@ -7,7 +7,7 @@
<option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" /> <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="org.terasology.engine.*" /> <option name="PATTERN" value="org.terasology.engine.core.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>

2
.idea/runConfigurations/TerasologyPC__EXTREME_8GB_.xml
View File

@ -7,7 +7,7 @@
<option name="VM_PARAMETERS" value="-Xms256m -Xmx8192m" /> <option name="VM_PARAMETERS" value="-Xms256m -Xmx8192m" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="org.terasology.engine.*" /> <option name="PATTERN" value="org.terasology.engine.core.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>

2
.idea/runConfigurations/TerasologyPC__Headless_.xml
View File

@ -7,7 +7,7 @@
<option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" /> <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="org.terasology.engine.*" /> <option name="PATTERN" value="org.terasology.engine.core.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>

2
.idea/runConfigurations/TerasologyPC__Java_FlightRecorder_.xml
View File

@ -7,7 +7,7 @@
<option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m -XX:+UnlockCommercialFeatures -XX:+FlightRecorder -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -XX:StartFlightRecording=filename=terasology.jfr,dumponexit=true" /> <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m -XX:+UnlockCommercialFeatures -XX:+FlightRecorder -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -XX:StartFlightRecording=filename=terasology.jfr,dumponexit=true" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="org.terasology.engine.*" /> <option name="PATTERN" value="org.terasology.engine.core.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>

2
.idea/runConfigurations/TerasologyPC__Splash_disabled_.xml
View File

@ -7,7 +7,7 @@
<option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" /> <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="org.terasology.engine.*" /> <option name="PATTERN" value="org.terasology.engine.core.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>

2
.idea/runConfigurations/TerasologyPC__load_latest_.xml
View File

@ -7,7 +7,7 @@
<option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" /> <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="org.terasology.engine.*" /> <option name="PATTERN" value="org.terasology.engine.core.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>

2
.idea/runConfigurations/TerasologyPC__no_audio_.xml
View File

@ -7,7 +7,7 @@
<option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" /> <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="org.terasology.engine.*" /> <option name="PATTERN" value="org.terasology.engine.core.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>

2
.idea/runConfigurations/TerasologyPC__no_saves_.xml
View File

@ -7,7 +7,7 @@
<option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" /> <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="org.terasology.engine.*" /> <option name="PATTERN" value="org.terasology.engine.core.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>

4
.idea/runConfigurations/TerasologyPC__permissive_security_.xml
View File

@ -4,10 +4,10 @@
<module name="Terasology.facades.PC.main" /> <module name="Terasology.facades.PC.main" />
<option name="PROGRAM_PARAMETERS" value="-homedir -noCrashReport -permissiveSecurity" /> <option name="PROGRAM_PARAMETERS" value="-homedir -noCrashReport -permissiveSecurity" />
<shortenClasspath name="MANIFEST" /> <shortenClasspath name="MANIFEST" />
<option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m -Djava.library.path=$TERASOLOGY_NATIVES$" /> <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m -Djava.library.path=$PROJECT_DIR$/natives/linux" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="org.terasology.engine.*" /> <option name="PATTERN" value="org.terasology.engine.core.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>

2
.idea/runConfigurations/TerasologyPC_for_mac.xml
View File

@ -7,7 +7,7 @@
<option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m -XstartOnFirstThread -Djava.awt.headless=true" /> <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m -XstartOnFirstThread -Djava.awt.headless=true" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="org.terasology.engine.*" /> <option name="PATTERN" value="org.terasology.engine.core.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>

4
.idea/runConfigurations/engine_tests_with_JaCoCo.xml
View File

@ -2,9 +2,9 @@
<configuration default="false" name="engine-tests with JaCoCo" type="JUnit" factoryName="JUnit"> <configuration default="false" name="engine-tests with JaCoCo" type="JUnit" factoryName="JUnit">
<shortenClasspath name="MANIFEST" /> <shortenClasspath name="MANIFEST" />
<useClassPathOnly /> <useClassPathOnly />
<extension name="coverage" runner="jacoco"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="org.terasology.engine.*" /> <option name="PATTERN" value="org.terasology.engine.core.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>

2
build.gradle
View File

@ -44,7 +44,7 @@ plugins {
//apply plugin: 'eclipse' //apply plugin: 'eclipse'
id "idea" id "idea"
// For the "Build and run using: Intellij IDEA | Gradle" switch // For the "Build and run using: Intellij IDEA | Gradle" switch
id "org.jetbrains.gradle.plugin.idea-ext" version "0.8.1" id "org.jetbrains.gradle.plugin.idea-ext" version "1.0"
} }

12
engine-tests/build.gradle
View File

@ -3,9 +3,13 @@
// Engine tests are split out due to otherwise quirky project dependency issues with module tests extending engine tests // Engine tests are split out due to otherwise quirky project dependency issues with module tests extending engine tests
plugins {
id "java-library"
id "org.jetbrains.gradle.plugin.idea-ext"
}
// Grab all the common stuff like plugins to use, artifact repositories, code analysis config // Grab all the common stuff like plugins to use, artifact repositories, code analysis config
apply from: "$rootDir/config/gradle/publish.gradle" apply from: "$rootDir/config/gradle/publish.gradle"
apply plugin: "java-library"
import groovy.json.JsonSlurper import groovy.json.JsonSlurper
@ -42,6 +46,8 @@ sourceSets {
// Adjust output path (changed with the Gradle 6 upgrade, this puts it back) // Adjust output path (changed with the Gradle 6 upgrade, this puts it back)
main.java.outputDir = new File("$buildDir/classes") main.java.outputDir = new File("$buildDir/classes")
test.java.outputDir = new File("$buildDir/testClasses") test.java.outputDir = new File("$buildDir/testClasses")
test.java.srcDirs = ["src/test/java/org/terasology"]
} }
// Primary dependencies definition // Primary dependencies definition
@ -89,5 +95,9 @@ idea {
outputDir = file('build/classes') outputDir = file('build/classes')
testOutputDir = file('build/testClasses') testOutputDir = file('build/testClasses')
downloadSources = true downloadSources = true
settings {
packagePrefix["src/test/java/org/terasology"] = "org.terasology.engine";
}
} }
} }

8
engine-tests/src/main/java/org/terasology/Environment.java
View File

@ -20,11 +20,11 @@ import com.google.common.collect.Sets;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.terasology.assets.management.AssetManager; import org.terasology.assets.management.AssetManager;
import org.terasology.context.Context; import org.terasology.engine.context.Context;
import org.terasology.context.internal.ContextImpl; import org.terasology.engine.context.internal.ContextImpl;
import org.terasology.naming.Name; import org.terasology.naming.Name;
import org.terasology.recording.RecordAndReplayCurrentStatus; import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
import org.terasology.registry.CoreRegistry; import org.terasology.engine.registry.CoreRegistry;
import java.io.IOException; import java.io.IOException;
import java.util.Set; import java.util.Set;

157
engine-tests/src/main/java/org/terasology/HeadlessEnvironment.java
View File

@ -1,18 +1,5 @@
/* // Copyright 2021 The Terasology Foundation
* Copyright 2018 MovingBlocks // SPDX-License-Identifier: Apache-2.0
*
* 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.terasology; package org.terasology;
import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.ShrinkWrap;
@ -22,86 +9,86 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.terasology.assets.management.AssetManager; import org.terasology.assets.management.AssetManager;
import org.terasology.assets.module.ModuleAwareAssetTypeManager; import org.terasology.assets.module.ModuleAwareAssetTypeManager;
import org.terasology.audio.AudioManager; import org.terasology.engine.audio.AudioManager;
import org.terasology.audio.StaticSound; import org.terasology.engine.audio.StaticSound;
import org.terasology.audio.StreamingSound; import org.terasology.engine.audio.StreamingSound;
import org.terasology.audio.nullAudio.NullAudioManager; import org.terasology.engine.audio.nullAudio.NullAudioManager;
import org.terasology.audio.nullAudio.NullSound; import org.terasology.engine.audio.nullAudio.NullSound;
import org.terasology.audio.nullAudio.NullStreamingSound; import org.terasology.engine.audio.nullAudio.NullStreamingSound;
import org.terasology.config.Config; import org.terasology.engine.config.Config;
import org.terasology.context.Context; import org.terasology.engine.context.Context;
import org.terasology.engine.ComponentSystemManager; import org.terasology.engine.core.ComponentSystemManager;
import org.terasology.engine.EngineTime; import org.terasology.engine.core.EngineTime;
import org.terasology.engine.Time; import org.terasology.engine.core.Time;
import org.terasology.engine.bootstrap.EntitySystemSetupUtil; import org.terasology.engine.core.bootstrap.EntitySystemSetupUtil;
import org.terasology.engine.modes.loadProcesses.LoadPrefabs; import org.terasology.engine.core.modes.loadProcesses.LoadPrefabs;
import org.terasology.engine.module.ExternalApiWhitelist; import org.terasology.engine.core.module.ExternalApiWhitelist;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.core.module.ModuleManager;
import org.terasology.engine.paths.PathManager; import org.terasology.engine.core.paths.PathManager;
import org.terasology.engine.subsystem.headless.assets.HeadlessMaterial; import org.terasology.engine.core.subsystem.headless.assets.HeadlessMaterial;
import org.terasology.engine.subsystem.headless.assets.HeadlessMesh; import org.terasology.engine.core.subsystem.headless.assets.HeadlessMesh;
import org.terasology.engine.subsystem.headless.assets.HeadlessShader; import org.terasology.engine.core.subsystem.headless.assets.HeadlessShader;
import org.terasology.engine.subsystem.headless.assets.HeadlessSkeletalMesh; import org.terasology.engine.core.subsystem.headless.assets.HeadlessSkeletalMesh;
import org.terasology.engine.subsystem.headless.assets.HeadlessTexture; import org.terasology.engine.core.subsystem.headless.assets.HeadlessTexture;
import org.terasology.entitySystem.entity.internal.EngineEntityManager; import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
import org.terasology.entitySystem.prefab.Prefab; import org.terasology.engine.entitySystem.prefab.Prefab;
import org.terasology.entitySystem.prefab.internal.PojoPrefab; import org.terasology.engine.entitySystem.prefab.internal.PojoPrefab;
import org.terasology.logic.behavior.asset.BehaviorTree; import org.terasology.engine.logic.behavior.asset.BehaviorTree;
import org.terasology.engine.network.NetworkSystem;
import org.terasology.engine.network.internal.NetworkSystemImpl;
import org.terasology.engine.persistence.StorageManager;
import org.terasology.engine.persistence.internal.ReadWriteStorageManager;
import org.terasology.engine.persistence.typeHandling.extensionTypes.BlockFamilyTypeHandler;
import org.terasology.engine.persistence.typeHandling.extensionTypes.BlockTypeHandler;
import org.terasology.engine.persistence.typeHandling.extensionTypes.CollisionGroupTypeHandler;
import org.terasology.engine.physics.CollisionGroup;
import org.terasology.engine.physics.CollisionGroupManager;
import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
import org.terasology.engine.recording.RecordAndReplaySerializer;
import org.terasology.engine.recording.RecordAndReplayUtils;
import org.terasology.engine.rendering.assets.animation.MeshAnimation;
import org.terasology.engine.rendering.assets.animation.MeshAnimationImpl;
import org.terasology.engine.rendering.assets.atlas.Atlas;
import org.terasology.engine.rendering.assets.font.Font;
import org.terasology.engine.rendering.assets.font.FontImpl;
import org.terasology.engine.rendering.assets.material.Material;
import org.terasology.engine.rendering.assets.mesh.Mesh;
import org.terasology.engine.rendering.assets.shader.Shader;
import org.terasology.engine.rendering.assets.skeletalmesh.SkeletalMesh;
import org.terasology.engine.rendering.assets.texture.PNGTextureFormat;
import org.terasology.engine.rendering.assets.texture.Texture;
import org.terasology.engine.rendering.assets.texture.subtexture.Subtexture;
import org.terasology.engine.world.WorldProvider;
import org.terasology.engine.world.block.Block;
import org.terasology.engine.world.block.BlockManager;
import org.terasology.engine.world.block.family.BlockFamily;
import org.terasology.engine.world.block.family.BlockFamilyLibrary;
import org.terasology.engine.world.block.internal.BlockManagerImpl;
import org.terasology.engine.world.block.loader.BlockFamilyDefinition;
import org.terasology.engine.world.block.loader.BlockFamilyDefinitionFormat;
import org.terasology.engine.world.block.shapes.BlockShape;
import org.terasology.engine.world.block.shapes.BlockShapeImpl;
import org.terasology.engine.world.block.sounds.BlockSounds;
import org.terasology.engine.world.block.tiles.BlockTile;
import org.terasology.engine.world.block.tiles.NullWorldAtlas;
import org.terasology.engine.world.block.tiles.WorldAtlas;
import org.terasology.engine.world.chunks.blockdata.ExtraBlockDataManager;
import org.terasology.engine.world.internal.WorldInfo;
import org.terasology.engine.world.sun.BasicCelestialModel;
import org.terasology.engine.world.sun.CelestialSystem;
import org.terasology.engine.world.sun.DefaultCelestialSystem;
import org.terasology.engine.world.time.WorldTime;
import org.terasology.engine.world.time.WorldTimeImpl;
import org.terasology.module.DependencyResolver; import org.terasology.module.DependencyResolver;
import org.terasology.module.ModuleEnvironment; import org.terasology.module.ModuleEnvironment;
import org.terasology.module.ModuleRegistry; import org.terasology.module.ModuleRegistry;
import org.terasology.module.ResolutionResult; import org.terasology.module.ResolutionResult;
import org.terasology.naming.Name; import org.terasology.naming.Name;
import org.terasology.network.NetworkSystem;
import org.terasology.network.internal.NetworkSystemImpl;
import org.terasology.nui.asset.UIElement; import org.terasology.nui.asset.UIElement;
import org.terasology.nui.skin.UISkin; import org.terasology.nui.skin.UISkin;
import org.terasology.persistence.StorageManager;
import org.terasology.persistence.internal.ReadWriteStorageManager;
import org.terasology.persistence.typeHandling.TypeHandlerLibrary; import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
import org.terasology.persistence.typeHandling.extensionTypes.BlockFamilyTypeHandler;
import org.terasology.persistence.typeHandling.extensionTypes.BlockTypeHandler;
import org.terasology.persistence.typeHandling.extensionTypes.CollisionGroupTypeHandler;
import org.terasology.physics.CollisionGroup;
import org.terasology.physics.CollisionGroupManager;
import org.terasology.recording.RecordAndReplayCurrentStatus;
import org.terasology.recording.RecordAndReplaySerializer;
import org.terasology.recording.RecordAndReplayUtils;
import org.terasology.reflection.TypeRegistry; import org.terasology.reflection.TypeRegistry;
import org.terasology.rendering.assets.animation.MeshAnimation;
import org.terasology.rendering.assets.animation.MeshAnimationImpl;
import org.terasology.rendering.assets.atlas.Atlas;
import org.terasology.rendering.assets.font.Font;
import org.terasology.rendering.assets.font.FontImpl;
import org.terasology.rendering.assets.material.Material;
import org.terasology.rendering.assets.mesh.Mesh;
import org.terasology.rendering.assets.shader.Shader;
import org.terasology.rendering.assets.skeletalmesh.SkeletalMesh;
import org.terasology.rendering.assets.texture.PNGTextureFormat;
import org.terasology.rendering.assets.texture.Texture;
import org.terasology.rendering.assets.texture.subtexture.Subtexture;
import org.terasology.testUtil.ModuleManagerFactory; import org.terasology.testUtil.ModuleManagerFactory;
import org.terasology.world.WorldProvider;
import org.terasology.world.block.Block;
import org.terasology.world.block.BlockManager;
import org.terasology.world.block.family.BlockFamily;
import org.terasology.world.block.family.BlockFamilyLibrary;
import org.terasology.world.block.internal.BlockManagerImpl;
import org.terasology.world.block.loader.BlockFamilyDefinition;
import org.terasology.world.block.loader.BlockFamilyDefinitionFormat;
import org.terasology.world.block.shapes.BlockShape;
import org.terasology.world.block.shapes.BlockShapeImpl;
import org.terasology.world.block.sounds.BlockSounds;
import org.terasology.world.block.tiles.BlockTile;
import org.terasology.world.block.tiles.NullWorldAtlas;
import org.terasology.world.block.tiles.WorldAtlas;
import org.terasology.world.chunks.blockdata.ExtraBlockDataManager;
import org.terasology.world.internal.WorldInfo;
import org.terasology.world.sun.BasicCelestialModel;
import org.terasology.world.sun.CelestialSystem;
import org.terasology.world.sun.DefaultCelestialSystem;
import org.terasology.world.time.WorldTime;
import org.terasology.world.time.WorldTimeImpl;
import java.io.IOException; import java.io.IOException;
import java.nio.file.FileSystem; import java.nio.file.FileSystem;

32
engine-tests/src/main/java/org/terasology/MapWorldProvider.java
View File

@ -18,22 +18,22 @@ package org.terasology;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import org.joml.Vector3i; import org.joml.Vector3i;
import org.joml.Vector3ic; import org.joml.Vector3ic;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.world.WorldChangeListener; import org.terasology.engine.world.WorldChangeListener;
import org.terasology.world.block.Block; import org.terasology.engine.world.block.Block;
import org.terasology.world.block.BlockManager; import org.terasology.engine.world.block.BlockManager;
import org.terasology.world.block.BlockRegionc; import org.terasology.engine.world.block.BlockRegionc;
import org.terasology.world.chunks.Chunk; import org.terasology.engine.world.chunks.Chunk;
import org.terasology.world.chunks.Chunks; import org.terasology.engine.world.chunks.Chunks;
import org.terasology.world.chunks.blockdata.ExtraBlockDataManager; import org.terasology.engine.world.chunks.blockdata.ExtraBlockDataManager;
import org.terasology.world.chunks.internal.ChunkImpl; import org.terasology.engine.world.chunks.internal.ChunkImpl;
import org.terasology.world.generation.impl.EntityBufferImpl; import org.terasology.engine.world.generation.impl.EntityBufferImpl;
import org.terasology.world.generator.WorldGenerator; import org.terasology.engine.world.generator.WorldGenerator;
import org.terasology.world.internal.ChunkViewCore; import org.terasology.engine.world.internal.ChunkViewCore;
import org.terasology.world.internal.WorldInfo; import org.terasology.engine.world.internal.WorldInfo;
import org.terasology.world.internal.WorldProviderCore; import org.terasology.engine.world.internal.WorldProviderCore;
import org.terasology.world.time.WorldTime; import org.terasology.engine.world.time.WorldTime;
import org.terasology.world.time.WorldTimeImpl; import org.terasology.engine.world.time.WorldTimeImpl;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;

4
engine-tests/src/main/java/org/terasology/ModuleEnvironmentTest.java
View File

@ -19,8 +19,8 @@ import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.nio.file.ShrinkWrapFileSystems; import org.jboss.shrinkwrap.api.nio.file.ShrinkWrapFileSystems;
import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.core.module.ModuleManager;
import org.terasology.engine.paths.PathManager; import org.terasology.engine.core.paths.PathManager;
import org.terasology.module.DependencyResolver; import org.terasology.module.DependencyResolver;
import org.terasology.module.ModuleEnvironment; import org.terasology.module.ModuleEnvironment;
import org.terasology.module.ResolutionResult; import org.terasology.module.ResolutionResult;

48
engine-tests/src/main/java/org/terasology/TerasologyTestingEnvironment.java
View File

@ -23,32 +23,32 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.terasology.context.Context; import org.terasology.engine.context.Context;
import org.terasology.engine.ComponentSystemManager; import org.terasology.engine.core.ComponentSystemManager;
import org.terasology.engine.EngineTime; import org.terasology.engine.core.EngineTime;
import org.terasology.engine.Time; import org.terasology.engine.core.Time;
import org.terasology.engine.bootstrap.EntitySystemSetupUtil; import org.terasology.engine.core.bootstrap.EntitySystemSetupUtil;
import org.terasology.engine.modes.loadProcesses.LoadPrefabs; import org.terasology.engine.core.modes.loadProcesses.LoadPrefabs;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.core.module.ModuleManager;
import org.terasology.engine.paths.PathManager; import org.terasology.engine.core.paths.PathManager;
import org.terasology.entitySystem.entity.internal.EngineEntityManager; import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
import org.terasology.game.Game; import org.terasology.engine.game.Game;
import org.terasology.logic.console.Console; import org.terasology.engine.logic.console.Console;
import org.terasology.logic.console.ConsoleImpl; import org.terasology.engine.logic.console.ConsoleImpl;
import org.terasology.naming.Name; import org.terasology.naming.Name;
import org.terasology.network.NetworkSystem; import org.terasology.engine.network.NetworkSystem;
import org.terasology.network.internal.NetworkSystemImpl; import org.terasology.engine.network.internal.NetworkSystemImpl;
import org.terasology.persistence.StorageManager; import org.terasology.engine.persistence.StorageManager;
import org.terasology.persistence.internal.ReadWriteStorageManager; import org.terasology.engine.persistence.internal.ReadWriteStorageManager;
import org.terasology.recording.CharacterStateEventPositionMap; import org.terasology.engine.recording.CharacterStateEventPositionMap;
import org.terasology.recording.DirectionAndOriginPosRecorderList; import org.terasology.engine.recording.DirectionAndOriginPosRecorderList;
import org.terasology.recording.RecordAndReplayCurrentStatus; import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
import org.terasology.recording.RecordAndReplaySerializer; import org.terasology.engine.recording.RecordAndReplaySerializer;
import org.terasology.recording.RecordAndReplayUtils; import org.terasology.engine.recording.RecordAndReplayUtils;
import org.terasology.recording.RecordedEventStore; import org.terasology.engine.recording.RecordedEventStore;
import org.terasology.reflection.TypeRegistry; import org.terasology.reflection.TypeRegistry;
import org.terasology.world.block.BlockManager; import org.terasology.engine.world.block.BlockManager;
import org.terasology.world.chunks.blockdata.ExtraBlockDataManager; import org.terasology.engine.world.chunks.blockdata.ExtraBlockDataManager;
import java.nio.file.FileSystem; import java.nio.file.FileSystem;
import java.nio.file.Path; import java.nio.file.Path;

18
engine-tests/src/main/java/org/terasology/WorldProvidingHeadlessEnvironment.java
View File

@ -16,15 +16,15 @@
package org.terasology; package org.terasology;
import org.terasology.naming.Name; import org.terasology.naming.Name;
import org.terasology.registry.CoreRegistry; import org.terasology.engine.registry.CoreRegistry;
import org.terasology.world.BlockEntityRegistry; import org.terasology.engine.world.BlockEntityRegistry;
import org.terasology.world.WorldProvider; import org.terasology.engine.world.WorldProvider;
import org.terasology.world.block.BlockManager; import org.terasology.engine.world.block.BlockManager;
import org.terasology.world.chunks.blockdata.ExtraBlockDataManager; import org.terasology.engine.world.chunks.blockdata.ExtraBlockDataManager;
import org.terasology.world.generator.WorldGenerator; import org.terasology.engine.world.generator.WorldGenerator;
import org.terasology.world.internal.EntityAwareWorldProvider; import org.terasology.engine.world.internal.EntityAwareWorldProvider;
import org.terasology.world.internal.WorldProviderCore; import org.terasology.engine.world.internal.WorldProviderCore;
import org.terasology.world.internal.WorldProviderWrapper; import org.terasology.engine.world.internal.WorldProviderWrapper;
/** /**
* Environment with a MapWorldProvider and BlockManager. Useful to get headless environment with a generated world. * Environment with a MapWorldProvider and BlockManager. Useful to get headless environment with a generated world.

8
engine-tests/src/main/java/org/terasology/config/flexible/TestAutoConfig.java
View File

@ -1,13 +1,13 @@
// Copyright 2021 The Terasology Foundation // Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package org.terasology.config.flexible; package org.terasology.engine.config.flexible;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.terasology.reflection.TypeInfo; import org.terasology.reflection.TypeInfo;
import static org.terasology.config.flexible.SettingArgument.defaultValue; import static org.terasology.engine.config.flexible.SettingArgument.defaultValue;
import static org.terasology.config.flexible.SettingArgument.name; import static org.terasology.engine.config.flexible.SettingArgument.name;
import static org.terasology.config.flexible.SettingArgument.type; import static org.terasology.engine.config.flexible.SettingArgument.type;
public class TestAutoConfig extends AutoConfig { public class TestAutoConfig extends AutoConfig {
public final Setting<String> stringSetting = setting( public final Setting<String> stringSetting = setting(

6
engine-tests/src/main/java/org/terasology/entitySystem/stubs/EntityRefComponent.java
View File

@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem.stubs; package org.terasology.engine.entitySystem.stubs;
import org.terasology.entitySystem.Component; import org.terasology.engine.entitySystem.Component;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.EntityRef;
/** /**
*/ */

6
engine-tests/src/main/java/org/terasology/entitySystem/stubs/ForceBlockActiveComponent.java
View File

@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem.stubs; package org.terasology.engine.entitySystem.stubs;
import org.terasology.entitySystem.Component; import org.terasology.engine.entitySystem.Component;
import org.terasology.world.block.ForceBlockActive; import org.terasology.engine.world.block.ForceBlockActive;
/** /**
*/ */

4
engine-tests/src/main/java/org/terasology/entitySystem/stubs/GetterSetterComponent.java
View File

@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem.stubs; package org.terasology.engine.entitySystem.stubs;
import org.joml.Vector3f; import org.joml.Vector3f;
import org.terasology.entitySystem.Component; import org.terasology.engine.entitySystem.Component;
/** /**
*/ */

4
engine-tests/src/main/java/org/terasology/entitySystem/stubs/IntegerComponent.java
View File

@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem.stubs; package org.terasology.engine.entitySystem.stubs;
import org.terasology.entitySystem.Component; import org.terasology.engine.entitySystem.Component;
/** /**
*/ */

6
engine-tests/src/main/java/org/terasology/entitySystem/stubs/ListOfEnumsComponent.java
View File

@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem.stubs; package org.terasology.engine.entitySystem.stubs;
import org.terasology.entitySystem.Component; import org.terasology.engine.entitySystem.Component;
import org.terasology.math.Side; import org.terasology.engine.math.Side;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

4
engine-tests/src/main/java/org/terasology/entitySystem/stubs/ListOfObjectComponent.java
View File

@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem.stubs; package org.terasology.engine.entitySystem.stubs;
import org.terasology.entitySystem.Component; import org.terasology.engine.entitySystem.Component;
import org.terasology.reflection.MappedContainer; import org.terasology.reflection.MappedContainer;
import java.util.ArrayList; import java.util.ArrayList;

4
engine-tests/src/main/java/org/terasology/entitySystem/stubs/MappedContainerComponent.java
View File

@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem.stubs; package org.terasology.engine.entitySystem.stubs;
import org.terasology.entitySystem.Component; import org.terasology.engine.entitySystem.Component;
import org.terasology.reflection.MappedContainer; import org.terasology.reflection.MappedContainer;
import java.util.Set; import java.util.Set;

4
engine-tests/src/main/java/org/terasology/entitySystem/stubs/MappedTypeComponent.java
View File

@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem.stubs; package org.terasology.engine.entitySystem.stubs;
import org.terasology.entitySystem.Component; import org.terasology.engine.entitySystem.Component;
import org.terasology.reflection.MappedContainer; import org.terasology.reflection.MappedContainer;
/** /**

4
engine-tests/src/main/java/org/terasology/entitySystem/stubs/OrderedMapTestComponent.java
View File

@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem.stubs; package org.terasology.engine.entitySystem.stubs;
import org.terasology.entitySystem.Component; import org.terasology.engine.entitySystem.Component;
import java.util.Map; import java.util.Map;

8
engine-tests/src/main/java/org/terasology/entitySystem/stubs/OwnerComponent.java
View File

@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem.stubs; package org.terasology.engine.entitySystem.stubs;
import org.terasology.entitySystem.Component; import org.terasology.engine.entitySystem.Component;
import org.terasology.entitySystem.Owns; import org.terasology.engine.entitySystem.Owns;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.EntityRef;
/** /**
*/ */

6
engine-tests/src/main/java/org/terasology/entitySystem/stubs/RetainedOnBlockChangeComponent.java
View File

@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem.stubs; package org.terasology.engine.entitySystem.stubs;
import org.terasology.entitySystem.Component; import org.terasology.engine.entitySystem.Component;
import org.terasology.world.block.ForceBlockActive; import org.terasology.engine.world.block.ForceBlockActive;
/** /**
*/ */

4
engine-tests/src/main/java/org/terasology/entitySystem/stubs/StringComponent.java
View File

@ -1,10 +1,10 @@
// Copyright 2021 The Terasology Foundation // Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package org.terasology.entitySystem.stubs; package org.terasology.engine.entitySystem.stubs;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import org.terasology.entitySystem.Component; import org.terasology.engine.entitySystem.Component;
public final class StringComponent implements Component { public final class StringComponent implements Component {

6
engine-tests/src/main/java/org/terasology/entitySystem/stubs/UnsupportedTypeComponent.java
View File

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem.stubs; package org.terasology.engine.entitySystem.stubs;
import org.terasology.entitySystem.Component; import org.terasology.engine.entitySystem.Component;
import org.terasology.entitySystem.systems.internal.DoNotAutoRegister; import org.terasology.engine.entitySystem.systems.internal.DoNotAutoRegister;
/** /**
*/ */

2
engine-tests/src/main/java/org/terasology/testUtil/ModuleManagerFactory.java
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package org.terasology.testUtil; package org.terasology.testUtil;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.core.module.ModuleManager;
public final class ModuleManagerFactory { public final class ModuleManagerFactory {
private ModuleManagerFactory() { } private ModuleManagerFactory() { }

19
engine-tests/src/main/java/org/terasology/testUtil/WorldProviderCoreStub.java
View File

@ -16,19 +16,18 @@
package org.terasology.testUtil; package org.terasology.testUtil;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import org.joml.Vector3i; import org.joml.Vector3i;
import org.joml.Vector3ic; import org.joml.Vector3ic;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.world.WorldChangeListener; import org.terasology.engine.world.WorldChangeListener;
import org.terasology.world.block.Block; import org.terasology.engine.world.block.Block;
import org.terasology.world.block.BlockRegionc; import org.terasology.engine.world.block.BlockRegionc;
import org.terasology.world.internal.ChunkViewCore; import org.terasology.engine.world.internal.ChunkViewCore;
import org.terasology.world.internal.WorldInfo; import org.terasology.engine.world.internal.WorldInfo;
import org.terasology.world.internal.WorldProviderCore; import org.terasology.engine.world.internal.WorldProviderCore;
import org.terasology.world.time.WorldTime; import org.terasology.engine.world.time.WorldTime;
import org.terasology.world.time.WorldTimeImpl; import org.terasology.engine.world.time.WorldTimeImpl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;

7
engine-tests/src/main/java/org/terasology/world/propagation/StubPropagatorWorldView.java
View File

@ -20,9 +20,10 @@ import gnu.trove.map.TObjectByteMap;
import gnu.trove.map.hash.TObjectByteHashMap; import gnu.trove.map.hash.TObjectByteHashMap;
import org.joml.Vector3i; import org.joml.Vector3i;
import org.joml.Vector3ic; import org.joml.Vector3ic;
import org.terasology.world.block.Block; import org.terasology.engine.world.block.Block;
import org.terasology.world.block.BlockRegion; import org.terasology.engine.world.block.BlockRegion;
import org.terasology.world.block.BlockRegionc; import org.terasology.engine.world.block.BlockRegionc;
import org.terasology.engine.world.propagation.PropagatorWorldView;
import java.util.Map; import java.util.Map;

28
engine-tests/src/test/java/org/terasology/config/flexible/AutoConfigManagerTest.java
View File

@ -1,19 +1,6 @@
/* // Copyright 2021 The Terasology Foundation
* Copyright 2019 MovingBlocks // SPDX-License-Identifier: Apache-2.0
* package org.terasology.engine.config.flexible;
* 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.terasology.config.flexible;
import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.nio.file.ShrinkWrapFileSystems; import org.jboss.shrinkwrap.api.nio.file.ShrinkWrapFileSystems;
@ -21,10 +8,10 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import org.terasology.context.Context; import org.terasology.engine.context.Context;
import org.terasology.engine.SimpleUri; import org.terasology.engine.core.SimpleUri;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.core.module.ModuleManager;
import org.terasology.engine.paths.PathManager; import org.terasology.engine.core.paths.PathManager;
import org.terasology.module.ModuleEnvironment; import org.terasology.module.ModuleEnvironment;
import org.terasology.naming.Name; import org.terasology.naming.Name;
import org.terasology.persistence.typeHandling.TypeHandlerLibrary; import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
@ -32,7 +19,6 @@ import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
import java.nio.file.FileSystem; import java.nio.file.FileSystem;
import java.util.Collections; import java.util.Collections;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;

6
engine-tests/src/test/java/org/terasology/config/flexible/AutoConfigSerializerTest.java
View File

@ -1,6 +1,6 @@
// Copyright 2020 The Terasology Foundation // Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package org.terasology.config.flexible; package org.terasology.engine.config.flexible;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.gson.Gson; import com.google.gson.Gson;
@ -8,8 +8,8 @@ import com.google.gson.JsonElement;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.reflections.Reflections; import org.reflections.Reflections;
import org.terasology.engine.persistence.typeHandling.TypeHandlerLibraryImpl;
import org.terasology.persistence.typeHandling.TypeHandlerLibrary; import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
import org.terasology.persistence.typeHandling.TypeHandlerLibraryImpl;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;

14
engine-tests/src/test/java/org/terasology/config/flexible/AutoConfigTest.java
View File

@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.config.flexible; package org.terasology.engine.config.flexible;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.config.flexible.constraints.NumberRangeConstraint; import org.terasology.engine.config.flexible.constraints.NumberRangeConstraint;
import org.terasology.reflection.TypeInfo; import org.terasology.reflection.TypeInfo;
import java.lang.reflect.Field; import java.lang.reflect.Field;
@ -26,11 +26,11 @@ import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.terasology.config.flexible.SettingArgument.constraint; import static org.terasology.engine.config.flexible.SettingArgument.constraint;
import static org.terasology.config.flexible.SettingArgument.defaultValue; import static org.terasology.engine.config.flexible.SettingArgument.defaultValue;
import static org.terasology.config.flexible.SettingArgument.description; import static org.terasology.engine.config.flexible.SettingArgument.description;
import static org.terasology.config.flexible.SettingArgument.name; import static org.terasology.engine.config.flexible.SettingArgument.name;
import static org.terasology.config.flexible.SettingArgument.type; import static org.terasology.engine.config.flexible.SettingArgument.type;
public class AutoConfigTest { public class AutoConfigTest {
@Test @Test

2
engine-tests/src/test/java/org/terasology/config/flexible/constraints/NumberRangeConstraintTest.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.config.flexible.constraints; package org.terasology.engine.config.flexible.constraints;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

14
engine-tests/src/test/java/org/terasology/config/flexible/internal/SettingImplTest.java
View File

@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.config.flexible.internal; package org.terasology.engine.config.flexible.internal;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.config.flexible.Setting; import org.terasology.engine.config.flexible.Setting;
import org.terasology.config.flexible.SettingChangeListener; import org.terasology.engine.config.flexible.SettingChangeListener;
import org.terasology.config.flexible.constraints.NumberRangeConstraint; import org.terasology.engine.config.flexible.constraints.NumberRangeConstraint;
import org.terasology.engine.SimpleUri; import org.terasology.engine.core.SimpleUri;
import org.terasology.reflection.TypeInfo; import org.terasology.reflection.TypeInfo;
import org.terasology.utilities.random.FastRandom; import org.terasology.engine.utilities.random.FastRandom;
import org.terasology.utilities.random.Random; import org.terasology.engine.utilities.random.Random;
import java.util.List; import java.util.List;

6
engine-tests/src/test/java/org/terasology/config/flexible/ui/SettingWidgetFactoryTest.java
View File

@ -1,13 +1,13 @@
// Copyright 2021 The Terasology Foundation // Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package org.terasology.config.flexible.ui; package org.terasology.engine.config.flexible.ui;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.assets.management.AssetManager; import org.terasology.assets.management.AssetManager;
import org.terasology.assets.management.AssetTypeManager; import org.terasology.assets.management.AssetTypeManager;
import org.terasology.config.flexible.Setting; import org.terasology.engine.config.flexible.Setting;
import org.terasology.config.flexible.constraints.NumberRangeConstraint; import org.terasology.engine.config.flexible.constraints.NumberRangeConstraint;
import org.terasology.module.ModuleEnvironment; import org.terasology.module.ModuleEnvironment;
import java.util.Optional; import java.util.Optional;

4
engine-tests/src/test/java/org/terasology/documentation/ApiScraper.java
View File

@ -17,8 +17,8 @@ package org.terasology.documentation;
import com.google.common.collect.Multimaps; import com.google.common.collect.Multimaps;
import com.google.common.collect.SortedSetMultimap; import com.google.common.collect.SortedSetMultimap;
import org.terasology.engine.module.ExternalApiWhitelist; import org.terasology.engine.core.module.ExternalApiWhitelist;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.core.module.ModuleManager;
import org.terasology.module.ModuleEnvironment; import org.terasology.module.ModuleEnvironment;
import org.terasology.module.sandbox.API; import org.terasology.module.sandbox.API;
import org.terasology.testUtil.ModuleManagerFactory; import org.terasology.testUtil.ModuleManagerFactory;

8
engine-tests/src/test/java/org/terasology/documentation/BindingScraper.java
View File

@ -17,12 +17,12 @@ package org.terasology.documentation;
import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.core.module.ModuleManager;
import org.terasology.input.DefaultBinding; import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.DefaultBindings; import org.terasology.engine.input.DefaultBindings;
import org.terasology.input.Input; import org.terasology.input.Input;
import org.terasology.input.InputCategory; import org.terasology.input.InputCategory;
import org.terasology.input.RegisterBindButton; import org.terasology.engine.input.RegisterBindButton;
import org.terasology.testUtil.ModuleManagerFactory; import org.terasology.testUtil.ModuleManagerFactory;
import java.util.HashMap; import java.util.HashMap;

4
engine-tests/src/test/java/org/terasology/documentation/apiScraper/CompleteApiScraper.java
View File

@ -19,8 +19,8 @@ import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps; import com.google.common.collect.Multimaps;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.terasology.engine.module.ExternalApiWhitelist; import org.terasology.engine.core.module.ExternalApiWhitelist;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.core.module.ModuleManager;
import org.terasology.module.ModuleEnvironment; import org.terasology.module.ModuleEnvironment;
import org.terasology.module.sandbox.API; import org.terasology.module.sandbox.API;
import org.terasology.testUtil.ModuleManagerFactory; import org.terasology.testUtil.ModuleManagerFactory;

25
engine-tests/src/test/java/org/terasology/engine/ComponentSystemManagerTest.java
View File

@ -11,18 +11,19 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.terasology.context.Context; import org.terasology.engine.context.Context;
import org.terasology.entitySystem.entity.EntityManager; import org.terasology.engine.core.ComponentSystemManager;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.EntityManager;
import org.terasology.entitySystem.event.internal.EventSystem; import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.entitySystem.systems.BaseComponentSystem; import org.terasology.engine.entitySystem.event.internal.EventSystem;
import org.terasology.entitySystem.systems.RenderSystem; import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
import org.terasology.entitySystem.systems.UpdateSubscriberSystem; import org.terasology.engine.entitySystem.systems.RenderSystem;
import org.terasology.logic.console.Console; import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
import org.terasology.logic.console.commandSystem.MethodCommand; import org.terasology.engine.logic.console.Console;
import org.terasology.logic.console.commandSystem.annotations.Command; import org.terasology.engine.logic.console.commandSystem.MethodCommand;
import org.terasology.logic.console.commandSystem.annotations.CommandParam; import org.terasology.engine.logic.console.commandSystem.annotations.Command;
import org.terasology.logic.console.commandSystem.annotations.Sender; import org.terasology.engine.logic.console.commandSystem.annotations.CommandParam;
import org.terasology.engine.logic.console.commandSystem.annotations.Sender;
import java.util.List; import java.util.List;

4
engine-tests/src/test/java/org/terasology/engine/module/ClasspathSupportingModuleLoaderTest.java
View File

@ -1,7 +1,7 @@
// Copyright 2021 The Terasology Foundation // Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package org.terasology.engine.module; package org.terasology.engine.core.module;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource; import org.junit.jupiter.params.provider.ValueSource;
@ -13,7 +13,7 @@ import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.terasology.engine.TerasologyConstants.MODULE_INFO_FILENAME; import static org.terasology.engine.core.TerasologyConstants.MODULE_INFO_FILENAME;
public class ClasspathSupportingModuleLoaderTest { public class ClasspathSupportingModuleLoaderTest {
@ParameterizedTest @ParameterizedTest

4
engine-tests/src/test/java/org/terasology/engine/module/ModuleDownloadListGeneratorTest.java
View File

@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.engine.module; package org.terasology.engine.core.module;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.engine.TerasologyConstants; import org.terasology.engine.core.TerasologyConstants;
import org.terasology.module.BaseModule; import org.terasology.module.BaseModule;
import org.terasology.module.DependencyResolver; import org.terasology.module.DependencyResolver;
import org.terasology.module.Module; import org.terasology.module.Module;

26
engine-tests/src/test/java/org/terasology/engine/subsystem/config/BindsSubsystemTest.java
View File

@ -1,25 +1,25 @@
package org.terasology.engine.subsystem.config; package org.terasology.engine.core.subsystem.config;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.config.BindsConfig; import org.terasology.engine.config.BindsConfig;
import org.terasology.config.facade.BindsConfiguration; import org.terasology.engine.config.facade.BindsConfiguration;
import org.terasology.context.Context; import org.terasology.engine.context.Context;
import org.terasology.context.internal.ContextImpl; import org.terasology.engine.context.internal.ContextImpl;
import org.terasology.engine.SimpleUri; import org.terasology.engine.core.SimpleUri;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.core.module.ModuleManager;
import org.terasology.engine.subsystem.config.BindsSubsystem.BindsConfigAdapter; import org.terasology.engine.core.subsystem.config.BindsSubsystem.BindsConfigAdapter;
import org.terasology.input.BindButtonEvent; import org.terasology.engine.input.BindButtonEvent;
import org.terasology.input.BindableButton; import org.terasology.engine.input.BindableButton;
import org.terasology.input.DefaultBinding; import org.terasology.engine.input.DefaultBinding;
import org.terasology.input.Input; import org.terasology.input.Input;
import org.terasology.input.InputType; import org.terasology.input.InputType;
import org.terasology.input.Keyboard; import org.terasology.input.Keyboard;
import org.terasology.input.Keyboard.Key; import org.terasology.input.Keyboard.Key;
import org.terasology.input.Keyboard.KeyId; import org.terasology.input.Keyboard.KeyId;
import org.terasology.input.RegisterBindAxis; import org.terasology.engine.input.RegisterBindAxis;
import org.terasology.input.RegisterBindButton; import org.terasology.engine.input.RegisterBindButton;
import org.terasology.module.Module; import org.terasology.module.Module;
import org.terasology.module.ModuleEnvironment; import org.terasology.module.ModuleEnvironment;
import org.terasology.module.ModuleMetadata; import org.terasology.module.ModuleMetadata;

38
engine-tests/src/test/java/org/terasology/entitySystem/BaseEntityRefTest.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem; package org.terasology.engine.entitySystem;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
@ -22,21 +22,21 @@ import org.junit.jupiter.api.Test;
import org.terasology.assets.AssetFactory; import org.terasology.assets.AssetFactory;
import org.terasology.assets.management.AssetManager; import org.terasology.assets.management.AssetManager;
import org.terasology.assets.module.ModuleAwareAssetTypeManager; import org.terasology.assets.module.ModuleAwareAssetTypeManager;
import org.terasology.context.Context; import org.terasology.engine.context.Context;
import org.terasology.context.internal.ContextImpl; import org.terasology.engine.context.internal.ContextImpl;
import org.terasology.engine.bootstrap.EntitySystemSetupUtil; import org.terasology.engine.core.bootstrap.EntitySystemSetupUtil;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.core.module.ModuleManager;
import org.terasology.entitySystem.entity.EntityManager; import org.terasology.engine.entitySystem.entity.EntityManager;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.entitySystem.entity.internal.EntityInfoComponent; import org.terasology.engine.entitySystem.entity.internal.EntityInfoComponent;
import org.terasology.entitySystem.entity.internal.EntityScope; import org.terasology.engine.entitySystem.entity.internal.EntityScope;
import org.terasology.entitySystem.entity.internal.PojoEntityManager; import org.terasology.engine.entitySystem.entity.internal.PojoEntityManager;
import org.terasology.entitySystem.prefab.Prefab; import org.terasology.engine.entitySystem.prefab.Prefab;
import org.terasology.entitySystem.prefab.PrefabData; import org.terasology.engine.entitySystem.prefab.PrefabData;
import org.terasology.entitySystem.prefab.internal.PojoPrefab; import org.terasology.engine.entitySystem.prefab.internal.PojoPrefab;
import org.terasology.network.NetworkSystem; import org.terasology.engine.network.NetworkSystem;
import org.terasology.recording.RecordAndReplayCurrentStatus; import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
import org.terasology.registry.CoreRegistry; import org.terasology.engine.registry.CoreRegistry;
import org.terasology.testUtil.ModuleManagerFactory; import org.terasology.testUtil.ModuleManagerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
@ -45,9 +45,9 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.terasology.entitySystem.entity.internal.EntityScope.CHUNK; import static org.terasology.engine.entitySystem.entity.internal.EntityScope.CHUNK;
import static org.terasology.entitySystem.entity.internal.EntityScope.GLOBAL; import static org.terasology.engine.entitySystem.entity.internal.EntityScope.GLOBAL;
import static org.terasology.entitySystem.entity.internal.EntityScope.SECTOR; import static org.terasology.engine.entitySystem.entity.internal.EntityScope.SECTOR;
public class BaseEntityRefTest { public class BaseEntityRefTest {

24
engine-tests/src/test/java/org/terasology/entitySystem/OwnershipHelperTest.java
View File

@ -13,27 +13,25 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem; package org.terasology.engine.entitySystem;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.context.internal.ContextImpl; import org.terasology.engine.context.internal.ContextImpl;
import org.terasology.engine.bootstrap.EntitySystemSetupUtil; import org.terasology.engine.core.bootstrap.EntitySystemSetupUtil;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.core.module.ModuleManager;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.entitySystem.entity.internal.EngineEntityManager; import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
import org.terasology.entitySystem.entity.internal.OwnershipHelper; import org.terasology.engine.entitySystem.entity.internal.OwnershipHelper;
import org.terasology.entitySystem.stubs.OwnerComponent; import org.terasology.engine.entitySystem.stubs.OwnerComponent;
import org.terasology.network.NetworkSystem; import org.terasology.engine.network.NetworkSystem;
import org.terasology.recording.RecordAndReplayCurrentStatus; import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
import org.terasology.registry.CoreRegistry; import org.terasology.engine.registry.CoreRegistry;
import org.terasology.testUtil.ModuleManagerFactory; import org.terasology.testUtil.ModuleManagerFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;

52
engine-tests/src/test/java/org/terasology/entitySystem/PojoEntityManagerTest.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem; package org.terasology.engine.entitySystem;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
@ -23,31 +23,31 @@ import org.terasology.assets.AssetFactory;
import org.terasology.assets.ResourceUrn; import org.terasology.assets.ResourceUrn;
import org.terasology.assets.management.AssetManager; import org.terasology.assets.management.AssetManager;
import org.terasology.assets.module.ModuleAwareAssetTypeManager; import org.terasology.assets.module.ModuleAwareAssetTypeManager;
import org.terasology.context.Context; import org.terasology.engine.context.Context;
import org.terasology.context.internal.ContextImpl; import org.terasology.engine.context.internal.ContextImpl;
import org.terasology.engine.bootstrap.EntitySystemSetupUtil; import org.terasology.engine.core.bootstrap.EntitySystemSetupUtil;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.core.module.ModuleManager;
import org.terasology.entitySystem.entity.EntityManager; import org.terasology.engine.entitySystem.entity.EntityManager;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.entitySystem.entity.internal.PojoEntityManager; import org.terasology.engine.entitySystem.entity.internal.PojoEntityManager;
import org.terasology.entitySystem.entity.internal.PojoEntityPool; import org.terasology.engine.entitySystem.entity.internal.PojoEntityPool;
import org.terasology.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent; import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
import org.terasology.entitySystem.entity.lifecycleEvents.BeforeRemoveComponent; import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeRemoveComponent;
import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent; import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
import org.terasology.entitySystem.entity.lifecycleEvents.OnAddedComponent; import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnAddedComponent;
import org.terasology.entitySystem.entity.lifecycleEvents.OnChangedComponent; import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnChangedComponent;
import org.terasology.entitySystem.event.internal.EventSystem; import org.terasology.engine.entitySystem.event.internal.EventSystem;
import org.terasology.entitySystem.prefab.Prefab; import org.terasology.engine.entitySystem.prefab.Prefab;
import org.terasology.entitySystem.prefab.PrefabData; import org.terasology.engine.entitySystem.prefab.PrefabData;
import org.terasology.entitySystem.prefab.internal.PojoPrefab; import org.terasology.engine.entitySystem.prefab.internal.PojoPrefab;
import org.terasology.entitySystem.stubs.EntityRefComponent; import org.terasology.engine.entitySystem.stubs.EntityRefComponent;
import org.terasology.entitySystem.stubs.IntegerComponent; import org.terasology.engine.entitySystem.stubs.IntegerComponent;
import org.terasology.entitySystem.stubs.StringComponent; import org.terasology.engine.entitySystem.stubs.StringComponent;
import org.terasology.network.NetworkSystem; import org.terasology.engine.network.NetworkSystem;
import org.terasology.recording.RecordAndReplayCurrentStatus; import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
import org.terasology.registry.CoreRegistry; import org.terasology.engine.registry.CoreRegistry;
import org.terasology.testUtil.ModuleManagerFactory; import org.terasology.testUtil.ModuleManagerFactory;
import org.terasology.utilities.Assets; import org.terasology.engine.utilities.Assets;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
@ -61,7 +61,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.terasology.entitySystem.entity.internal.EntityScope.CHUNK; import static org.terasology.engine.entitySystem.entity.internal.EntityScope.CHUNK;
/** /**
*/ */

30
engine-tests/src/test/java/org/terasology/entitySystem/PojoEntityPoolTest.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem; package org.terasology.engine.entitySystem;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
@ -21,20 +21,20 @@ import org.junit.jupiter.api.Test;
import org.terasology.assets.AssetFactory; import org.terasology.assets.AssetFactory;
import org.terasology.assets.management.AssetManager; import org.terasology.assets.management.AssetManager;
import org.terasology.assets.module.ModuleAwareAssetTypeManager; import org.terasology.assets.module.ModuleAwareAssetTypeManager;
import org.terasology.context.Context; import org.terasology.engine.context.Context;
import org.terasology.context.internal.ContextImpl; import org.terasology.engine.context.internal.ContextImpl;
import org.terasology.engine.bootstrap.EntitySystemSetupUtil; import org.terasology.engine.core.bootstrap.EntitySystemSetupUtil;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.core.module.ModuleManager;
import org.terasology.entitySystem.entity.EntityManager; import org.terasology.engine.entitySystem.entity.EntityManager;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.entitySystem.entity.internal.PojoEntityManager; import org.terasology.engine.entitySystem.entity.internal.PojoEntityManager;
import org.terasology.entitySystem.entity.internal.PojoEntityPool; import org.terasology.engine.entitySystem.entity.internal.PojoEntityPool;
import org.terasology.entitySystem.prefab.Prefab; import org.terasology.engine.entitySystem.prefab.Prefab;
import org.terasology.entitySystem.prefab.PrefabData; import org.terasology.engine.entitySystem.prefab.PrefabData;
import org.terasology.entitySystem.prefab.internal.PojoPrefab; import org.terasology.engine.entitySystem.prefab.internal.PojoPrefab;
import org.terasology.network.NetworkSystem; import org.terasology.engine.network.NetworkSystem;
import org.terasology.recording.RecordAndReplayCurrentStatus; import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
import org.terasology.registry.CoreRegistry; import org.terasology.engine.registry.CoreRegistry;
import org.terasology.testUtil.ModuleManagerFactory; import org.terasology.testUtil.ModuleManagerFactory;
import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertFalse;

48
engine-tests/src/test/java/org/terasology/entitySystem/PojoEventSystemTests.java
View File

@ -1,34 +1,34 @@
// Copyright 2020 The Terasology Foundation // Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package org.terasology.entitySystem; package org.terasology.engine.entitySystem;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.reflections.Reflections; import org.reflections.Reflections;
import org.terasology.context.internal.ContextImpl; import org.terasology.engine.context.internal.ContextImpl;
import org.terasology.engine.SimpleUri; import org.terasology.engine.core.SimpleUri;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.entitySystem.entity.internal.PojoEntityManager; import org.terasology.engine.entitySystem.entity.internal.PojoEntityManager;
import org.terasology.entitySystem.event.AbstractConsumableEvent; import org.terasology.engine.entitySystem.event.AbstractConsumableEvent;
import org.terasology.entitySystem.event.Event; import org.terasology.engine.entitySystem.event.Event;
import org.terasology.entitySystem.event.EventPriority; import org.terasology.engine.entitySystem.event.EventPriority;
import org.terasology.entitySystem.event.ReceiveEvent; import org.terasology.engine.entitySystem.event.ReceiveEvent;
import org.terasology.entitySystem.event.internal.EventReceiver; import org.terasology.engine.entitySystem.event.internal.EventReceiver;
import org.terasology.entitySystem.event.internal.EventSystemImpl; import org.terasology.engine.entitySystem.event.internal.EventSystemImpl;
import org.terasology.entitySystem.metadata.ComponentLibrary; import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
import org.terasology.entitySystem.metadata.EntitySystemLibrary; import org.terasology.engine.entitySystem.metadata.EntitySystemLibrary;
import org.terasology.entitySystem.prefab.internal.PojoPrefabManager; import org.terasology.engine.entitySystem.prefab.internal.PojoPrefabManager;
import org.terasology.entitySystem.stubs.IntegerComponent; import org.terasology.engine.entitySystem.stubs.IntegerComponent;
import org.terasology.entitySystem.stubs.StringComponent; import org.terasology.engine.entitySystem.stubs.StringComponent;
import org.terasology.entitySystem.systems.BaseComponentSystem; import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
import org.terasology.network.NetworkMode; import org.terasology.engine.network.NetworkMode;
import org.terasology.network.NetworkSystem; import org.terasology.engine.network.NetworkSystem;
import org.terasology.engine.persistence.typeHandling.TypeHandlerLibraryImpl;
import org.terasology.engine.recording.EventCatcher;
import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
import org.terasology.engine.registry.CoreRegistry;
import org.terasology.persistence.typeHandling.TypeHandlerLibrary; import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
import org.terasology.persistence.typeHandling.TypeHandlerLibraryImpl;
import org.terasology.recording.EventCatcher;
import org.terasology.recording.RecordAndReplayCurrentStatus;
import org.terasology.registry.CoreRegistry;
import java.util.List; import java.util.List;

20
engine-tests/src/test/java/org/terasology/entitySystem/PojoPrefabManagerTest.java
View File

@ -1,22 +1,22 @@
// Copyright 2020 The Terasology Foundation // Copyright 2020 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package org.terasology.entitySystem; package org.terasology.engine.entitySystem;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.assets.ResourceUrn; import org.terasology.assets.ResourceUrn;
import org.terasology.assets.management.AssetManager; import org.terasology.assets.management.AssetManager;
import org.terasology.assets.module.ModuleAwareAssetTypeManager; import org.terasology.assets.module.ModuleAwareAssetTypeManager;
import org.terasology.context.internal.ContextImpl; import org.terasology.engine.context.internal.ContextImpl;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.core.module.ModuleManager;
import org.terasology.entitySystem.prefab.Prefab; import org.terasology.engine.entitySystem.prefab.Prefab;
import org.terasology.entitySystem.prefab.PrefabData; import org.terasology.engine.entitySystem.prefab.PrefabData;
import org.terasology.entitySystem.prefab.internal.PojoPrefab; import org.terasology.engine.entitySystem.prefab.internal.PojoPrefab;
import org.terasology.entitySystem.prefab.internal.PojoPrefabManager; import org.terasology.engine.entitySystem.prefab.internal.PojoPrefabManager;
import org.terasology.entitySystem.stubs.StringComponent; import org.terasology.engine.entitySystem.stubs.StringComponent;
import org.terasology.registry.CoreRegistry; import org.terasology.engine.registry.CoreRegistry;
import org.terasology.testUtil.ModuleManagerFactory; import org.terasology.testUtil.ModuleManagerFactory;
import org.terasology.utilities.Assets; import org.terasology.engine.utilities.Assets;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;

44
engine-tests/src/test/java/org/terasology/entitySystem/PrefabTest.java
View File

@ -1,6 +1,6 @@
// Copyright 2020 The Terasology Foundation // Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package org.terasology.entitySystem; package org.terasology.engine.entitySystem;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -9,27 +9,27 @@ import org.slf4j.LoggerFactory;
import org.terasology.assets.AssetFactory; import org.terasology.assets.AssetFactory;
import org.terasology.assets.management.AssetManager; import org.terasology.assets.management.AssetManager;
import org.terasology.assets.module.ModuleAwareAssetTypeManager; import org.terasology.assets.module.ModuleAwareAssetTypeManager;
import org.terasology.context.internal.ContextImpl; import org.terasology.engine.context.internal.ContextImpl;
import org.terasology.engine.bootstrap.EntitySystemSetupUtil; import org.terasology.engine.core.bootstrap.EntitySystemSetupUtil;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.core.module.ModuleManager;
import org.terasology.entitySystem.metadata.ComponentLibrary; import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
import org.terasology.entitySystem.prefab.Prefab; import org.terasology.engine.entitySystem.prefab.Prefab;
import org.terasology.entitySystem.prefab.PrefabData; import org.terasology.engine.entitySystem.prefab.PrefabData;
import org.terasology.entitySystem.prefab.PrefabManager; import org.terasology.engine.entitySystem.prefab.PrefabManager;
import org.terasology.entitySystem.prefab.internal.PojoPrefab; import org.terasology.engine.entitySystem.prefab.internal.PojoPrefab;
import org.terasology.entitySystem.prefab.internal.PojoPrefabManager; import org.terasology.engine.entitySystem.prefab.internal.PojoPrefabManager;
import org.terasology.entitySystem.prefab.internal.PrefabFormat; import org.terasology.engine.entitySystem.prefab.internal.PrefabFormat;
import org.terasology.entitySystem.stubs.ListOfEnumsComponent; import org.terasology.engine.entitySystem.stubs.ListOfEnumsComponent;
import org.terasology.entitySystem.stubs.ListOfObjectComponent; import org.terasology.engine.entitySystem.stubs.ListOfObjectComponent;
import org.terasology.entitySystem.stubs.MappedContainerComponent; import org.terasology.engine.entitySystem.stubs.MappedContainerComponent;
import org.terasology.entitySystem.stubs.OrderedMapTestComponent; import org.terasology.engine.entitySystem.stubs.OrderedMapTestComponent;
import org.terasology.entitySystem.stubs.StringComponent; import org.terasology.engine.entitySystem.stubs.StringComponent;
import org.terasology.math.Side; import org.terasology.engine.math.Side;
import org.terasology.network.NetworkMode; import org.terasology.engine.network.NetworkMode;
import org.terasology.network.NetworkSystem; import org.terasology.engine.network.NetworkSystem;
import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
import org.terasology.engine.registry.CoreRegistry;
import org.terasology.persistence.typeHandling.TypeHandlerLibrary; import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
import org.terasology.recording.RecordAndReplayCurrentStatus;
import org.terasology.registry.CoreRegistry;
import org.terasology.testUtil.ModuleManagerFactory; import org.terasology.testUtil.ModuleManagerFactory;
import java.util.ArrayList; import java.util.ArrayList;

12
engine-tests/src/test/java/org/terasology/entitySystem/metadata/ComponentMetadataTest.java
View File

@ -1,17 +1,17 @@
// Copyright 2020 The Terasology Foundation // Copyright 2020 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package org.terasology.entitySystem.metadata; package org.terasology.engine.entitySystem.metadata;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.reflections.Reflections; import org.reflections.Reflections;
import org.terasology.assets.ResourceUrn; import org.terasology.assets.ResourceUrn;
import org.terasology.context.Context; import org.terasology.engine.context.Context;
import org.terasology.context.internal.ContextImpl; import org.terasology.engine.context.internal.ContextImpl;
import org.terasology.entitySystem.stubs.OwnerComponent; import org.terasology.engine.entitySystem.stubs.OwnerComponent;
import org.terasology.entitySystem.stubs.StringComponent; import org.terasology.engine.entitySystem.stubs.StringComponent;
import org.terasology.persistence.typeHandling.TypeHandlerLibraryImpl; import org.terasology.engine.persistence.typeHandling.TypeHandlerLibraryImpl;
import org.terasology.reflection.copy.CopyStrategyLibrary; import org.terasology.reflection.copy.CopyStrategyLibrary;
import org.terasology.reflection.reflect.ReflectFactory; import org.terasology.reflection.reflect.ReflectFactory;
import org.terasology.reflection.reflect.ReflectionReflectFactory; import org.terasology.reflection.reflect.ReflectionReflectFactory;

5
engine-tests/src/test/java/org/terasology/entitySystem/metadata/FieldMetadataTest.java
View File

@ -13,12 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem.metadata; package org.terasology.engine.entitySystem.metadata;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.assets.ResourceUrn; import org.terasology.assets.ResourceUrn;
import org.terasology.engine.SimpleUri; import org.terasology.engine.entitySystem.stubs.OwnerComponent;
import org.terasology.entitySystem.stubs.OwnerComponent;
import org.terasology.reflection.copy.CopyStrategyLibrary; import org.terasology.reflection.copy.CopyStrategyLibrary;
import org.terasology.reflection.reflect.ReflectFactory; import org.terasology.reflection.reflect.ReflectFactory;
import org.terasology.reflection.reflect.ReflectionReflectFactory; import org.terasology.reflection.reflect.ReflectionReflectFactory;

8
engine-tests/src/test/java/org/terasology/entitySystem/metadata/OwnedCollectionComponent.java
View File

@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem.metadata; package org.terasology.engine.entitySystem.metadata;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.terasology.entitySystem.Component; import org.terasology.engine.entitySystem.Component;
import org.terasology.entitySystem.Owns; import org.terasology.engine.entitySystem.Owns;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.EntityRef;
import java.util.List; import java.util.List;

3
engine-tests/src/test/java/org/terasology/entitySystem/metadata/internal/MetadataBuilderTest.java
View File

@ -13,12 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.entitySystem.metadata.internal; package org.terasology.engine.entitySystem.metadata.internal;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.assets.ResourceUrn; import org.terasology.assets.ResourceUrn;
import org.terasology.engine.SimpleUri;
import org.terasology.reflection.copy.CopyStrategyLibrary; import org.terasology.reflection.copy.CopyStrategyLibrary;
import org.terasology.reflection.metadata.DefaultClassMetadata; import org.terasology.reflection.metadata.DefaultClassMetadata;
import org.terasology.reflection.metadata.FieldMetadata; import org.terasology.reflection.metadata.FieldMetadata;

8
engine-tests/src/test/java/org/terasology/fixtures/TestBlockManager.java
View File

@ -3,10 +3,10 @@
package org.terasology.fixtures; package org.terasology.fixtures;
import org.terasology.world.block.Block; import org.terasology.engine.world.block.Block;
import org.terasology.world.block.BlockManager; import org.terasology.engine.world.block.BlockManager;
import org.terasology.world.block.BlockUri; import org.terasology.engine.world.block.BlockUri;
import org.terasology.world.block.family.BlockFamily; import org.terasology.engine.world.block.family.BlockFamily;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;

4
engine-tests/src/test/java/org/terasology/fixtures/TestChunkStore.java
View File

@ -4,8 +4,8 @@
package org.terasology.fixtures; package org.terasology.fixtures;
import org.joml.Vector3i; import org.joml.Vector3i;
import org.terasology.persistence.ChunkStore; import org.terasology.engine.persistence.ChunkStore;
import org.terasology.world.chunks.Chunk; import org.terasology.engine.world.chunks.Chunk;
public class TestChunkStore implements ChunkStore { public class TestChunkStore implements ChunkStore {

10
engine-tests/src/test/java/org/terasology/fixtures/TestStorageManager.java
View File

@ -5,11 +5,11 @@ package org.terasology.fixtures;
import org.joml.Vector3i; import org.joml.Vector3i;
import org.joml.Vector3ic; import org.joml.Vector3ic;
import org.terasology.network.Client; import org.terasology.engine.network.Client;
import org.terasology.persistence.ChunkStore; import org.terasology.engine.persistence.ChunkStore;
import org.terasology.persistence.PlayerStore; import org.terasology.engine.persistence.PlayerStore;
import org.terasology.persistence.StorageManager; import org.terasology.engine.persistence.StorageManager;
import org.terasology.world.chunks.Chunk; import org.terasology.engine.world.chunks.Chunk;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;

14
engine-tests/src/test/java/org/terasology/fixtures/TestWorldGenerator.java
View File

@ -3,13 +3,13 @@
package org.terasology.fixtures; package org.terasology.fixtures;
import org.terasology.engine.SimpleUri; import org.terasology.engine.core.SimpleUri;
import org.terasology.world.block.BlockManager; import org.terasology.engine.world.block.BlockManager;
import org.terasology.world.chunks.CoreChunk; import org.terasology.engine.world.chunks.CoreChunk;
import org.terasology.world.generation.EntityBuffer; import org.terasology.engine.world.generation.EntityBuffer;
import org.terasology.world.generation.World; import org.terasology.engine.world.generation.World;
import org.terasology.world.generator.WorldConfigurator; import org.terasology.engine.world.generator.WorldConfigurator;
import org.terasology.world.generator.WorldGenerator; import org.terasology.engine.world.generator.WorldGenerator;
public class TestWorldGenerator implements WorldGenerator { public class TestWorldGenerator implements WorldGenerator {
private final BlockManager blockManager; private final BlockManager blockManager;

6
engine-tests/src/test/java/org/terasology/i18n/TranslationFormatTests.java
View File

@ -22,9 +22,9 @@ import org.terasology.assets.ResourceUrn;
import org.terasology.assets.exceptions.InvalidAssetFilenameException; import org.terasology.assets.exceptions.InvalidAssetFilenameException;
import org.terasology.assets.format.AssetDataFile; import org.terasology.assets.format.AssetDataFile;
import org.terasology.assets.format.FileFormat; import org.terasology.assets.format.FileFormat;
import org.terasology.engine.SimpleUri; import org.terasology.engine.core.SimpleUri;
import org.terasology.i18n.assets.TranslationData; import org.terasology.engine.i18n.assets.TranslationData;
import org.terasology.i18n.assets.TranslationFormat; import org.terasology.engine.i18n.assets.TranslationFormat;
import org.terasology.naming.Name; import org.terasology.naming.Name;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;

2
engine-tests/src/test/java/org/terasology/identity/CertificateTests.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.identity; package org.terasology.engine.identity;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

2
engine-tests/src/test/java/org/terasology/identity/MasterSecretGeneratorTests.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.identity; package org.terasology.engine.identity;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

2
engine-tests/src/test/java/org/terasology/identity/storageServiceClient/BigIntegerBase64SerializerTest.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.identity.storageServiceClient; package org.terasology.engine.identity.storageServiceClient;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonPrimitive; import com.google.gson.JsonPrimitive;

2
engine-tests/src/test/java/org/terasology/identity/storageServiceClient/ServiceApiRequestTests.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.identity.storageServiceClient; package org.terasology.engine.identity.storageServiceClient;
import com.google.gson.Gson; import com.google.gson.Gson;

39
engine-tests/src/test/java/org/terasology/input/InputSystemTests.java
View File

@ -7,28 +7,33 @@ import com.google.common.collect.Queues;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.terasology.context.Context; import org.terasology.engine.context.Context;
import org.terasology.context.internal.ContextImpl; import org.terasology.engine.context.internal.ContextImpl;
import org.terasology.engine.SimpleUri; import org.terasology.engine.core.SimpleUri;
import org.terasology.engine.Time; import org.terasology.engine.core.Time;
import org.terasology.engine.subsystem.DisplayDevice; import org.terasology.engine.core.subsystem.DisplayDevice;
import org.terasology.engine.subsystem.config.BindsManager; import org.terasology.engine.core.subsystem.config.BindsManager;
import org.terasology.engine.subsystem.headless.device.TimeSystem; import org.terasology.engine.core.subsystem.headless.device.TimeSystem;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.entitySystem.event.Event; import org.terasology.engine.entitySystem.event.Event;
import org.terasology.engine.input.BindButtonEvent;
import org.terasology.engine.input.BindableButton;
import org.terasology.engine.input.DefaultBinding;
import org.terasology.engine.input.InputSystem;
import org.terasology.engine.input.RegisterBindButton;
import org.terasology.input.Keyboard.Key; import org.terasology.input.Keyboard.Key;
import org.terasology.input.Keyboard.KeyId; import org.terasology.input.Keyboard.KeyId;
import org.terasology.input.cameraTarget.CameraTargetSystem; import org.terasology.engine.input.cameraTarget.CameraTargetSystem;
import org.terasology.input.device.CharKeyboardAction; import org.terasology.input.device.CharKeyboardAction;
import org.terasology.input.device.KeyboardDevice; import org.terasology.input.device.KeyboardDevice;
import org.terasology.input.device.RawKeyboardAction; import org.terasology.input.device.RawKeyboardAction;
import org.terasology.input.events.KeyEvent; import org.terasology.engine.input.events.KeyEvent;
import org.terasology.input.internal.BindableButtonImpl; import org.terasology.engine.input.internal.BindableButtonImpl;
import org.terasology.logic.players.LocalPlayer; import org.terasology.engine.logic.players.LocalPlayer;
import org.terasology.network.ClientComponent; import org.terasology.engine.network.ClientComponent;
import org.terasology.recording.DirectionAndOriginPosRecorderList; import org.terasology.engine.recording.DirectionAndOriginPosRecorderList;
import org.terasology.recording.RecordAndReplayCurrentStatus; import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
import org.terasology.registry.InjectionHelper; import org.terasology.engine.registry.InjectionHelper;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

10
engine-tests/src/test/java/org/terasology/logic/behavior/CountCallsTest.java
View File

@ -18,11 +18,11 @@ package org.terasology.logic.behavior;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.terasology.logic.behavior.core.Actor; import org.terasology.engine.logic.behavior.core.Actor;
import org.terasology.logic.behavior.core.BehaviorNode; import org.terasology.engine.logic.behavior.core.BehaviorNode;
import org.terasology.logic.behavior.core.BehaviorState; import org.terasology.engine.logic.behavior.core.BehaviorState;
import org.terasology.logic.behavior.core.BehaviorTreeBuilder; import org.terasology.engine.logic.behavior.core.BehaviorTreeBuilder;
import org.terasology.logic.behavior.core.DelegateNode; import org.terasology.engine.logic.behavior.core.DelegateNode;
import java.util.List; import java.util.List;

15
engine-tests/src/test/java/org/terasology/logic/behavior/CounterTest.java
View File

@ -17,13 +17,14 @@ package org.terasology.logic.behavior;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.logic.behavior.actions.CounterAction; import org.terasology.engine.logic.behavior.DefaultBehaviorTreeRunner;
import org.terasology.logic.behavior.actions.Print; import org.terasology.engine.logic.behavior.actions.CounterAction;
import org.terasology.logic.behavior.actions.TimeoutAction; import org.terasology.engine.logic.behavior.actions.Print;
import org.terasology.logic.behavior.core.Actor; import org.terasology.engine.logic.behavior.actions.TimeoutAction;
import org.terasology.logic.behavior.core.BehaviorNode; import org.terasology.engine.logic.behavior.core.Actor;
import org.terasology.logic.behavior.core.BehaviorTreeBuilder; import org.terasology.engine.logic.behavior.core.BehaviorNode;
import org.terasology.logic.behavior.core.BehaviorTreeRunner; import org.terasology.engine.logic.behavior.core.BehaviorTreeBuilder;
import org.terasology.engine.logic.behavior.core.BehaviorTreeRunner;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;

2
engine-tests/src/test/java/org/terasology/logic/behavior/DynamicSelectorTest.java
View File

@ -16,7 +16,7 @@
package org.terasology.logic.behavior; package org.terasology.logic.behavior;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.logic.behavior.core.BehaviorState; import org.terasology.engine.logic.behavior.core.BehaviorState;
import java.util.Arrays; import java.util.Arrays;

14
engine-tests/src/test/java/org/terasology/logic/behavior/Example.java
View File

@ -17,12 +17,14 @@ package org.terasology.logic.behavior;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.terasology.logic.behavior.actions.Print; import org.terasology.engine.logic.behavior.BehaviorAction;
import org.terasology.logic.behavior.core.Actor; import org.terasology.engine.logic.behavior.DefaultBehaviorTreeRunner;
import org.terasology.logic.behavior.core.BaseAction; import org.terasology.engine.logic.behavior.actions.Print;
import org.terasology.logic.behavior.core.BehaviorNode; import org.terasology.engine.logic.behavior.core.Actor;
import org.terasology.logic.behavior.core.BehaviorState; import org.terasology.engine.logic.behavior.core.BaseAction;
import org.terasology.logic.behavior.core.BehaviorTreeBuilder; import org.terasology.engine.logic.behavior.core.BehaviorNode;
import org.terasology.engine.logic.behavior.core.BehaviorState;
import org.terasology.engine.logic.behavior.core.BehaviorTreeBuilder;
public final class Example { public final class Example {

2
engine-tests/src/test/java/org/terasology/logic/behavior/ParallelTest.java
View File

@ -17,7 +17,7 @@ package org.terasology.logic.behavior;
import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.logic.behavior.core.BehaviorState; import org.terasology.engine.logic.behavior.core.BehaviorState;
import java.util.Arrays; import java.util.Arrays;

2
engine-tests/src/test/java/org/terasology/logic/behavior/SelectorTest.java
View File

@ -16,7 +16,7 @@
package org.terasology.logic.behavior; package org.terasology.logic.behavior;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.logic.behavior.core.BehaviorState; import org.terasology.engine.logic.behavior.core.BehaviorState;
import java.util.Arrays; import java.util.Arrays;

2
engine-tests/src/test/java/org/terasology/logic/behavior/SequenceTest.java
View File

@ -16,7 +16,7 @@
package org.terasology.logic.behavior; package org.terasology.logic.behavior;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.logic.behavior.core.BehaviorState; import org.terasology.engine.logic.behavior.core.BehaviorState;
import java.util.Arrays; import java.util.Arrays;

19
engine-tests/src/test/java/org/terasology/logic/characters/KinematicCharacterMoverTest.java
View File

@ -1,19 +1,6 @@
/* // Copyright 2021 The Terasology Foundation
* Copyright 2015 MovingBlocks // SPDX-License-Identifier: Apache-2.0
* package org.terasology.engine.logic.characters;
* 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.terasology.logic.characters;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

41
engine-tests/src/test/java/org/terasology/logic/characters/VisualCharacterSystemTest.java
View File

@ -1,36 +1,23 @@
/* // Copyright 2021 The Terasology Foundation
* Copyright 2017 MovingBlocks // SPDX-License-Identifier: Apache-2.0
* package org.terasology.engine.logic.characters;
* 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.terasology.logic.characters;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock; import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer; import org.mockito.stubbing.Answer;
import org.terasology.context.Context; import org.terasology.engine.context.Context;
import org.terasology.context.internal.ContextImpl; import org.terasology.engine.context.internal.ContextImpl;
import org.terasology.engine.modes.loadProcesses.AwaitedLocalCharacterSpawnEvent; import org.terasology.engine.core.modes.loadProcesses.AwaitedLocalCharacterSpawnEvent;
import org.terasology.entitySystem.entity.EntityBuilder; import org.terasology.engine.entitySystem.entity.EntityBuilder;
import org.terasology.entitySystem.entity.EntityManager; import org.terasology.engine.entitySystem.entity.EntityManager;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.entitySystem.entity.lifecycleEvents.OnActivatedComponent; import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
import org.terasology.entitySystem.event.Event; import org.terasology.engine.entitySystem.event.Event;
import org.terasology.logic.characters.events.CreateVisualCharacterEvent; import org.terasology.engine.logic.characters.events.CreateVisualCharacterEvent;
import org.terasology.logic.players.LocalPlayer; import org.terasology.engine.logic.players.LocalPlayer;
import org.terasology.registry.InjectionHelper; import org.terasology.engine.registry.InjectionHelper;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;

2
engine-tests/src/test/java/org/terasology/logic/console/ConsoleTest.java
View File

@ -18,6 +18,8 @@ package org.terasology.logic.console;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.TerasologyTestingEnvironment; import org.terasology.TerasologyTestingEnvironment;
import org.terasology.engine.logic.console.Console;
import org.terasology.engine.logic.console.Message;
import java.util.Iterator; import java.util.Iterator;

21
engine-tests/src/test/java/org/terasology/logic/delay/ArbritaryDelayActionComponent.java
View File

@ -1,21 +1,8 @@
/* // Copyright 2021 The Terasology Foundation
* Copyright 2016 MovingBlocks // SPDX-License-Identifier: Apache-2.0
* package org.terasology.engine.logic.delay;
* 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.terasology.logic.delay;
import org.terasology.entitySystem.Component; import org.terasology.engine.entitySystem.Component;
public class ArbritaryDelayActionComponent implements Component { public class ArbritaryDelayActionComponent implements Component {
public int value = 1; public int value = 1;

25
engine-tests/src/test/java/org/terasology/logic/delay/DelayedActionSystemTest.java
View File

@ -1,26 +1,13 @@
/* // Copyright 2021 The Terasology Foundation
* Copyright 2016 MovingBlocks // SPDX-License-Identifier: Apache-2.0
* package org.terasology.engine.logic.delay;
* 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.terasology.logic.delay;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.TerasologyTestingEnvironment; import org.terasology.TerasologyTestingEnvironment;
import org.terasology.engine.Time; import org.terasology.engine.core.Time;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.entitySystem.event.ReceiveEvent; import org.terasology.engine.entitySystem.event.ReceiveEvent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;

6
engine-tests/src/test/java/org/terasology/logic/location/LocationComponentTest.java
View File

@ -8,8 +8,10 @@ import org.joml.Vector3f;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.TerasologyTestingEnvironment; import org.terasology.TerasologyTestingEnvironment;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.entitySystem.entity.lifecycleEvents.BeforeRemoveComponent; import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeRemoveComponent;
import org.terasology.engine.logic.location.Location;
import org.terasology.engine.logic.location.LocationComponent;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;

1
engine-tests/src/test/java/org/terasology/math/Diamond3iIteratorTest.java
View File

@ -21,6 +21,7 @@ import com.google.common.collect.Sets;
import org.joml.Vector3i; import org.joml.Vector3i;
import org.joml.Vector3ic; import org.joml.Vector3ic;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.engine.math.Diamond3iIterable;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;

1
engine-tests/src/test/java/org/terasology/math/DirectionTests.java
View File

@ -17,6 +17,7 @@ package org.terasology.math;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.engine.math.Direction;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;

8
engine-tests/src/test/java/org/terasology/math/IntMathTest.java
View File

@ -20,10 +20,10 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.config.Config; import org.terasology.engine.config.Config;
import org.terasology.context.internal.ContextImpl; import org.terasology.engine.context.internal.ContextImpl;
import org.terasology.context.internal.MockContext; import org.terasology.engine.context.internal.MockContext;
import org.terasology.registry.CoreRegistry; import org.terasology.engine.registry.CoreRegistry;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

1
engine-tests/src/test/java/org/terasology/math/IntegerRangeTest.java
View File

@ -17,6 +17,7 @@ package org.terasology.math;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.engine.math.IntegerRange;
import java.util.Iterator; import java.util.Iterator;

6
engine-tests/src/test/java/org/terasology/math/RotationTest.java
View File

@ -20,6 +20,12 @@ import org.joml.Quaternionf;
import org.joml.Quaternionfc; import org.joml.Quaternionfc;
import org.joml.Vector3f; import org.joml.Vector3f;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.engine.math.Direction;
import org.terasology.engine.math.Pitch;
import org.terasology.engine.math.Roll;
import org.terasology.engine.math.Rotation;
import org.terasology.engine.math.Side;
import org.terasology.engine.math.Yaw;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.terasology.joml.test.QuaternionAssert.assertEquals; import static org.terasology.joml.test.QuaternionAssert.assertEquals;

2
engine-tests/src/test/java/org/terasology/math/SideTest.java
View File

@ -16,6 +16,8 @@
package org.terasology.math; package org.terasology.math;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.engine.math.Direction;
import org.terasology.engine.math.Side;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;

20
engine-tests/src/test/java/org/terasology/network/TestNetwork.java
View File

@ -14,22 +14,22 @@
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.network; package org.terasology.engine.network;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.TerasologyTestingEnvironment; import org.terasology.TerasologyTestingEnvironment;
import org.terasology.config.Config; import org.terasology.engine.config.Config;
import org.terasology.engine.EngineTime; import org.terasology.engine.core.EngineTime;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.entitySystem.entity.internal.EngineEntityManager; import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
import org.terasology.entitySystem.metadata.EventLibrary; import org.terasology.engine.entitySystem.metadata.EventLibrary;
import org.terasology.identity.CertificateGenerator; import org.terasology.engine.identity.CertificateGenerator;
import org.terasology.identity.CertificatePair; import org.terasology.engine.identity.CertificatePair;
import org.terasology.network.exceptions.HostingFailedException; import org.terasology.engine.network.exceptions.HostingFailedException;
import org.terasology.network.internal.NetworkSystemImpl; import org.terasology.engine.network.internal.NetworkSystemImpl;
import java.util.List; import java.util.List;

28
engine-tests/src/test/java/org/terasology/network/internal/NetworkOwnershipTest.java
View File

@ -14,25 +14,25 @@
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.network.internal; package org.terasology.engine.network.internal;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.TerasologyTestingEnvironment; import org.terasology.TerasologyTestingEnvironment;
import org.terasology.engine.ComponentSystemManager; import org.terasology.engine.core.ComponentSystemManager;
import org.terasology.engine.EngineTime; import org.terasology.engine.core.EngineTime;
import org.terasology.engine.bootstrap.EntitySystemSetupUtil; import org.terasology.engine.core.bootstrap.EntitySystemSetupUtil;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.core.module.ModuleManager;
import org.terasology.entitySystem.entity.EntityBuilder; import org.terasology.engine.entitySystem.entity.EntityBuilder;
import org.terasology.entitySystem.entity.EntityManager; import org.terasology.engine.entitySystem.entity.EntityManager;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.entitySystem.entity.internal.EngineEntityManager; import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
import org.terasology.entitySystem.entity.internal.PojoEntityManager; import org.terasology.engine.entitySystem.entity.internal.PojoEntityManager;
import org.terasology.entitySystem.metadata.EventLibrary; import org.terasology.engine.entitySystem.metadata.EventLibrary;
import org.terasology.network.NetworkComponent; import org.terasology.engine.network.NetworkComponent;
import org.terasology.network.NetworkSystem; import org.terasology.engine.network.NetworkSystem;
import org.terasology.testUtil.ModuleManagerFactory; import org.terasology.testUtil.ModuleManagerFactory;
import org.terasology.world.BlockEntityRegistry; import org.terasology.engine.world.BlockEntityRegistry;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;

6
engine-tests/src/test/java/org/terasology/particles/ParticlePoolTest.java
View File

@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.particles; package org.terasology.engine.particles;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.math.TeraMath; import org.terasology.math.TeraMath;
import org.terasology.utilities.random.FastRandom; import org.terasology.engine.utilities.random.FastRandom;
import org.terasology.utilities.random.Random; import org.terasology.engine.utilities.random.Random;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;

18
engine-tests/src/test/java/org/terasology/particles/updating/ParticleUpdaterImplTest.java
View File

@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.particles.updating; package org.terasology.engine.particles.updating;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.core.module.ModuleManager;
import org.terasology.entitySystem.Component; import org.terasology.engine.entitySystem.Component;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.particles.components.ParticleEmitterComponent; import org.terasology.engine.particles.components.ParticleEmitterComponent;
import org.terasology.particles.components.affectors.VelocityAffectorComponent; import org.terasology.engine.particles.components.affectors.VelocityAffectorComponent;
import org.terasology.particles.components.generators.EnergyRangeGeneratorComponent; import org.terasology.engine.particles.components.generators.EnergyRangeGeneratorComponent;
import org.terasology.physics.Physics; import org.terasology.engine.physics.Physics;
import org.terasology.physics.engine.PhysicsEngine; import org.terasology.engine.physics.engine.PhysicsEngine;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;

38
engine-tests/src/test/java/org/terasology/persistence/ComponentSerializerTest.java
View File

@ -1,6 +1,6 @@
// Copyright 2020 The Terasology Foundation // Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence; package org.terasology.engine.persistence;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import org.joml.Quaternionf; import org.joml.Quaternionf;
@ -10,25 +10,25 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.reflections.Reflections; import org.reflections.Reflections;
import org.terasology.assets.ResourceUrn; import org.terasology.assets.ResourceUrn;
import org.terasology.context.Context; import org.terasology.engine.context.Context;
import org.terasology.context.internal.ContextImpl; import org.terasology.engine.context.internal.ContextImpl;
import org.terasology.engine.bootstrap.EntitySystemSetupUtil; import org.terasology.engine.core.bootstrap.EntitySystemSetupUtil;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.core.module.ModuleManager;
import org.terasology.entitySystem.Component; import org.terasology.engine.entitySystem.Component;
import org.terasology.entitySystem.entity.internal.EngineEntityManager; import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
import org.terasology.entitySystem.metadata.ComponentLibrary; import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
import org.terasology.entitySystem.stubs.GetterSetterComponent; import org.terasology.engine.entitySystem.stubs.GetterSetterComponent;
import org.terasology.entitySystem.stubs.IntegerComponent; import org.terasology.engine.entitySystem.stubs.IntegerComponent;
import org.terasology.entitySystem.stubs.StringComponent; import org.terasology.engine.entitySystem.stubs.StringComponent;
import org.terasology.network.NetworkSystem; import org.terasology.engine.network.NetworkSystem;
import org.terasology.persistence.serializers.ComponentSerializer; import org.terasology.engine.persistence.serializers.ComponentSerializer;
import org.terasology.engine.persistence.typeHandling.TypeHandlerLibraryImpl;
import org.terasology.engine.persistence.typeHandling.mathTypes.QuaternionfTypeHandler;
import org.terasology.engine.persistence.typeHandling.mathTypes.Vector3fTypeHandler;
import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
import org.terasology.engine.registry.CoreRegistry;
import org.terasology.persistence.typeHandling.TypeHandlerLibrary; import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
import org.terasology.persistence.typeHandling.TypeHandlerLibraryImpl;
import org.terasology.persistence.typeHandling.mathTypes.QuaternionfTypeHandler;
import org.terasology.persistence.typeHandling.mathTypes.Vector3fTypeHandler;
import org.terasology.protobuf.EntityData; import org.terasology.protobuf.EntityData;
import org.terasology.recording.RecordAndReplayCurrentStatus;
import org.terasology.registry.CoreRegistry;
import org.terasology.testUtil.ModuleManagerFactory; import org.terasology.testUtil.ModuleManagerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;

6
engine-tests/src/test/java/org/terasology/persistence/EntityDataJSONFormatTest.java
View File

@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.persistence; package org.terasology.engine.persistence;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.terasology.engine.TerasologyConstants; import org.terasology.engine.core.TerasologyConstants;
import org.terasology.persistence.serializers.EntityDataJSONFormat; import org.terasology.engine.persistence.serializers.EntityDataJSONFormat;
import org.terasology.protobuf.EntityData; import org.terasology.protobuf.EntityData;
import java.io.BufferedReader; import java.io.BufferedReader;

49
engine-tests/src/test/java/org/terasology/persistence/EntitySerializerTest.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.terasology.persistence; package org.terasology.engine.persistence;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
@ -23,37 +23,36 @@ import org.terasology.assets.AssetFactory;
import org.terasology.assets.ResourceUrn; import org.terasology.assets.ResourceUrn;
import org.terasology.assets.management.AssetManager; import org.terasology.assets.management.AssetManager;
import org.terasology.assets.module.ModuleAwareAssetTypeManager; import org.terasology.assets.module.ModuleAwareAssetTypeManager;
import org.terasology.context.Context; import org.terasology.engine.context.Context;
import org.terasology.context.internal.ContextImpl; import org.terasology.engine.context.internal.ContextImpl;
import org.terasology.engine.SimpleUri; import org.terasology.engine.core.bootstrap.EntitySystemSetupUtil;
import org.terasology.engine.bootstrap.EntitySystemSetupUtil; import org.terasology.engine.core.module.ModuleManager;
import org.terasology.engine.module.ModuleManager; import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.entitySystem.entity.EntityRef; import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
import org.terasology.entitySystem.entity.internal.EngineEntityManager; import org.terasology.engine.entitySystem.entity.internal.EntityInfoComponent;
import org.terasology.entitySystem.entity.internal.EntityInfoComponent; import org.terasology.engine.entitySystem.entity.internal.EntityScope;
import org.terasology.entitySystem.entity.internal.EntityScope; import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
import org.terasology.entitySystem.metadata.ComponentLibrary; import org.terasology.engine.entitySystem.prefab.Prefab;
import org.terasology.entitySystem.prefab.Prefab; import org.terasology.engine.entitySystem.prefab.PrefabData;
import org.terasology.entitySystem.prefab.PrefabData; import org.terasology.engine.entitySystem.prefab.internal.PojoPrefab;
import org.terasology.entitySystem.prefab.internal.PojoPrefab; import org.terasology.engine.entitySystem.stubs.GetterSetterComponent;
import org.terasology.entitySystem.stubs.GetterSetterComponent; import org.terasology.engine.entitySystem.stubs.IntegerComponent;
import org.terasology.entitySystem.stubs.IntegerComponent; import org.terasology.engine.entitySystem.stubs.MappedTypeComponent;
import org.terasology.entitySystem.stubs.MappedTypeComponent; import org.terasology.engine.entitySystem.stubs.StringComponent;
import org.terasology.entitySystem.stubs.StringComponent; import org.terasology.engine.network.NetworkSystem;
import org.terasology.network.NetworkSystem; import org.terasology.engine.persistence.serializers.EntitySerializer;
import org.terasology.persistence.serializers.EntitySerializer;
import org.terasology.protobuf.EntityData; import org.terasology.protobuf.EntityData;
import org.terasology.recording.RecordAndReplayCurrentStatus; import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
import org.terasology.registry.CoreRegistry; import org.terasology.engine.registry.CoreRegistry;
import org.terasology.testUtil.ModuleManagerFactory; import org.terasology.testUtil.ModuleManagerFactory;
import org.terasology.utilities.Assets; import org.terasology.engine.utilities.Assets;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.terasology.entitySystem.entity.internal.EntityScope.CHUNK; import static org.terasology.engine.entitySystem.entity.internal.EntityScope.CHUNK;
import static org.terasology.entitySystem.entity.internal.EntityScope.GLOBAL; import static org.terasology.engine.entitySystem.entity.internal.EntityScope.GLOBAL;
/** /**
*/ */

Some files were not shown because too many files have changed in this diff Show More