Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(JOML): remove tera-assert #4459

Merged
merged 4 commits into from
Feb 6, 2021
Merged

feat(JOML): remove tera-assert #4459

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2630bdf
feat(JOML): remove tera-assert
pollend Feb 2, 2021
70d3a86
simplify test
pollend Feb 3, 2021
ec05652
Merge branch 'develop' into feat/joml-remove-TeraAssert
pollend Feb 4, 2021
cbbdd40
Merge branch 'develop' into feat/joml-remove-TeraAssert
pollend Feb 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
144 changes: 0 additions & 144 deletions engine-tests/src/main/java/org/terasology/testUtil/TeraAssert.java
View file
Open in desktop

This file was deleted.

26 changes: 24 additions & 2 deletions engine-tests/src/test/java/org/terasology/entitySystem/OwnershipHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,15 @@
import org.terasology.registry.CoreRegistry;
import org.terasology.testUtil.ModuleManagerFactory;

import java.util.Collection;
import java.util.List;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.terasology.testUtil.TeraAssert.assertEqualsContent;


/**
*/
Expand Down Expand Up @@ -67,6 +74,21 @@ public void testListsOwnedEntities() {
EntityRef ownerEntity = entityManager.create(ownerComp);

OwnershipHelper helper = new OwnershipHelper(entityManager.getComponentLibrary());
assertEqualsContent(Lists.newArrayList(ownedEntity), helper.listOwnedEntities(ownerEntity));
assertEqualsContent(helper.listOwnedEntities(ownerEntity), Lists.newArrayList(ownedEntity));
}

//TODO: needs to be replaced with alternative
public static <T> void assertEqualsContent(Collection<? extends T> expected, Collection<? extends T> actual) {
keturn marked this conversation as resolved.
Show resolved Hide resolved
if (expected == null) {
assertNull(actual);
} else {
assertNotNull(actual);
List<? extends T> copyActual = Lists.newArrayList(actual);
for (Object obj : expected) {
assertTrue(copyActual.remove(obj), () -> "Missing element: " + obj);
}
assertTrue(copyActual.isEmpty(), () -> "Unexpected additional elements: " + copyActual.toString());
}
}

}
106 changes: 18 additions & 88 deletions ...-tests/src/test/java/org/terasology/persistence/serializers/VectorTypeSerializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,29 @@
// SPDX-License-Identifier: Apache-2.0
package org.terasology.persistence.serializers;

import org.joml.Vector2f;
import org.joml.Vector2fc;
import org.joml.Vector3f;
import org.joml.Vector3fc;
import org.joml.Vector4f;
import org.joml.Vector4fc;
import org.junit.jupiter.api.Test;
import org.terasology.ModuleEnvironmentTest;
import org.terasology.math.geom.Vector2f;
import org.terasology.math.geom.Vector3f;
import org.terasology.math.geom.Vector4f;
import org.terasology.naming.Name;
import org.terasology.persistence.ModuleContext;
import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
import org.terasology.persistence.typeHandling.TypeHandlerLibraryImpl;
import org.terasology.reflection.TypeInfo;
import org.terasology.testUtil.TeraAssert;

import static org.terasology.joml.test.VectorAssert.assertEquals;


import java.io.IOException;

