* @author Maximilian Szengel
*/
#include "platform.h"
-#include "gnunet_regex_lib.h"
+#include "regex_internal_lib.h"
+#include "regex_test_lib.h"
#include "regex_internal.h"
*
* @return 0 on success, 1 on failure
*/
-unsigned int
+static unsigned int
test_proof (const char *regex)
{
unsigned int error;
- struct GNUNET_REGEX_Automaton *dfa;
+ struct REGEX_INTERNAL_Automaton *dfa;
char *c_rx1;
const char *c_rx2;
- dfa = GNUNET_REGEX_construct_dfa (regex, strlen (regex));
- c_rx1 = GNUNET_strdup (GNUNET_REGEX_get_canonical_regex (dfa));
- GNUNET_REGEX_automaton_destroy (dfa);
- dfa = GNUNET_REGEX_construct_dfa (c_rx1, strlen (c_rx1));
- c_rx2 = GNUNET_REGEX_get_canonical_regex (dfa);
+ dfa = REGEX_INTERNAL_construct_dfa (regex, strlen (regex), 1);
+ GNUNET_assert (NULL != dfa);
+ c_rx1 = GNUNET_strdup (REGEX_INTERNAL_get_canonical_regex (dfa));
+ REGEX_INTERNAL_automaton_destroy (dfa);
+ dfa = REGEX_INTERNAL_construct_dfa (c_rx1, strlen (c_rx1), 1);
+ GNUNET_assert (NULL != dfa);
+ c_rx2 = REGEX_INTERNAL_get_canonical_regex (dfa);
error = (0 == strcmp (c_rx1, c_rx2)) ? 0 : 1;
}
GNUNET_free (c_rx1);
- GNUNET_REGEX_automaton_destroy (dfa);
+ REGEX_INTERNAL_automaton_destroy (dfa);
return error;
}
+
/**
* Use 'test_proof' function to randomly test the canonical regexes of 'count'
* random expressions of length 'rx_length'.
*
* @return 0 on succes, number of failures otherwise.
*/
-unsigned int
+static unsigned int
test_proofs_random (unsigned int count, size_t rx_length)
{
unsigned int i;
for (i = 0; i < count; i++)
{
- rand_rx = GNUNET_REGEX_generate_random_regex (rx_length, NULL);
+ rand_rx = REGEX_TEST_generate_random_regex (rx_length, NULL);
failures += test_proof (rand_rx);
GNUNET_free (rand_rx);
}
return failures;
}
+
/**
* Test a number of known examples of regexes for proper canonicalization.
*
* @return 0 on success, number of failures otherwise.
*/
-unsigned int
-test_proofs_static (void)
+static unsigned int
+test_proofs_static ()
{
unsigned int i;
unsigned int error;
- const char *regex[4] = {
+ const char *regex[8] = {
"a|aa*a",
"a+",
"a*",
- "a*a*"
+ "a*a*",
+ "(F*C|WfPf|y+F*C)",
+ "y*F*C|WfPf",
+ "((a|b)c|(a|b)(d|(a|b)e))",
+ "((a|b)(c|d)|(a|b)(a|b)e)"
};
- char *canonical_regex;
- struct GNUNET_REGEX_Automaton *dfa;
+ const char *canon_rx1;
+ const char *canon_rx2;
+ struct REGEX_INTERNAL_Automaton *dfa1;
+ struct REGEX_INTERNAL_Automaton *dfa2;
error = 0;
- for (i = 0; i < 4; i += 2)
+ for (i = 0; i < 8; i += 2)
{
- dfa = GNUNET_REGEX_construct_dfa (regex[i], strlen (regex[i]));
- canonical_regex = GNUNET_strdup (GNUNET_REGEX_get_canonical_regex (dfa));
- GNUNET_REGEX_automaton_destroy (dfa);
+ dfa1 = REGEX_INTERNAL_construct_dfa (regex[i], strlen (regex[i]), 1);
+ dfa2 = REGEX_INTERNAL_construct_dfa (regex[i + 1], strlen (regex[i + 1]), 1);
+ GNUNET_assert (NULL != dfa1);
+ GNUNET_assert (NULL != dfa2);
+
+ canon_rx1 = REGEX_INTERNAL_get_canonical_regex (dfa1);
+ canon_rx2 = REGEX_INTERNAL_get_canonical_regex (dfa2);
- dfa = GNUNET_REGEX_construct_dfa (regex[i + 1], strlen (regex[i + 1]));
- error +=
- (0 ==
- strcmp (canonical_regex,
- GNUNET_REGEX_get_canonical_regex (dfa))) ? 0 : 1;
+ error += (0 == strcmp (canon_rx1, canon_rx2)) ? 0 : 1;
if (error > 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Comparing canonical regex of %s with %s failed.\n", regex[i],
- regex[i + 1]);
+ "Comparing canonical regex failed:\nrx1:\t%s\ncrx1:\t%s\nrx2:\t%s\ncrx2:\t%s\n",
+ regex[i], canon_rx1, regex[i + 1], canon_rx2);
}
- GNUNET_free (canonical_regex);
- GNUNET_REGEX_automaton_destroy (dfa);
+ REGEX_INTERNAL_automaton_destroy (dfa1);
+ REGEX_INTERNAL_automaton_destroy (dfa2);
}
return error;
int
main (int argc, char *argv[])
{
- GNUNET_log_setup ("test-regex",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
- NULL);
+ GNUNET_log_setup ("test-regex", "WARNING", NULL);
int error;
error = 0;
error += test_proofs_static ();
-// error += test_proofs_random (100, 10);
+ error += test_proofs_random (100, 30);
return error;
}