From 7e38443ea15dd706cde8592d9490733947046488 Mon Sep 17 00:00:00 2001 From: Kevin Turner <83819+keturn@users.noreply.github.com> Date: Sun, 21 Feb 2021 12:45:35 -0800 Subject: [PATCH 1/4] test: use JUnit5 assertions --- .../ReuseEngineTest.java | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/src/test/java/org/terasology/moduletestingenvironment/ReuseEngineTest.java b/src/test/java/org/terasology/moduletestingenvironment/ReuseEngineTest.java index df9e0d5..e202660 100644 --- a/src/test/java/org/terasology/moduletestingenvironment/ReuseEngineTest.java +++ b/src/test/java/org/terasology/moduletestingenvironment/ReuseEngineTest.java @@ -1,23 +1,9 @@ -/* - * Copyright 2020 MovingBlocks - * - * 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 - * - * https://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. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.moduletestingenvironment; import com.google.common.collect.Sets; -import org.junit.Assert; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -29,6 +15,8 @@ import java.util.Set; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class ReuseEngineTest { private static ModuleTestingHelper helper; private EntityRef entity; @@ -61,11 +49,11 @@ public void prepareEntityForTest() { @Test public void someTest() { entity.send(new DummyEvent()); - Assert.assertTrue(entity.getComponent(DummyComponent.class).dummy); + assertTrue(entity.getComponent(DummyComponent.class).dummy); } @Test public void someOtherTest() { - Assert.assertTrue(entity.hasComponent(DummyComponent.class)); + assertTrue(entity.hasComponent(DummyComponent.class)); } } From 0cbd934090897903e1d519c26753ca60a2bb8747 Mon Sep 17 00:00:00 2001 From: Kevin Turner <83819+keturn@users.noreply.github.com> Date: Sun, 21 Feb 2021 12:47:19 -0800 Subject: [PATCH 2/4] chore: adjust severity of log messages --- .../moduletestingenvironment/TestingStateHeadlessSetup.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/terasology/moduletestingenvironment/TestingStateHeadlessSetup.java b/src/main/java/org/terasology/moduletestingenvironment/TestingStateHeadlessSetup.java index a9d612f..ea01878 100644 --- a/src/main/java/org/terasology/moduletestingenvironment/TestingStateHeadlessSetup.java +++ b/src/main/java/org/terasology/moduletestingenvironment/TestingStateHeadlessSetup.java @@ -49,11 +49,11 @@ public GameManifest createGameManifest() { ResolutionResult result = resolver.resolve(dependencyNames); if (!result.isSuccess()) { - logger.warn("Unable to resolve modules: {}", dependencyNames); + logger.error("Unable to resolve modules: {}", dependencyNames); } for (Module module : result.getModules()) { - logger.warn("Loading module {} {}", module.getId(), module.getVersion()); + logger.info("Loading module {} {}", module.getId(), module.getVersion()); gameManifest.addModule(module.getId(), module.getVersion()); } From 27a13444d521109ff656ab43dbe8349405bac6ee Mon Sep 17 00:00:00 2001 From: Kevin Turner <83819+keturn@users.noreply.github.com> Date: Sun, 21 Feb 2021 12:49:32 -0800 Subject: [PATCH 3/4] fix(createGameManifest): drop `recursivelyAddModuleDependencies`: let the resolver do it --- .../TestingStateHeadlessSetup.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/main/java/org/terasology/moduletestingenvironment/TestingStateHeadlessSetup.java b/src/main/java/org/terasology/moduletestingenvironment/TestingStateHeadlessSetup.java index ea01878..a11770d 100644 --- a/src/main/java/org/terasology/moduletestingenvironment/TestingStateHeadlessSetup.java +++ b/src/main/java/org/terasology/moduletestingenvironment/TestingStateHeadlessSetup.java @@ -10,7 +10,6 @@ import org.terasology.engine.module.ModuleManager; import org.terasology.engine.subsystem.headless.mode.StateHeadlessSetup; import org.terasology.game.GameManifest; -import org.terasology.module.DependencyInfo; import org.terasology.module.DependencyResolver; import org.terasology.module.Module; import org.terasology.module.ResolutionResult; @@ -33,7 +32,6 @@ public TestingStateHeadlessSetup(Collection dependencies, String worldGe @Override public GameManifest createGameManifest() { - GameManifest gameManifest = new GameManifest(); gameManifest.setTitle("testworld"); @@ -42,9 +40,8 @@ public GameManifest createGameManifest() { Set dependencyNames = Sets.newHashSet(); for (String moduleName : dependencies) { - logger.warn("Adding dependencies for {}", moduleName); + logger.info("Adding dependency {}", moduleName); dependencyNames.add(new Name(moduleName)); - recursivelyAddModuleDependencies(dependencyNames, new Name(moduleName)); } ResolutionResult result = resolver.resolve(dependencyNames); @@ -63,15 +60,4 @@ public GameManifest createGameManifest() { gameManifest.addWorld(worldInfo); return gameManifest; } - - private void recursivelyAddModuleDependencies(Set modules, Name moduleName) { - Module module = CoreRegistry.get(ModuleManager.class).getRegistry().getLatestModuleVersion(moduleName); - if (module != null) { - for (DependencyInfo dependencyInfo : module.getMetadata().getDependencies()) { - logger.warn("Adding dependency {}", dependencyInfo.getId()); - modules.add(dependencyInfo.getId()); - recursivelyAddModuleDependencies(modules, dependencyInfo.getId()); - } - } - } } From 8880d01c2f190dced95b83929a031b2eaf0a8c8b Mon Sep 17 00:00:00 2001 From: Kevin Turner <83819+keturn@users.noreply.github.com> Date: Sun, 21 Feb 2021 13:11:02 -0800 Subject: [PATCH 4/4] chore(createGameManifest): simplify String-to-Name conversion --- .../TestingStateHeadlessSetup.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/terasology/moduletestingenvironment/TestingStateHeadlessSetup.java b/src/main/java/org/terasology/moduletestingenvironment/TestingStateHeadlessSetup.java index a11770d..87bf092 100644 --- a/src/main/java/org/terasology/moduletestingenvironment/TestingStateHeadlessSetup.java +++ b/src/main/java/org/terasology/moduletestingenvironment/TestingStateHeadlessSetup.java @@ -2,7 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.moduletestingenvironment; -import com.google.common.collect.Sets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.terasology.engine.SimpleUri; @@ -20,6 +19,7 @@ import java.util.Collection; import java.util.Set; +import java.util.stream.Collectors; public class TestingStateHeadlessSetup extends StateHeadlessSetup { private static final Logger logger = LoggerFactory.getLogger(TestingStateHeadlessSetup.class); @@ -38,11 +38,8 @@ public GameManifest createGameManifest() { gameManifest.setSeed("seed"); DependencyResolver resolver = new DependencyResolver(CoreRegistry.get(ModuleManager.class).getRegistry()); - Set dependencyNames = Sets.newHashSet(); - for (String moduleName : dependencies) { - logger.info("Adding dependency {}", moduleName); - dependencyNames.add(new Name(moduleName)); - } + Set dependencyNames = dependencies.stream().map(Name::new).collect(Collectors.toSet()); + logger.info("Building manifest for module dependencies: {}", dependencyNames); ResolutionResult result = resolver.resolve(dependencyNames); if (!result.isSuccess()) {