Match coding conventions

Author: onufryk

core-api/src/test/java/com/optimizely/ab/OptimizelyBuilderTest.java

@@ -62,22 +62,6 @@ public class OptimizelyBuilderTest {
 
     @Mock private ErrorHandler mockErrorHandler;
 
-    @Test(expected = ConfigParseException.class)
-    @SuppressFBWarnings(value="NP_NONNULL_PARAM_VIOLATION", justification="Testing nullness contract violation")
-    public void withNullConfig() throws Exception {
-        Optimizely.builder(null, mockEventHandler).build();
-    }
-
-    @Test(expected = ConfigParseException.class)
-    public void withEmptyConfig() throws Exception {
-        Optimizely.builder("", mockEventHandler).build();
-    }
-
-    @Test(expected = ConfigParseException.class)
-    public void withInvalidConfig() throws Exception {
-        Optimizely.builder("malformed json", mockEventHandler).build();
-    }
-
     @Test
     public void withEventHandler() throws Exception {
         Optimizely optimizelyClient = Optimizely.builder(validConfigJsonV2(), mockEventHandler)
@@ -180,6 +164,19 @@ public void withCustomClientVersion() throws Exception {
         assertThat(((EventBuilderV2)optimizelyClient.eventBuilder).clientVersion, is("0.0.0"));
     }
 
+    @SuppressFBWarnings(value="NP_NONNULL_PARAM_VIOLATION", justification="Testing nullness contract violation")
+    @Test
+    public void builderThrowsConfigParseExceptionForNullDatafile() throws Exception {
+        thrown.expect(ConfigParseException.class);
+        Optimizely.builder(null, mockEventHandler).build();
+    }
+
+    @Test
+    public void builderThrowsConfigParseExceptionForEmptyDatafile() throws Exception {
+        thrown.expect(ConfigParseException.class);
+        Optimizely.builder("", mockEventHandler).build();
+    }
+
     @Test
     public void builderThrowsConfigParseExceptionForInvalidDatafile() throws Exception {
         thrown.expect(ConfigParseException.class);