Fix tests and bump generator to 0.14

Author: rbygrave

pom.xml

@@ -36,7 +36,7 @@
     <dependency>
       <groupId>io.dinject</groupId>
       <artifactId>dinject-generator</artifactId>
-      <version>0.12</version>
+      <version>0.14</version>
       <scope>test</scope>
     </dependency>
 

src/test/java/io/dinject/core/DContextEntryTest.java

@@ -1,18 +1,19 @@
 package io.dinject.core;
 
+import io.dinject.BeanEntry;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 public class DContextEntryTest {
 
   @Test
   public void get_when_onePrimary() {
 
     DContextEntry entry = new DContextEntry();
-    entry.add(DContextEntryBean.of("P", null, Flag.PRIMARY));
-    entry.add(DContextEntryBean.of("N", null, Flag.NORMAL));
-    entry.add(DContextEntryBean.of("S", null, Flag.SECONDARY));
+    entry.add(DContextEntryBean.of("P", null, BeanEntry.PRIMARY));
+    entry.add(DContextEntryBean.of("N", null, BeanEntry.NORMAL));
+    entry.add(DContextEntryBean.of("S", null, BeanEntry.SECONDARY));
 
     Object bean = entry.get(null);
     assertEquals(bean, "P");
@@ -22,9 +23,9 @@ public void get_when_onePrimary() {
   public void get_when_twoPrimary() {
 
     DContextEntry entry = new DContextEntry();
-    entry.add(DContextEntryBean.of("P", null, Flag.PRIMARY));
-    entry.add(DContextEntryBean.of("N", null, Flag.NORMAL));
-    entry.add(DContextEntryBean.of("S", null, Flag.PRIMARY));
+    entry.add(DContextEntryBean.of("P", null, BeanEntry.PRIMARY));
+    entry.add(DContextEntryBean.of("N", null, BeanEntry.NORMAL));
+    entry.add(DContextEntryBean.of("S", null, BeanEntry.PRIMARY));
 
     entry.get(null);
   }
@@ -33,8 +34,8 @@ public void get_when_twoPrimary() {
   public void get_when_oneNormal() {
 
     DContextEntry entry = new DContextEntry();
-    entry.add(DContextEntryBean.of("N", null, Flag.NORMAL));
-    entry.add(DContextEntryBean.of("S", null, Flag.SECONDARY));
+    entry.add(DContextEntryBean.of("N", null, BeanEntry.NORMAL));
+    entry.add(DContextEntryBean.of("S", null, BeanEntry.SECONDARY));
 
     Object bean = entry.get(null);
     assertEquals(bean, "N");
@@ -45,9 +46,9 @@ public void get_when_oneNormal() {
   public void get_when_oneNormal2() {
 
     DContextEntry entry = new DContextEntry();
-    entry.add(DContextEntryBean.of("N", null, Flag.NORMAL));
-    entry.add(DContextEntryBean.of("S1", null, Flag.SECONDARY));
-    entry.add(DContextEntryBean.of("S2", null, Flag.SECONDARY));
+    entry.add(DContextEntryBean.of("N", null, BeanEntry.NORMAL));
+    entry.add(DContextEntryBean.of("S1", null, BeanEntry.SECONDARY));
+    entry.add(DContextEntryBean.of("S2", null, BeanEntry.SECONDARY));
 
     Object bean = entry.get(null);
     assertEquals(bean, "N");
@@ -57,8 +58,8 @@ public void get_when_oneNormal2() {
   public void get_when_multiSecondaryOnly() {
 
     DContextEntry entry = new DContextEntry();
-    entry.add(DContextEntryBean.of("S1", null, Flag.SECONDARY));
-    entry.add(DContextEntryBean.of("S2", null, Flag.SECONDARY));
+    entry.add(DContextEntryBean.of("S1", null, BeanEntry.SECONDARY));
+    entry.add(DContextEntryBean.of("S2", null, BeanEntry.SECONDARY));
 
     entry.get(null);
   }
@@ -68,8 +69,8 @@ public void get_when_multiSecondaryOnly() {
   public void get_when_multiSecondary_butNamed() {
 
     DContextEntry entry = new DContextEntry();
-    entry.add(DContextEntryBean.of("S1", "a", Flag.SECONDARY));
-    entry.add(DContextEntryBean.of("S2", "b", Flag.SECONDARY));
+    entry.add(DContextEntryBean.of("S1", "a", BeanEntry.SECONDARY));
+    entry.add(DContextEntryBean.of("S2", "b", BeanEntry.SECONDARY));
 
     Object bean = entry.get("b");
     assertEquals(bean, "S2");
@@ -79,8 +80,8 @@ public void get_when_multiSecondary_butNamed() {
   public void get_when_multiSecondary_butNamed2() {
 
     DContextEntry entry = new DContextEntry();
-    entry.add(DContextEntryBean.of("S1", null, Flag.SECONDARY));
-    entry.add(DContextEntryBean.of("S2", "b", Flag.SECONDARY));
+    entry.add(DContextEntryBean.of("S1", null, BeanEntry.SECONDARY));
+    entry.add(DContextEntryBean.of("S2", "b", BeanEntry.SECONDARY));
 
     Object bean = entry.get("b");
     assertEquals(bean, "S2");
@@ -90,8 +91,8 @@ public void get_when_multiSecondary_butNamed2() {
   public void get_when_secondary_butNamed() {
 
     DContextEntry entry = new DContextEntry();
-    entry.add(DContextEntryBean.of("S1", null, Flag.PRIMARY));
-    entry.add(DContextEntryBean.of("S2", "b", Flag.SECONDARY));
+    entry.add(DContextEntryBean.of("S1", null, BeanEntry.PRIMARY));
+    entry.add(DContextEntryBean.of("S2", "b", BeanEntry.SECONDARY));
 
     Object bean = entry.get("b");
     assertEquals(bean, "S2");