added See Alsos and moved tests

Author: nchmura4

pandas/core/generic.py

@@ -4140,6 +4140,10 @@ def asfreq(self, freq, method=None, how=None, normalize=False,
         2000-01-01 00:02:30    3.0
         2000-01-01 00:03:00    3.0
 
+        See Also
+        --------
+        reindex
+
         Notes
         -----
         To learn more about the frequency strings, please see `this link

pandas/tseries/resample.py

@@ -512,6 +512,10 @@ def asfreq(self, fill_value=None):
 
             .. versionadded:: 0.20.0
 
+        See Also
+        --------
+        Series.asfreq
+        DataFrame.asfreq
         """
         return self._upsample('asfreq', fill_value=fill_value)
 
@@ -902,7 +906,6 @@ def _upsample(self, method, limit=None, fill_value=None):
         return self._wrap_result(_take_new_index(
             obj, indexer, new_index, axis=self.axis))
 
-
 class PeriodIndexResamplerGroupby(_GroupByMixin, PeriodIndexResampler):
     """
     Provides a resample of a groupby implementation

pandas/tseries/tests/test_resample.py

@@ -361,29 +361,6 @@ def test_fillna(self):
         with self.assertRaises(ValueError):
             r.fillna(0)
 
-    def test_fill_value(self):
-        # test for fill value during resampling, issue 3715
-
-        # setup
-        rng = pd.date_range('1/1/2016', periods=10, freq='2S')
-        ts = pd.Series(np.arange(len(rng)), index=rng)
-        ts2 = pd.Series(np.random.rand(len(rng)), index=rng)
-        df = pd.DataFrame({'one': ts, 'two': ts2})
-
-        # insert pre-existing missing value
-        df.loc['2016-01-01 00:00:08', 'two'] = None
-
-        actual_df = df.resample('1S').asfreq(fill_value=9.0)
-
-        expected_df = df.resample('1S').asfreq().fillna(9.0)
-        expected_df.loc['2016-01-01 00:00:08', 'two'] = None
-
-        assert_frame_equal(expected_df, actual_df)
-
-        expected_series = ts.asfreq(freq='1S').fillna(9.0)
-        actual_series = ts.asfreq(freq='1S', fill_value=9.0)
-        assert_series_equal(expected_series, actual_series)
-
     def test_apply_without_aggregation(self):
 
         # both resample and groupby should work w/o aggregation
@@ -716,6 +693,24 @@ def test_asfreq_upsample(self):
         expected = frame.reindex(new_index)
         assert_frame_equal(result, expected)
 
+    def test_asfreq_fill_value(self):
+        # test for fill value during resampling, issue 3715
+
+        s = self.create_series()
+
+        result = s.resample('1H').asfreq()
+        new_index = self.create_index(s.index[0], s.index[-1], freq='1H')
+        expected = s.reindex(new_index)
+        assert_series_equal(result, expected)
+
+        frame = s.to_frame('value')
+        frame.iloc[1] = None
+        result = frame.resample('1H').asfreq(fill_value=4.0)
+        new_index = self.create_index(frame.index[0],
+                                      frame.index[-1], freq='1H')
+        expected = frame.reindex(new_index, fill_value=4.0)
+        assert_frame_equal(result, expected)
+
     def test_resample_interpolate(self):
         # # 12925
         df = self.create_series().to_frame('value')
@@ -2145,6 +2140,25 @@ def test_asfreq_upsample(self):
         result = frame.resample('1H').asfreq()
         assert_frame_equal(result, expected)
 
+    def test_asfreq_fill_value(self):
+        # test for fill value during resampling, issue 3715
+
+        s = self.create_series()
+        new_index = date_range(s.index[0].to_timestamp(how='start'),
+                               (s.index[-1]).to_timestamp(how='start'),
+                               freq='1H')
+        expected = s.to_timestamp().reindex(new_index, fill_value=4.0)
+        result = s.resample('1H', kind='timestamp').asfreq(fill_value=4.0)
+        assert_series_equal(result, expected)
+
+        frame = s.to_frame('value')
+        new_index = date_range(frame.index[0].to_timestamp(how='start'),
+                               (frame.index[-1]).to_timestamp(how='start'),
+                               freq='1H')
+        expected = frame.to_timestamp().reindex(new_index, fill_value=3.0)
+        result = frame.resample('1H', kind='timestamp').asfreq(fill_value=3.0)
+        assert_frame_equal(result, expected)
+
     def test_selection(self):
         index = self.create_series().index
         # This is a bug, these should be implemented