From 92ff0073e8b086d47b02c35359b450df2c54edd2 Mon Sep 17 00:00:00 2001 From: Merel Steenbergen Date: Fri, 5 Apr 2019 17:00:45 +0200 Subject: [PATCH] EDIT::Change some hints and add tests --- .../src/main/java/greenify/client/Hints.java | 63 +++++++++---------- src/Client/src/test/java/HintsTest.java | 17 ++++- 2 files changed, 47 insertions(+), 33 deletions(-) diff --git a/src/Client/src/main/java/greenify/client/Hints.java b/src/Client/src/main/java/greenify/client/Hints.java index daf7176..4402913 100644 --- a/src/Client/src/main/java/greenify/client/Hints.java +++ b/src/Client/src/main/java/greenify/client/Hints.java @@ -16,52 +16,51 @@ public class Hints { */ private void initHints() { this.hints.add("Buying local produce will not only decrease your carbon " - + "footprint, but also help your local economy: A win-win!"); + + "footprint, but it will also help your local economy: A win-win!"); this.hints.add("Did you know that a gas oven only uses 6% of its energy " - + "to cook? And an electric oven is not much better at 12%."); - this.hints.add("70% of the deforestation of the Amazon is to provide land for " - + "cattle ranches."); + + "to cook? And an electric oven is not much better at 12%!"); + this.hints.add("70% of the deforestation of the Amazon rainforest is to provide land for cattle ranches."); this.hints.add("Research shows that reducing meat consumption can increase" - + " your life span by 3.6 years"); - this.hints.add("Vegetarians have a lower risk of getting heart disease, high blood " - + "pressure, diabetes and cancer than meat eaters."); - this.hints.add("Did you know? The carbon footprint of a vegetarian diet is about half " + + " your life span by 3,6 years"); + this.hints.add("Vegetarians have a lower risk of getting: Heart disease, high blood pressure, " + + "diabetes and cancer than meat eaters."); + this.hints.add("The carbon footprint of a vegetarian diet is about half " + "that of a meat-lover’s diet!"); - this.hints.add("Cycling is good for the environment AND for your body, " + this.hints.add("Cycling is good for the environment and for your body, " + "so why not grab your bike instead of your car?"); - this.hints.add("If we could capture all of the sun’s energy shining on the Earth" - + " for just one hour, we could power the entire world for one year!"); - this.hints.add("27,000 trees are cut down each day so we can have toilet paper."); - this.hints.add("A glass bottle made in our time will take more than 4,000 years " - + "to decompose."); + this.hints.add("If we could capture all of the sun’s energy shining on the Earth for just one " + + "hour, we could power the entire world for one whole year!"); + this.hints.add("27,000 trees are cut down every day so we can have toilet paper."); + this.hints.add("Recycle glass bottles! A glass bottle made now will take " + + "more than 4,000 years to decompose."); this.hints.add("Don't forget to turn off the lights and heating in rooms" - + " you're not using at the moment!"); - this.hints.add("Did you know that about 4.5% of the Dutch population does not eat meat?"); - this.hints.add("Reuse your bags when you go grocery shopping. You will save plastic bags!"); + + " you're not using at the moment. Save some energy!"); + this.hints.add("Did you know that about 4,5% of the Dutch population does not eat meat?"); + this.hints.add("Reuse your bags when you go grocery shopping. You will save " + + "plastic bags and won't have a lot of unused bags at home!"); this.hints.add("An estimated 250 million trees can be saved each year " - + "if every published newspaper would be recycled."); - this.hints.add("About 88,000 jobs were created in 2015 through the wind power sector."); - this.hints.add("You can use LED lights in your home to save energy!"); + + "if every published newspaper would be recycled!"); + this.hints.add("About 88,000 jobs were created in 2015 through the wind power sector. " + + "That is a lot of jobs"); + this.hints.add("You can use LED lights in your home to save energy! " + + "They make light from about 85% of their energy"); this.hints.add("If you isolate your home well, it will be warmer, " - + "and you'll save energy as well!"); + + "and you'll save energy as well! No need to wear sweaters anymore"); this.hints.add("Do you have leftovers? Donate them to food kitchens." + " This way you won't waste" - + " food, and you'll help people at the same time!"); + + " food, and you'll help a lot of people at the same time!"); this.hints.add("A lot of coffee places give you a discount if you bring your own cup. " - + "Get rid of those disposable cups!"); + + "Get rid of disposable cups!"); this.hints.add("When shopping, look for products with minimal to no packaging, " - + "or at least packaging made from recycled items. "); + + "or packaging made from recycled items. "); this.hints.add("If you order food, you can ask the restaurant to not include " - + "utensils and napkins, it saves plastic and paper."); - this.hints.add("It takes about 66 days to form a new habit, keep going!"); + + "utensils and napkins, it saves plastic and paper!"); + this.hints.add("It takes about 66 days to form a new habit, keep going, you'll get there!"); this.hints.add("Get yourself a nice reusable water bottle! It's cheaper and better for " - + "the environment to refill than to buy a new one every time it's empty."); - this.hints.add("Recycle glass bottles!" - + " A glass bottle made in our time will take more than 4,000 years" - + " to decompose."); - this.hints.add("Only 1% of our planet’s water supply can be used." + + "the environment to refill than to buy one every time it's empty."); + this.hints.add("Only 1% of our planet’s water supply can be used a drinkwater." + " 97% is ocean water and 2% is frozen solid in the Arctic, for now."); - this.hints.add("Plastic bad"); + this.hints.add("Plastic bad, very bad."); } /** diff --git a/src/Client/src/test/java/HintsTest.java b/src/Client/src/test/java/HintsTest.java index c0e2442..5964852 100644 --- a/src/Client/src/test/java/HintsTest.java +++ b/src/Client/src/test/java/HintsTest.java @@ -1,5 +1,6 @@ import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import greenify.client.Hints; import org.junit.Test; @@ -15,7 +16,7 @@ public class HintsTest { public void hintsContainsTest() { Hints test = new Hints(); assertTrue(test.hints.contains("27,000 trees are cut down " - + "each day so we can have toilet paper.")); + + "every day so we can have toilet paper.")); } @Test @@ -24,6 +25,20 @@ public class HintsTest { String random = test.randomHint(); assertTrue(test.hints.contains(random)); } + + @Test + public void hintsContainsTestTwo() { + Hints test = new Hints(); + assertTrue(test.hints.contains("Plastic bad, very bad.")); + } + + + @Test + public void hintsNotNullTest() { + Hints test = new Hints(); + assertNotNull(test.hints); + } + }