Make Entry.getValue() private

novoda · Nov 14, 2016 · 8481c27 · 8481c27
1 parent fa0d86a
commit 8481c27
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/plugin/src/main/groovy/com/novoda/buildproperties/Entry.groovy b/plugin/src/main/groovy/com/novoda/buildproperties/Entry.groovy
@@ -30,7 +30,7 @@ class Entry {
         getValue() as String
     }
 
-    Object getValue() {
+    private Object getValue() {
         value.call()
     }
 

diff --git a/plugin/src/test/groovy/com/novoda/buildproperties/BuildPropertiesPluginTest.groovy b/plugin/src/test/groovy/com/novoda/buildproperties/BuildPropertiesPluginTest.groovy
@@ -45,7 +45,7 @@ public class BuildPropertiesPluginTest {
         }
 
         try {
-            project.buildProperties.foo['any'].value
+            project.buildProperties.foo['any'].string
             fail('Gradle exception not thrown')
         } catch (GradleException e) {
             assertThat(e.getMessage()).endsWith('foo.properties does not exist.')
@@ -63,7 +63,7 @@ public class BuildPropertiesPluginTest {
                     file project.file('foo.properties'), errorMessage
                 }
             }
-            project.buildProperties.foo['any'].value
+            project.buildProperties.foo['any'].string
             fail('Gradle exception not thrown')
         } catch (GradleException e) {
             String message = e.getMessage()

diff --git a/plugin/src/test/groovy/com/novoda/buildproperties/BuildPropertiesTest.groovy b/plugin/src/test/groovy/com/novoda/buildproperties/BuildPropertiesTest.groovy
@@ -30,9 +30,9 @@ class BuildPropertiesTest {
 
     @Test
     public void shouldReturnSamePropertyValueInEntries() {
-        def value = buildProperties['a'].value
+        def value = buildProperties['a'].string
 
-        assertThat(value).isEqualTo(entries['a'].value)
+        assertThat(value).isEqualTo(entries['a'].string)
     }
 
     @Test
@@ -44,12 +44,12 @@ class BuildPropertiesTest {
 
     @Test
     public void shouldReturnDifferentValueFromEntriesWhenPropertyValueOverriddenInProject() {
-        project.ext.a = 1
+        project.ext.a = 'x'
 
-        def value = buildProperties['a'].value
+        def value = buildProperties['a'].string
 
-        assertThat(value).isNotEqualTo(entries['a'].value)
-        assertThat(value).isEqualTo(1)
+        assertThat(value).isNotEqualTo(entries['a'].string)
+        assertThat(value).isEqualTo('x')
     }
 
     static class TestEntries extends Entries {

diff --git a/plugin/src/test/groovy/com/novoda/buildproperties/FilePropertiesEntriesTest.groovy b/plugin/src/test/groovy/com/novoda/buildproperties/FilePropertiesEntriesTest.groovy
@@ -35,15 +35,15 @@ public class FilePropertiesEntriesTest {
 
     @Test
     public void shouldRetrieveValueWhenPropertyDefined() {
-        def value = entries['aProperty'].value
+        def value = entries['aProperty'].string
 
         assertThat(value).isEqualTo('qwerty')
     }
 
     @Test
     public void shouldThrowIllegalArgumentExceptionWhenTryingToAccessValueOfUndefinedProperty() {
         try {
-            entries['notThere'].value
+            entries['notThere'].string
             fail('IllegalArgumentException expected')
         } catch (IllegalArgumentException e) {
             assertThat(e.getMessage()).startsWith("No value defined for property 'notThere'")
@@ -103,11 +103,11 @@ public class FilePropertiesEntriesTest {
         def includingEntries = FilePropertiesEntries.create(new File(Resources.getResource('including.properties').toURI()))
 
         entries.keys.each { String key ->
-            assertThat(moreEntries[key].value).isEqualTo(entries[key].value)
+            assertThat(moreEntries[key].string).isEqualTo(entries[key].string)
         }
-        assertThat(moreEntries['foo'].value).isEqualTo(includingEntries['foo'].value)
-        assertThat(moreEntries['a'].value).isEqualTo('android')
-        assertThat(includingEntries['a'].value).isEqualTo('apple')
+        assertThat(moreEntries['foo'].string).isEqualTo(includingEntries['foo'].string)
+        assertThat(moreEntries['a'].string).isEqualTo('android')
+        assertThat(includingEntries['a'].string).isEqualTo('apple')
     }
 
 }
diff --git a/plugin/src/test/groovy/com/novoda/buildproperties/test/EntrySubject.groovy b/plugin/src/test/groovy/com/novoda/buildproperties/test/EntrySubject.groovy
@@ -35,8 +35,8 @@ public final class EntrySubject extends Subject<EntrySubject, Entry> {
         }
     }
 
-    private Object getEntryValue() {
-        actual().value
+    private String getEntryValue() {
+        actual().string
     }
 
     public void willThrow(CompositeException compositeException) {