Skip to content
This repository has been archived by the owner on Mar 27, 2024. It is now read-only.

Commit

Permalink
Add failing tests back in
Browse files Browse the repository at this point in the history 
Signed-off-by: Daniel Bluhm <bluhmdj@ornl.gov>
  • Loading branch information
@dbluhm
dbluhm committed May 14, 2020
1 parent 2012462 commit 1b9dbac
Show file tree
Hide file tree
Showing 4 changed files with 158 additions and 143 deletions.
1 change: 1 addition & 0 deletions ...ations/src/main/java/org/eclipse/ice/dev/annotations/processors/DataElementProcessor.java
View file
Expand Up @@ -126,6 +126,7 @@ public boolean process(final Set<? extends TypeElement> annotations, final Round
}

final Fields fields = new Fields();
fields.addAll(new DefaultFields());

final List<? extends AnnotationMirror> mirrors = elem.getAnnotationMirrors();
try {
Expand Down
15 changes: 15 additions & 0 deletions ...nnotations/src/main/java/org/eclipse/ice/dev/annotations/processors/DataFieldVisitor.java
View file
Expand Up @@ -2,6 +2,7 @@

import java.util.Optional;

import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.util.SimpleAnnotationValueVisitor8;

Expand All @@ -21,6 +22,19 @@
*/
class DataFieldVisitor extends SimpleAnnotationValueVisitor8<Optional<UnexpectedValueError>, Fields> {

private static boolean isPrimitiveType(TypeMirror t) {
TypeKind kind = t.getKind();
return
kind == TypeKind.BOOLEAN ||
kind == TypeKind.BYTE ||
kind == TypeKind.CHAR ||
kind == TypeKind.DOUBLE ||
kind == TypeKind.FLOAT ||
kind == TypeKind.INT ||
kind == TypeKind.LONG ||
kind == TypeKind.SHORT;
}

/**
* Return error as default action for unhandled annotation values.
*/
Expand Down Expand Up @@ -59,6 +73,7 @@ public Optional<UnexpectedValueError> visitType(final TypeMirror t, final Fields
f.begin();
}
f.setClassName(t.toString());
f.setPrimitive(isPrimitiveType(t));
if (f.isComplete()) {
f.finish();
}
Expand Down
9 changes: 9 additions & 0 deletions ...e.ice.renderer/src/test/java/org/eclipse/ice/tests/renderer/GeneratedDataElementPOJO.java
View file
@@ -0,0 +1,9 @@
package org.eclipse.ice.tests.renderer;

import org.eclipse.ice.dev.annotations.*;

@DataElement
@DataField(fieldName = "testPOJO", fieldType = TestPOJO.class)
public interface GeneratedDataElementPOJO {

}
276 changes: 133 additions & 143 deletions ...e.ice.renderer/src/test/java/org/eclipse/ice/tests/renderer/GeneratedDataElementTest.java
View file
Expand Up @@ -109,8 +109,7 @@ void testProperties() {
}

/**
* Test method for {@link org.eclipse.ice.renderer.DataElement#getData()} and
* {@link org.eclipse.ice.renderer.DataElement#setData(java.lang.Object)}.
* Test method for accessing generated fields.
*/
@Test
void testDataAccessors() {
Expand All @@ -133,35 +132,35 @@ void testDataAccessors() {
return;
}

// /**
// * Test method for {@link org.eclipse.ice.renderer.DataElement#getData()} and
// * {@link org.eclipse.ice.renderer.DataElement#setData(java.lang.Object)} when
// * non-intrinsic POJOs are used.
// */
// @Test
// void testDataAccessorsForPOJOs() {
//
// // Use a test POJO for this that has members
// DataElement<TestPOJO> element = new DataElement<TestPOJO>();
// element.setData(new TestPOJO());
//
// // No properties are configured here. Just want to make sure that the data
// // behaves as expected.
//
// // Do the straight check
// TestPOJO pojo = element.getData();
// assertEquals("foo", pojo.getValue());
// assertEquals(2118.0, pojo.getDoubleValue(), 1.0e-15);
//
// // Make sure that changing the value works round-trip
// pojo.setDoubleValue(1234.0);
// pojo.setValue("bar");
// assertEquals("bar", pojo.getValue());
// assertEquals(1234.0, pojo.getDoubleValue(), 1.0e-15);
//
// return;
// }
//
/**
* Test method for {@link org.eclipse.ice.renderer.DataElement#getData()} and
* {@link org.eclipse.ice.renderer.DataElement#setTestPOJO(java.lang.Object)} when
* non-intrinsic POJOs are used.
*/
@Test
void testDataAccessorsForPOJOs() {

// Use a test POJO for this that has members
GeneratedDataElementPOJOImplementation element = new GeneratedDataElementPOJOImplementation();
element.setTestPOJO(new TestPOJO());

// No properties are configured here. Just want to make sure that the data
// behaves as expected.

// Do the straight check
TestPOJO pojo = element.getTestPOJO();
assertEquals("foo", pojo.getValue());
assertEquals(2118.0, pojo.getDoubleValue(), 1.0e-15);

// Make sure that changing the value works round-trip
pojo.setDoubleValue(1234.0);
pojo.setValue("bar");
assertEquals("bar", pojo.getValue());
assertEquals(1234.0, pojo.getDoubleValue(), 1.0e-15);

return;
}

/**
* Test method for {@link org.eclipse.ice.renderer.DataElement#toString()} and
* {@link org.eclipse.ice.renderer.DataElement#toString()} for intrinsic
Expand Down Expand Up @@ -192,116 +191,107 @@ void testStringSerialization() {

return;
}
//
// /**
// * Test method for {@link org.eclipse.ice.renderer.DataElement#toString()} and
// * {@link org.eclipse.ice.renderer.DataElement#toString()} for POJOs.
// */
// @Test
// void testPOJOSerialization() {
//
// // Use a test POJO for this that has members
// DataElement<TestPOJO> element = new DataElement<TestPOJO>();
// element.setData(new TestPOJO());
// element.setSecret(true);
// element.setRequired(true);
// element.setValidator(new JavascriptValidator<TestPOJO>());
//
// // Add a custom property to make sure they are included in serialization
// try {
// element.setProperty("sail", "awolnation");
// } catch (Exception e) {
// // Complain
// e.printStackTrace();
// fail();
// }
//
// // Because of the private id changing and being unique, this cannot be checked
// // against a reference but can only be checked by inversion.
// String output = element.toString();
//
// // Change some values then read back in the original to make sure fromString()
// // correctly overwrites them.
// DataElement<TestPOJO> element2 = new DataElement<TestPOJO>();
// TestPOJO pojo2 = new TestPOJO();
// pojo2.setDoubleValue(1.072);
// element2.setValidator(new JavascriptValidator<TestPOJO>());
// element2.setData(pojo2);
// element2.fromString(output);
//
// assertEquals(element,element2);
//
// return;
// }
//
// /**
// * Test method for
// * {@link org.eclipse.ice.renderer.DataElement#matches(DataElement)},
// * {@link org.eclipse.ice.renderer.DataElement#equals(java.lang.Object)},
// * {@link org.eclipse.ice.renderer.DataElement#hashCode()},
// * {@link org.eclipse.ice.renderer.DataElement#copy()}, and
// * {@link org.eclipse.ice.renderer.DataElement#clone()}.
// */
// @Test
// void testEquality() {
//
// // Basic intrinsic class is good for this test
// GeneratedDataElementImplementation element = getStringElement("Halsey");
// GeneratedDataElementImplementation element2 = getStringElement("Halsey");
// GeneratedDataElementImplementation element3 = getStringElement("Billie Eilish");
// GeneratedDataElementImplementation element4 = getStringElement("Halsey");
//
// // Need a validator for the tests that is shared on the equal elements.
// JavascriptValidator<String> validator = new JavascriptValidator<String>();
// element.setValidator(validator);
// element2.setValidator(validator);
// element4.setValidator(validator);
// // Billie needs her own validator
// element3.setValidator(new JavascriptValidator<String>());
//
// // Data elements must be checked both for matching - a deep inequality except
// // the UUID - and for a fully complete match that contains the UUID. Start with
// // matching. Check reflexivity first
// assertTrue(element.matches(element));
// // Check symmetry
// assertTrue(element.matches(element2));
// assertTrue(element2.matches(element));
// // Check transitivity
// assertTrue(element.matches(element2));
// assertTrue(element2.matches(element4));
// assertTrue(element.matches(element4));
// // Check a wrong answer
// assertFalse(element.matches(element3));
// // Check null
// assertFalse(element.matches(null));
//
// // Now check equality with a clone - therefore also confirming clone works
// GeneratedDataElementImplementation elementClone = (GeneratedDataElementImplementation) element.clone();
// // Check reflexivity first
// assertEquals(element, element);
// // Check symmetry
// assertEquals(element, elementClone);
// assertEquals(elementClone, element);
// // This is a sneaky way to use a copy constructor to check transitivity and get
// // around the UUID thing
// try {
// element4 = new GeneratedDataElementImplementation(elementClone);
// } catch (Exception e) {
// // Complain
// e.printStackTrace();
// fail();
// }
// assertEquals(element4, element);
// // Check a wrong answer
// assertFalse(element.equals(element3));
// // Check null
// assertFalse(element.equals(null));
// // Check against a string - this should fail
// assertFalse(element.equals("Halsey"));
//
// // Check hashCode()
// assertEquals(element.hashCode(), elementClone.hashCode());
//
// return;
// }

/**
* Test method for {@link org.eclipse.ice.renderer.DataElement#toString()} and
* {@link org.eclipse.ice.renderer.DataElement#toString()} for POJOs.
*/
@Test
void testPOJOSerialization() {

// Use a test POJO for this that has members
GeneratedDataElementPOJOImplementation element = new GeneratedDataElementPOJOImplementation();
element.setTestPOJO(new TestPOJO());
element.setSecret(true);
element.setRequired(true);
element.setValidator(new JavascriptValidator<GeneratedDataElementPOJOImplementation>());

// Because of the private id changing and being unique, this cannot be checked
// against a reference but can only be checked by inversion.
String output = element.toJSON();

// Change some values then read back in the original to make sure fromString()
// correctly overwrites them.
GeneratedDataElementPOJOImplementation element2 = new GeneratedDataElementPOJOImplementation();
TestPOJO pojo2 = new TestPOJO();
pojo2.setDoubleValue(1.072);
element2.setValidator(new JavascriptValidator<GeneratedDataElementPOJOImplementation>());
element2.setTestPOJO(pojo2);
element2.fromJSON(output);

assertEquals(element,element2);

return;
}

/**
* Test method for
* {@link org.eclipse.ice.renderer.DataElement#matches(DataElement)},
* {@link org.eclipse.ice.renderer.DataElement#equals(java.lang.Object)},
* {@link org.eclipse.ice.renderer.DataElement#hashCode()},
* {@link org.eclipse.ice.renderer.DataElement#copy()}, and
* {@link org.eclipse.ice.renderer.DataElement#clone()}.
*/
@Test
void testEquality() {

// Basic intrinsic class is good for this test
GeneratedDataElementImplementation element = getStringElement("Halsey");
GeneratedDataElementImplementation element2 = getStringElement("Halsey");
GeneratedDataElementImplementation element3 = getStringElement("Billie Eilish");
GeneratedDataElementImplementation element4 = getStringElement("Halsey");

// Need a validator for the tests that is shared on the equal elements.
JavascriptValidator<GeneratedDataElementImplementation> validator = new JavascriptValidator<GeneratedDataElementImplementation>();
element.setValidator(validator);
element2.setValidator(validator);
element4.setValidator(validator);
// Billie needs her own validator
element3.setValidator(new JavascriptValidator<GeneratedDataElementImplementation>());

// Data elements must be checked both for matching - a deep inequality except
// the UUID - and for a fully complete match that contains the UUID. Start with
// matching. Check reflexivity first
assertTrue(element.matches(element));
// Check symmetry
assertTrue(element.matches(element2));
assertTrue(element2.matches(element));
// Check transitivity
assertTrue(element.matches(element2));
assertTrue(element2.matches(element4));
assertTrue(element.matches(element4));
// Check a wrong answer
assertFalse(element.matches(element3));
// Check null
assertFalse(element.matches(null));

// Now check equality with a clone - therefore also confirming clone works
GeneratedDataElementImplementation elementClone = (GeneratedDataElementImplementation) element.clone();
// Check reflexivity first
assertEquals(element, element);
// Check symmetry
assertEquals(element, elementClone);
assertEquals(elementClone, element);
// This is a sneaky way to use a copy constructor to check transitivity and get
// around the UUID thing
try {
element4 = new GeneratedDataElementImplementation(elementClone);
} catch (Exception e) {
// Complain
e.printStackTrace();
fail();
}
assertEquals(element4, element);
// Check a wrong answer
assertFalse(element.equals(element3));
// Check null
assertFalse(element.equals(null));
// Check against a string - this should fail
assertFalse(element.equals("Halsey"));

// Check hashCode()
assertEquals(element.hashCode(), elementClone.hashCode());

return;
}
}

0 comments on commit 1b9dbac

Please sign in to comment.