Skip to content

Commit

Permalink
On progress tests, doesn't compile (just want to switch computer)
Browse files Browse the repository at this point in the history
  • Loading branch information
Florian Ravasi committed Nov 17, 2018
1 parent e608327 commit 0c4c6b4
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 7 deletions.
@@ -0,0 +1,30 @@
package ch.epfl.sweng.studyup.ItemsTest;

import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;

import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

import ch.epfl.sweng.studyup.items.ShopActivity;



@RunWith(AndroidJUnit4.class)
public class ShopActivityAndBuyItemActivityTest {
private ShopActivity shopActivity;

private final ActivityTestRule<ShopActivity> mActivityRule =
new ActivityTestRule<>(ShopActivity.class);

@Before
public void init() {
shopActivity = mActivityRule.getActivity();
}

@Test
public void onPlusButtonIncrementsCount() {

}
}
Expand Up @@ -42,12 +42,12 @@ protected void onCreate(Bundle savedInstanceState) {
}


public void onPlusButton(View view) {
public void onPlusButton() {
counter += 1;
updateTextViewCounter();
}

public void onMinusButton(View view) {
public void onMinusButton() {
if (counter > 1) {
counter -= 1;
updateTextViewCounter();
Expand Down
Expand Up @@ -25,7 +25,7 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_shop);

Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setTitle(null);

Expand Down
27 changes: 23 additions & 4 deletions app/src/test/java/ch/epfl/sweng/studyup/ListItemAdapterTest.java
Expand Up @@ -5,18 +5,37 @@
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

import java.util.ArrayList;
import java.util.Arrays;

import ch.epfl.sweng.studyup.items.Items;
import ch.epfl.sweng.studyup.utils.ListItemAdapter;

import static org.junit.Assert.assertEquals;

@RunWith(JUnit4.class)
public class ListItemAdapterTest {
/* ListItemAdapter listItemAdapter;
ListItemAdapter listItemAdapter;
ArrayList<Items> items;

@Before
public void init() {
Items[] items = {Items.XP_POTION}
listItemAdapter = new ListItemAdapter(null, Items.XP_POTION, false);
items = new ArrayList<>(Arrays.asList(Items.XP_POTION, Items.COIN_SACK, Items.XP_POTION));
listItemAdapter = new ListItemAdapter(null, items, false);
}

@Test
public void getCountReturnsCorrectNumber() {
assertEquals(items.size(), listItemAdapter.getCount());
}

@Test
public void*/
public void getItemReturnsCorrectObject() {
assertEquals(Items.COIN_SACK, listItemAdapter.getItem(1));
}

@Test
public void getItemIdReturnsCorrectId() {
assertEquals(Items.XP_POTION.ordinal(), listItemAdapter.getItemId(2));
}
}

0 comments on commit 0c4c6b4

Please sign in to comment.