January 2017 - tor-commits - lists.torproject.org

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 09 Jan '17

09 Jan '17

commit a6ec45b2e0d734c4026dc681502e6a0c97129c49 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 9 23:17:35 2017 +0000 Update translations for tor-messenger-authdtd --- pt/auth.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt/auth.dtd b/pt/auth.dtd index 651d632..33040dc 100644 --- a/pt/auth.dtd +++ b/pt/auth.dtd @@ -6,7 +6,7 @@ <!ENTITY authDialog.no "Não"> <!ENTITY authDialog.verified "Eu verifiquei que essa é de facto a assinatura digital correta."> <!ENTITY authDialog.yourFingerprint "A sua assinatura digital"> -<!ENTITY authDialog.theirFingerprint "Their purported fingerprint"> +<!ENTITY authDialog.theirFingerprint "A impressão que pretendem"> <!ENTITY authDialog.manualVerification "Verificação manual da assinatura digital"> <!ENTITY authDialog.questionAndAnswer "Pergunta e resposta"> <!ENTITY authDialog.sharedSecret "Segredo partilhado.">

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 09 Jan '17

09 Jan '17

commit 16f9f548fd1c6d8d7ffeec281128ccaf482870d1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 9 23:16:53 2017 +0000 Update translations for tails-perl5lib_completed --- pt.po | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pt.po b/pt.po index 60e2052..40622a4 100644 --- a/pt.po +++ b/pt.po @@ -5,14 +5,15 @@ # Translators: # alfalb.as, 2015 # André Monteiro <andre.monteir(a)gmail.com>, 2014 -# MMSRS <h_manuela_rodsilva(a)gmail.com>, 2015 +# Cesar Silva <cesarsilvabx(a)gmail.com>, 2017 +# Manuela Silva <inactive+h_manuela_rodsilva(a)transifex.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-05-02 21:08+0200\n" -"PO-Revision-Date: 2015-09-13 15:11+0000\n" -"Last-Translator: MMSRS <h_manuela_rodsilva(a)gmail.com>\n" +"POT-Creation-Date: 2016-09-20 15:58+0200\n" +"PO-Revision-Date: 2017-01-09 22:48+0000\n" +"Last-Translator: Cesar Silva <cesarsilvabx(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,8 +21,18 @@ msgstr "" "Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../lib/Tails/RunningSystem.pm:153 +#: ../lib/Tails/RunningSystem.pm:159 +msgid "Error" +msgstr "Erro" + +#: ../lib/Tails/RunningSystem.pm:161 msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" msgstr "O dispositivo Tails está em execução e não é possível encontrá-lo. Em vez disso, poderá utilizar a opção 'toram'?" + +#: ../lib/Tails/RunningSystem.pm:192 +msgid "" +"The drive Tails is running from cannot be found. Maybe you used the `toram' " +"option?" +msgstr "Não é possível encontrar a drive que executa o Tails. Será usou a opção 'toram' ?"

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 09 Jan '17

09 Jan '17

commit d1c5d741c481f44371350a3efdb0bb635c13bc10 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 9 23:16:47 2017 +0000 Update translations for tails-perl5lib --- pt.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pt.po b/pt.po index 727ee40..40622a4 100644 --- a/pt.po +++ b/pt.po @@ -5,14 +5,15 @@ # Translators: # alfalb.as, 2015 # André Monteiro <andre.monteir(a)gmail.com>, 2014 -# Manuela Silva <h_manuela_rodsilva(a)gmail.com>, 2015 +# Cesar Silva <cesarsilvabx(a)gmail.com>, 2017 +# Manuela Silva <inactive+h_manuela_rodsilva(a)transifex.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2016-01-25 16:59+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2016-09-20 15:58+0200\n" +"PO-Revision-Date: 2017-01-09 22:48+0000\n" +"Last-Translator: Cesar Silva <cesarsilvabx(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,4 +35,4 @@ msgstr "O dispositivo Tails está em execução e não é possível encontrá-lo msgid "" "The drive Tails is running from cannot be found. Maybe you used the `toram' " "option?" -msgstr "" +msgstr "Não é possível encontrar a drive que executa o Tails. Será usou a opção 'toram' ?"

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 09 Jan '17

09 Jan '17

commit 3a1805f5c4c329511ee08048f77f6d71c55a8980 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 9 23:16:38 2017 +0000 Update translations for torbutton-torbuttondtd --- pt/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt/torbutton.dtd b/pt/torbutton.dtd index e478257..cb3a51b 100644 --- a/pt/torbutton.dtd +++ b/pt/torbutton.dtd @@ -2,7 +2,7 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Novo Circuito Tor para este Site"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Security Settings…"> +<!ENTITY torbutton.context_menu.preferences "Configurações de Segurança..."> <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Configurações da Rede Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N">

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 09 Jan '17

