nilsnh/uib-events
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Before refactor. Still not quite working

Browse source
This commit is contained in:
Nils Norman Haukås 2015-04-19 12:37:40 +02:00
parent 59e1132d3e
commit 5271544f73
2 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/androidTest/java/no/nilsnh/uibevents/ApplicationTest.java
View file

@ -17,11 +17,15 @@ import no.nilsnh.uibevents.data.EventDbHelper;
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
*/
public class ApplicationTest extends AndroidTestCase {
public void setUp() {}
EventDbHelper eventDbHelper;
public void setUp() {
eventDbHelper = new EventDbHelper(getContext());
}
public void testFetchFromApi() throws Throwable {
EventDbHelper db = new EventDbHelper();
String result = db.fetchWebEventData();
String result = eventDbHelper.fetchWebEventData();
assertNotNull(result);
}
@ -44,7 +48,6 @@ public class ApplicationTest extends AndroidTestCase {
}
getContext().getContentResolver()
.insert(EventContract.EventEntry.CONTENT_URI, events.get(0));
EventDbHelper db = new EventDbHelper();
assertTrue(db.getStoredData().contains(events.get(0)));
assertTrue(eventDbHelper.getStoredData().contains(events.get(0)));
}
}

26
app/src/main/java/no/nilsnh/uibevents/data/EventDbHelper.java
View file

@ -111,14 +111,14 @@ public class EventDbHelper {
String url = event.getString("path");
ContentValues cValues = new ContentValues();
event.put(EventContract.EventEntry.COLUMN_EVENT_ID, id);
event.put(EventContract.EventEntry.COLUMN_EVENT_TYPE, type);
event.put(EventContract.EventEntry.COLUMN_EVENT_TITLE, title);
event.put(EventContract.EventEntry.COLUMN_EVENT_DATE_FROM, date_from);
event.put(EventContract.EventEntry.COLUMN_EVENT_DATE_TO, date_to);
event.put(EventContract.EventEntry.COLUMN_EVENT_LOCATION, location);
event.put(EventContract.EventEntry.COLUMN_EVENT_DETAILS, details);
event.put(EventContract.EventEntry.COLUMN_EVENT_URL, url);
cValues.put(EventContract.EventEntry.COLUMN_EVENT_ID, id);
cValues.put(EventContract.EventEntry.COLUMN_EVENT_TYPE, type);
cValues.put(EventContract.EventEntry.COLUMN_EVENT_TITLE, title);
cValues.put(EventContract.EventEntry.COLUMN_EVENT_DATE_FROM, date_from);
cValues.put(EventContract.EventEntry.COLUMN_EVENT_DATE_TO, date_to);
cValues.put(EventContract.EventEntry.COLUMN_EVENT_LOCATION, location);
cValues.put(EventContract.EventEntry.COLUMN_EVENT_DETAILS, details);
cValues.put(EventContract.EventEntry.COLUMN_EVENT_URL, url);
parsedEvents.add(cValues);
}
return parsedEvents;
@ -138,10 +138,10 @@ public class EventDbHelper {
}
public ArrayList<ContentValues> getStoredData() {
File file = new File(filename);
File file = new File(ctx.getFilesDir() + "/" + filename);
if(file.exists()){
ArrayList<String> eventStrings = new ArrayList<>();
HashSet<String> eventStrings = new HashSet<>();
try {
BufferedReader br = new BufferedReader(new FileReader(file));
String line;
@ -172,7 +172,7 @@ public class EventDbHelper {
}
else {
Log.d(LOG_TAG, "Was not able to find file");
return null;
return new ArrayList<ContentValues>();
}
}
@ -189,14 +189,14 @@ public class EventDbHelper {
if (storedValues.contains(values)) return null;
storedValues.add(values);
Integer storedDataPosition = storedValues.indexOf(values);
Integer storedDataPosition = storedValues.indexOf(values) + 1;
//Write new data to textFile
try {
if (!file.exists()) file.createNewFile();
BufferedWriter buf = new BufferedWriter(new FileWriter(filename, true));
BufferedWriter buf = new BufferedWriter(new FileWriter(ctx.getFilesDir() + "/" + filename, true));
for (ContentValues event : storedValues) {
buf.write(event.getAsString("id") + ";");
buf.write(event.getAsString("type") + ";");