public class VectorTypeSerializerTest extends ModuleEnvironmentTest {
import static org.terasology.joml.test.VectorAssert.assertEquals;

static class TestObject{
public class VectorTypeSerializerTest extends ModuleEnvironmentTest {
static class TestObject {
public Vector3f v1;
public Vector2f v2;
public Vector4f v3;
public org.joml.Vector3f v11;
public org.joml.Vector2f v22;
public org.joml.Vector4f v33;
}
static class TestObject1 {
public org.joml.Vector3f v1;
public org.joml.Vector2f v2;
public org.joml.Vector4f v3;
}

static class TestObject2 {
Expand All @@ -61,61 +50,17 @@ public void setup() {
@Test
public void testSerializationConstant() throws IOException {
TestObject2 a = new TestObject2();
a.v1 = new org.joml.Vector3f(1.0f, 2.0f, 3.0f);
a.v2 = new org.joml.Vector4f(1.0f, 2.0f, 3.0f, 5.0f);
a.v3 = new org.joml.Vector2f(1.0f, 2.0f);
a.v1 = new Vector3f(1.0f, 2.0f, 3.0f);
a.v2 = new Vector4f(1.0f, 2.0f, 3.0f, 5.0f);
a.v3 = new Vector2f(1.0f, 2.0f);
String data = gsonSerializer.toJson(a, new TypeInfo<TestObject2>() {
});

TestObject2 o = gsonSerializer.fromJson(data, new TypeInfo<TestObject2>() {
});
assertEquals(o.v1, new org.joml.Vector3f(1.0f, 2.0f, 3.0f), .00001f);
assertEquals(o.v2, new org.joml.Vector4f(1.0f, 2.0f, 3.0f, 5.0f), .00001f);
assertEquals(o.v3, new org.joml.Vector2f(1.0f, 2.0f), .00001f);
}

@Test
public void testJsonSerializeRemapped() throws IOException {
TestObject a = new TestObject();
a.v1 = new Vector3f(11.5f, 13.15f, 3);
a.v2 = new Vector2f(12, 13f);
a.v3 = new Vector4f(12, 12.2f, 3f, 15.5f);
a.v11 = new org.joml.Vector3f(11.5f, 13.15f, 3);
a.v22 = new org.joml.Vector2f(12, 13f);
a.v33 = new org.joml.Vector4f(12, 12.2f, 3f, 15.5f);

String data = gsonSerializer.toJson(a, new TypeInfo<TestObject>() {
});

TestObject1 o = gsonSerializer.fromJson(data, new TypeInfo<TestObject1>() {
});

assertEquals(o.v1, new org.joml.Vector3f(11.5f, 13.15f, 3), .00001f);
assertEquals(o.v2, new org.joml.Vector2f(12f, 13f), .00001f);
assertEquals(o.v3, new org.joml.Vector4f(12, 12.2f, 3f, 15.5f), .00001f);

}

@Test
public void testProtobufSerializeRemapped() throws IOException {
keturn marked this conversation as resolved.
Show resolved Hide resolved
TestObject a = new TestObject();
a.v1 = new Vector3f(11.5f, 13.15f, 3);
a.v2 = new Vector2f(12, 13f);
a.v3 = new Vector4f(12, 12.2f, 3f, 15.5f);
a.v11 = new org.joml.Vector3f(11.5f, 13.15f, 3);
a.v22 = new org.joml.Vector2f(12, 13f);
a.v33 = new org.joml.Vector4f(12, 12.2f, 3f, 15.5f);

byte[] data = protobufSerializer.toBytes(a, new TypeInfo<TestObject>() {
});

TestObject1 o = protobufSerializer.fromBytes(data, new TypeInfo<TestObject1>() {
});

assertEquals(o.v1, new org.joml.Vector3f(11.5f, 13.15f, 3), .00001f);
assertEquals(o.v2, new org.joml.Vector2f(12f, 13f), .00001f);
assertEquals(o.v3, new org.joml.Vector4f(12, 12.2f, 3f, 15.5f), .00001f);

assertEquals(o.v1, new Vector3f(1.0f, 2.0f, 3.0f), .00001f);
assertEquals(o.v2, new Vector4f(1.0f, 2.0f, 3.0f, 5.0f), .00001f);
assertEquals(o.v3, new Vector2f(1.0f, 2.0f), .00001f);
}

@Test
Expand All @@ -124,23 +69,16 @@ public void testJsonSerialize() throws IOException {
a.v1 = new Vector3f(11.5f, 13.15f, 3);
a.v2 = new Vector2f(12, 13f);
a.v3 = new Vector4f(12, 12.2f, 3f, 15.5f);
a.v11 = new org.joml.Vector3f(11.5f, 13.15f, 3);
a.v22 = new org.joml.Vector2f(12, 13f);
a.v33 = new org.joml.Vector4f(12, 12.2f, 3f, 15.5f);

String data = gsonSerializer.toJson(a, new TypeInfo<TestObject>() {
});

TestObject o = gsonSerializer.fromJson(data, new TypeInfo<TestObject>() {
});

TeraAssert.assertEquals(o.v1, new Vector3f(11.5f, 13.15f, 3), .00001f);
TeraAssert.assertEquals(o.v2, new Vector2f(12f, 13f), .00001f);
TeraAssert.assertEquals(o.v3, new Vector4f(12, 12.2f, 3f, 15.5f), .00001f);

assertEquals(o.v11, new org.joml.Vector3f(11.5f, 13.15f, 3), .00001f);
assertEquals(o.v22, new org.joml.Vector2f(12f, 13f), .00001f);
assertEquals(o.v33, new org.joml.Vector4f(12, 12.2f, 3f, 15.5f), .00001f);
assertEquals(o.v1, new Vector3f(11.5f, 13.15f, 3), .00001f);
assertEquals(o.v2, new Vector2f(12f, 13f), .00001f);
assertEquals(o.v3, new Vector4f(12, 12.2f, 3f, 15.5f), .00001f);
}

@Test
Expand All @@ -149,23 +87,15 @@ public void testProtobufSerialize() throws IOException {
a.v1 = new Vector3f(11.5f, 13.15f, 3);
a.v2 = new Vector2f(12, 13f);
a.v3 = new Vector4f(12, 12.2f, 3f, 15.5f);
a.v11 = new org.joml.Vector3f(11.5f, 13.15f, 3);
a.v22 = new org.joml.Vector2f(12, 13f);
a.v33 = new org.joml.Vector4f(12, 12.2f, 3f, 15.5f);

byte[] bytes = protobufSerializer.toBytes(a, new TypeInfo<TestObject>() {
});

TestObject o = protobufSerializer.fromBytes(bytes, new TypeInfo<TestObject>() {
});

TeraAssert.assertEquals(o.v1, new Vector3f(11.5f, 13.15f, 3), .00001f);
TeraAssert.assertEquals(o.v2, new Vector2f(12f, 13f), .00001f);
TeraAssert.assertEquals(o.v3, new Vector4f(12, 12.2f, 3f, 15.5f), .00001f);

assertEquals(o.v11, new org.joml.Vector3f(11.5f, 13.15f, 3), .00001f);
assertEquals(o.v22, new org.joml.Vector2f(12f, 13f), .00001f);
assertEquals(o.v33, new org.joml.Vector4f(12, 12.2f, 3f, 15.5f), .00001f);
assertEquals(o.v1, new Vector3f(11.5f, 13.15f, 3), .00001f);
assertEquals(o.v2, new Vector2f(12f, 13f), .00001f);
assertEquals(o.v3, new Vector4f(12, 12.2f, 3f, 15.5f), .00001f);
}

}