09 Jan '17

commit 957097baccb7343d611c8cce4ba8d6e2e918654c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 9 22:48:22 2017 +0000 Update translations for tor-browser-manual --- pt/pt.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pt/pt.po b/pt/pt.po index cfc8612..8cac51f 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -5,12 +5,13 @@ # Francisco P. <sonhosdigitais(a)gmx.com>, 2016 # Koh Pyreit <inactive+kohpyreit(a)transifex.com>, 2016 # Manuela Silva <manuela.silva(a)sky.com>, 2017 +# Cesar Silva <cesarsilvabx(a)gmail.com>, 2017 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Manuela Silva <manuela.silva(a)sky.com>, 2017\n" +"Last-Translator: Cesar Silva <cesarsilvabx(a)gmail.com>, 2017\n" "Language-Team: Portuguese (https://www.transifex.com/otf/teams/1519/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,6 +27,8 @@ msgstr "tradução-créditos" #: about-tor-browser.page:7 msgid "Learn what Tor Browser can do to protect your privacy and anonymity" msgstr "" +"Aprenda o que o Tor Browser pode fazer para proteger a sua segurança e " +"anonimato." #: about-tor-browser.page:10 msgid "About Tor Browser"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 09 Jan '17

09 Jan '17

commit 748e9030854528df1d4afd4a4d6e2d77f7af190d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 9 22:48:08 2017 +0000 Update translations for tails-greeter-2 --- pt/pt.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pt/pt.po b/pt/pt.po index 4b4864b..666afad 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-12-03 13:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: André Monteiro <andre.monteir(a)gmail.com>, 2016\n" +"Last-Translator: Cesar Silva <cesarsilvabx(a)gmail.com>, 2017\n" "Language-Team: Portuguese (https://www.transifex.com/otf/teams/1519/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +20,7 @@ msgstr "" #: ../data/greeter.ui.h:1 msgid "Administration Password" -msgstr "" +msgstr "Palavra-passe de Administrador" #: ../data/greeter.ui.h:2 msgid "" @@ -28,6 +28,8 @@ msgid "" "tasks. Otherwise, the administration password is disabled for better " "security." msgstr "" +"Crie uma palavra-passe de administrador se precisar de executar tarefas administrativas. \n" +"Caso contrário, a palavra-passe de administrador é desactivada para melhor segurança." #: ../data/greeter.ui.h:3 msgid "Enter an administration password"

1 0

[chutney/master] Fix typo in bootstrap-network.sh.
by nickm＠torproject.org 09 Jan '17

09 Jan '17

commit 4c29954b0db8cd6e40953063b7edf86566a843ee Author: Lars Luthman <mail(a)larsluthman.net> Date: Thu Nov 3 11:23:54 2016 +0100 Fix typo in bootstrap-network.sh. --- tools/bootstrap-network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh index a198d82..a2d5fa8 100755 --- a/tools/bootstrap-network.sh +++ b/tools/bootstrap-network.sh @@ -24,7 +24,7 @@ flavour=basic; [ -n "$1" ] && { flavour=$1; shift; } $CHUTNEY stop networks/$flavour -echo "$myname: boostrapping network: $flavour" +echo "$myname: bootstrapping network: $flavour" $CHUTNEY configure networks/$flavour # TODO: Make 'chutney configure' take an optional offset argument and

1 0

[onionoo/master] Rather tweak test data than using DummyTime class in order to avoid
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit 8b1ff256b76a1e247285c0d8f1fb40549117f1bf Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Jan 9 18:26:52 2017 +0100 Rather tweak test data than using DummyTime class in order to avoid Time and TimeFactory dependencies. --- .../writer/BandwidthDocumentWriterTest.java | 62 ++++++++++++---------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/src/test/java/org/torproject/onionoo/writer/BandwidthDocumentWriterTest.java b/src/test/java/org/torproject/onionoo/writer/BandwidthDocumentWriterTest.java index 925f943..436ee43 100644 --- a/src/test/java/org/torproject/onionoo/writer/BandwidthDocumentWriterTest.java +++ b/src/test/java/org/torproject/onionoo/writer/BandwidthDocumentWriterTest.java @@ -14,24 +14,14 @@ import org.torproject.onionoo.docs.DummyDocumentStore; import org.torproject.onionoo.docs.GraphHistory; import org.torproject.onionoo.updater.DescriptorSourceFactory; import org.torproject.onionoo.updater.DummyDescriptorSource; -import org.torproject.onionoo.util.DummyTime; -import org.torproject.onionoo.util.TimeFactory; import org.junit.Before; import org.junit.Test; -public class BandwidthDocumentWriterTest { - - private static final long TEST_TIME = DateTimeHelper.parse( - "2017-01-09 12:00:00"); +import java.text.SimpleDateFormat; +import java.util.Date; - private DummyTime dummyTime; - - @Before - public void createDummyTime() { - this.dummyTime = new DummyTime(TEST_TIME); - TimeFactory.setTime(this.dummyTime); - } +public class BandwidthDocumentWriterTest { private DummyDescriptorSource descriptorSource; @@ -50,34 +40,48 @@ public class BandwidthDocumentWriterTest { } @Test - public void testIgnore2019() { + public void testIgnoreFuture() { BandwidthStatus status = new BandwidthStatus(); + String future = new SimpleDateFormat("yyyy") + .format(new Date(System.currentTimeMillis() + + DateTimeHelper.ROUGHLY_ONE_YEAR)); + String dayBeforeYesterday = new SimpleDateFormat("yyyy-MM-dd") + .format(new Date(System.currentTimeMillis() + - 2 * DateTimeHelper.ONE_DAY)); + String yesterday = new SimpleDateFormat("yyyy-MM-dd") + .format(new Date(System.currentTimeMillis() + - DateTimeHelper.ONE_DAY)); String documentString = - "r 2017-01-08 08:29:33 2017-01-08 12:29:33 144272636928\n" - + "r 2017-01-08 12:29:33 2017-01-08 16:29:33 144407647232\n" - + "r 2017-01-08 16:29:33 2017-01-08 20:29:33 154355623936\n" - + "r 2017-01-08 20:29:33 2017-01-09 00:29:33 149633244160\n" - + "r 2019-08-06 05:31:45 2019-08-06 09:31:45 0\n" - + "r 2019-08-06 09:31:45 2019-08-06 13:31:45 0\n" - + "r 2019-08-06 13:31:45 2019-08-06 17:31:45 0\n" - + "r 2019-08-06 17:31:45 2019-08-06 21:31:45 0\n" - + "r 2019-08-06 21:31:45 2019-08-07 01:31:45 0\n" - + "r 2019-08-07 01:31:45 2019-08-07 05:31:45 0\n"; + "r " + dayBeforeYesterday + " 08:29:33 " + dayBeforeYesterday + + " 12:29:33 144272636928\n" + + "r " + dayBeforeYesterday + " 12:29:33 " + dayBeforeYesterday + + " 16:29:33 144407647232\n" + + "r " + dayBeforeYesterday + " 16:29:33 " + dayBeforeYesterday + + " 20:29:33 154355623936\n" + + "r " + dayBeforeYesterday + " 20:29:33 " + yesterday + + " 00:29:33 149633244160\n" + + "r " + future + "-08-06 05:31:45 " + future + "-08-06 09:31:45 0\n" + + "r " + future + "-08-06 09:31:45 " + future + "-08-06 13:31:45 0\n" + + "r " + future + "-08-06 13:31:45 " + future + "-08-06 17:31:45 0\n" + + "r " + future + "-08-06 17:31:45 " + future + "-08-06 21:31:45 0\n" + + "r " + future + "-08-06 21:31:45 " + future + "-08-07 01:31:45 0\n" + + "r " + future + "-08-07 01:31:45 " + future + "-08-07 05:31:45 0\n"; + status.setFromDocumentString(documentString); - String ibibUNC0Fingerprint = "7C0AA4E3B73E407E9F5FEB1912F8BE26D8AA124D"; - this.documentStore.addDocument(status, ibibUNC0Fingerprint); + String ibibUnc0Fingerprint = "7C0AA4E3B73E407E9F5FEB1912F8BE26D8AA124D"; + this.documentStore.addDocument(status, ibibUnc0Fingerprint); BandwidthDocumentWriter writer = new BandwidthDocumentWriter(); DescriptorSourceFactory.getDescriptorSource().readDescriptors(); writer.writeDocuments(); assertEquals(1, this.documentStore.getPerformedStoreOperations()); BandwidthDocument document = this.documentStore.getDocument( - BandwidthDocument.class, ibibUNC0Fingerprint); + BandwidthDocument.class, ibibUnc0Fingerprint); assertEquals(1, document.getReadHistory().size()); assertTrue(document.getReadHistory().containsKey("1_month")); GraphHistory history = document.getReadHistory().get("1_month"); - assertEquals(DateTimeHelper.parse("2017-01-08 14:00:00"), + assertEquals(DateTimeHelper.parse(dayBeforeYesterday + " 14:00:00"), history.getFirst()); - assertEquals(DateTimeHelper.parse("2017-01-09 02:00:00"), + assertEquals(DateTimeHelper.parse(yesterday + " 02:00:00"), history.getLast()); assertEquals(DateTimeHelper.FOUR_HOURS / DateTimeHelper.ONE_SECOND, (int) history.getInterval());

1 0

[onionoo/master] Exclude bandwidth history values from the future.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit 25a68337b17c36b23bc2eb0013ce825622dd2524 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 9 17:19:04 2017 +0100 Exclude bandwidth history values from the future. Fixes #21047. --- CHANGELOG.md | 1 + .../torproject/onionoo/docs/BandwidthDocument.java | 10 ++- .../onionoo/writer/BandwidthDocumentWriter.java | 3 + .../writer/BandwidthDocumentWriterTest.java | 88 ++++++++++++++++++++++ 4 files changed, 100 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8ab3e1..6d01ec0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ process. - Accept the same characters in qualified search terms as in their parameter equivalents. + - Exclude bandwidth history values from the future. * Minor changes - Include XZ binaries in release binaries. diff --git a/src/main/java/org/torproject/onionoo/docs/BandwidthDocument.java b/src/main/java/org/torproject/onionoo/docs/BandwidthDocument.java index 1990734..575b8a0 100644 --- a/src/main/java/org/torproject/onionoo/docs/BandwidthDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/BandwidthDocument.java @@ -15,18 +15,24 @@ public class BandwidthDocument extends Document { this.fingerprint = fingerprint; } - @SuppressWarnings("unused") private Map<String, GraphHistory> write_history; public void setWriteHistory(Map<String, GraphHistory> writeHistory) { this.write_history = writeHistory; } - @SuppressWarnings("unused") + public Map<String, GraphHistory> getWriteHistory() { + return this.write_history; + } + private Map<String, GraphHistory> read_history; public void setReadHistory(Map<String, GraphHistory> readHistory) { this.read_history = readHistory; } + + public Map<String, GraphHistory> getReadHistory() { + return this.read_history; + } } diff --git a/src/main/java/org/torproject/onionoo/writer/BandwidthDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/BandwidthDocumentWriter.java index 33b943e..25bca5e 100644 --- a/src/main/java/org/torproject/onionoo/writer/BandwidthDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/BandwidthDocumentWriter.java @@ -112,6 +112,9 @@ public class BandwidthDocumentWriter implements DocumentWriter { continue; } long startMillis = v[0]; + if (startMillis > this.now) { + break; + } if (endMillis - startMillis > dataPointInterval) { /* This history interval is too long for this graph's data point * interval. Maybe the next graph will contain it, but not this diff --git a/src/test/java/org/torproject/onionoo/writer/BandwidthDocumentWriterTest.java b/src/test/java/org/torproject/onionoo/writer/BandwidthDocumentWriterTest.java new file mode 100644 index 0000000..925f943 --- /dev/null +++ b/src/test/java/org/torproject/onionoo/writer/BandwidthDocumentWriterTest.java @@ -0,0 +1,88 @@ +/* Copyright 2017 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.onionoo.writer; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import org.torproject.onionoo.docs.BandwidthDocument; +import org.torproject.onionoo.docs.BandwidthStatus; +import org.torproject.onionoo.docs.DateTimeHelper; +import org.torproject.onionoo.docs.DocumentStoreFactory; +import org.torproject.onionoo.docs.DummyDocumentStore; +import org.torproject.onionoo.docs.GraphHistory; +import org.torproject.onionoo.updater.DescriptorSourceFactory; +import org.torproject.onionoo.updater.DummyDescriptorSource; +import org.torproject.onionoo.util.DummyTime; +import org.torproject.onionoo.util.TimeFactory; + +import org.junit.Before; +import org.junit.Test; + +public class BandwidthDocumentWriterTest { + + private static final long TEST_TIME = DateTimeHelper.parse( + "2017-01-09 12:00:00"); + + private DummyTime dummyTime; + + @Before + public void createDummyTime() { + this.dummyTime = new DummyTime(TEST_TIME); + TimeFactory.setTime(this.dummyTime); + } + + private DummyDescriptorSource descriptorSource; + + @Before + public void createDummyDescriptorSource() { + this.descriptorSource = new DummyDescriptorSource(); + DescriptorSourceFactory.setDescriptorSource(this.descriptorSource); + } + + private DummyDocumentStore documentStore; + + @Before + public void createDummyDocumentStore() { + this.documentStore = new DummyDocumentStore(); + DocumentStoreFactory.setDocumentStore(this.documentStore); + } + + @Test + public void testIgnore2019() { + BandwidthStatus status = new BandwidthStatus(); + String documentString = + "r 2017-01-08 08:29:33 2017-01-08 12:29:33 144272636928\n" + + "r 2017-01-08 12:29:33 2017-01-08 16:29:33 144407647232\n" + + "r 2017-01-08 16:29:33 2017-01-08 20:29:33 154355623936\n" + + "r 2017-01-08 20:29:33 2017-01-09 00:29:33 149633244160\n" + + "r 2019-08-06 05:31:45 2019-08-06 09:31:45 0\n" + + "r 2019-08-06 09:31:45 2019-08-06 13:31:45 0\n" + + "r 2019-08-06 13:31:45 2019-08-06 17:31:45 0\n" + + "r 2019-08-06 17:31:45 2019-08-06 21:31:45 0\n" + + "r 2019-08-06 21:31:45 2019-08-07 01:31:45 0\n" + + "r 2019-08-07 01:31:45 2019-08-07 05:31:45 0\n"; + status.setFromDocumentString(documentString); + String ibibUNC0Fingerprint = "7C0AA4E3B73E407E9F5FEB1912F8BE26D8AA124D"; + this.documentStore.addDocument(status, ibibUNC0Fingerprint); + BandwidthDocumentWriter writer = new BandwidthDocumentWriter(); + DescriptorSourceFactory.getDescriptorSource().readDescriptors(); + writer.writeDocuments(); + assertEquals(1, this.documentStore.getPerformedStoreOperations()); + BandwidthDocument document = this.documentStore.getDocument( + BandwidthDocument.class, ibibUNC0Fingerprint); + assertEquals(1, document.getReadHistory().size()); + assertTrue(document.getReadHistory().containsKey("1_month")); + GraphHistory history = document.getReadHistory().get("1_month"); + assertEquals(DateTimeHelper.parse("2017-01-08 14:00:00"), + history.getFirst()); + assertEquals(DateTimeHelper.parse("2017-01-09 02:00:00"), + history.getLast()); + assertEquals(DateTimeHelper.FOUR_HOURS / DateTimeHelper.ONE_SECOND, + (int) history.getInterval()); + assertEquals(4, (int) history.getCount()); + assertEquals(4, history.getValues().size()); + } +} +

1 0

[onionoo/master] Deprecate Time and TimeFactory.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit 274aa6fb53bdc7151e8e5c46c556382552fdb2cd Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Jan 9 21:04:19 2017 +0100 Deprecate Time and TimeFactory. --- src/main/java/org/torproject/onionoo/util/Time.java | 2 ++ src/main/java/org/torproject/onionoo/util/TimeFactory.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/util/Time.java b/src/main/java/org/torproject/onionoo/util/Time.java index 1b7e121..45c2d7b 100644 --- a/src/main/java/org/torproject/onionoo/util/Time.java +++ b/src/main/java/org/torproject/onionoo/util/Time.java @@ -6,6 +6,8 @@ package org.torproject.onionoo.util; /* * Wrapper for System.currentTimeMillis() that can be replaced with a * custom time source for testing. + * + * @deprecated Try to use other time setting methods for testing. */ public class Time { diff --git a/src/main/java/org/torproject/onionoo/util/TimeFactory.java b/src/main/java/org/torproject/onionoo/util/TimeFactory.java index 608b595..f0c8a98 100644 --- a/src/main/java/org/torproject/onionoo/util/TimeFactory.java +++ b/src/main/java/org/torproject/onionoo/util/TimeFactory.java @@ -9,13 +9,19 @@ public class TimeFactory { /** Sets a custom singleton time instance that will be returned by * {@link #getTime} rather than creating an instance upon first - * invocation. */ + * invocation. + * + * @deprecated Try to use other time setting methods for testing. + */ public static void setTime(Time time) { timeInstance = time; } /** Returns the singleton node indexer instance that gets created upon - * first invocation of this method. */ + * first invocation of this method. + * + * @deprecated Try to use other time setting methods for testing. + */ public static Time getTime() { if (timeInstance == null) { timeInstance = new Time();

1 0