Merge branch 'master' into 声网升级
# Conflicts: # common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java # common/src/main/java/com/yunbao/common/http/PDLiveApi.java # common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java # common/src/main/java/com/yunbao/common/utils/DialogUitl.java # common/src/main/java/com/yunbao/common/utils/RouteUtil.java # live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java # live/src/main/java/com/yunbao/live/socket/SocketRyLinkMicPkUtil.java # main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java
This commit is contained in:
@@ -1,17 +0,0 @@
|
||||
package com.yunbao.share;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
/**
|
||||
* Example local unit test, which will execute on the development machine (host).
|
||||
*
|
||||
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||
*/
|
||||
public class ExampleUnitTest {
|
||||
@Test
|
||||
public void addition_isCorrect() {
|
||||
assertEquals(4, 2 + 2);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user